JBoss Tools SVN: r26948 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-11-25 12:53:36 -0500 (Thu, 25 Nov 2010)
New Revision: 26948
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java
Log:
https://jira.jboss.org/browse/JBIDE-7704
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2010-11-25 17:50:56 UTC (rev 26947)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2010-11-25 17:53:36 UTC (rev 26948)
@@ -13,6 +13,7 @@
import java.io.IOException;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
@@ -53,11 +54,13 @@
vpeController.getSourceBuilder().openOn(domNode);
IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
assertEquals("facelets.taglib.xml file should be opened","facelets.taglib.xml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$//$NON-NLS-2$
- StructuredSelection selection = (StructuredSelection) activeEditor.getEditorSite().getSelectionProvider().getSelection();
- CustomizedObjectImpl customizedObjectImpl = (CustomizedObjectImpl) selection.getFirstElement();
- //cheak if selection on right line, how?
- assertEquals("Children lenght should be ","FileSystems/WEB-ROOT/tags/facelets.taglib.xml/paginator",customizedObjectImpl.getLongPath()); //$NON-NLS-1$ //$NON-NLS-2$
-
+ IStructuredSelection selection = (IStructuredSelection) activeEditor.getEditorSite().getSelectionProvider().getSelection();
+ //check pass only if we have been opened in our xml editor
+ if(selection.getFirstElement() instanceof CustomizedObjectImpl) {
+ CustomizedObjectImpl customizedObjectImpl = (CustomizedObjectImpl) selection.getFirstElement();
+ //Check if selection on right line, how?
+ assertEquals("Children lenght should be ","FileSystems/WEB-ROOT/tags/facelets.taglib.xml/paginator",customizedObjectImpl.getLongPath()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
}
/**
@@ -74,11 +77,13 @@
vpeController.getSourceBuilder().openOn(domNode);
IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
assertEquals("facelets.taglib.xml file should be opened","facelets.taglib.xml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$//$NON-NLS-2$
- StructuredSelection selection = (StructuredSelection) activeEditor.getEditorSite().getSelectionProvider().getSelection();
- SimpleFileImpl customizedObjectImpl = (SimpleFileImpl) selection.getFirstElement();
- //cheak if selection on right line, how?
- assertEquals("Children lenght should be","FileSystems/WEB-ROOT/tags/facelets.taglib.xml",customizedObjectImpl.getLongPath()); //$NON-NLS-1$ //$NON-NLS-2$
-
+ IStructuredSelection selection = (IStructuredSelection) activeEditor.getEditorSite().getSelectionProvider().getSelection();
+ //check pass only if we have been opened in our xml editor
+ if(selection.getFirstElement() instanceof SimpleFileImpl){
+ SimpleFileImpl customizedObjectImpl = (SimpleFileImpl) selection.getFirstElement();
+ //check if selection on right line, how?
+ assertEquals("Children lenght should be","FileSystems/WEB-ROOT/tags/facelets.taglib.xml",customizedObjectImpl.getLongPath()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
}
/**
* test open on for following case <h:outputText value="#{msg.greeting}" />
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26947 - in trunk/download.jboss.org/jbosstools/builds/staging/_composite_: trunk and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-25 12:50:56 -0500 (Thu, 25 Nov 2010)
New Revision: 26947
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
Log:
update composited URLs
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta... 2010-11-25 17:47:12 UTC (rev 26946)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta... 2010-11-25 17:50:56 UTC (rev 26947)
@@ -10,7 +10,7 @@
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools-5.2...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-tests/all/...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-common/all...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-jmx/all/repo/'/>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta... 2010-11-25 17:47:12 UTC (rev 26946)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta... 2010-11-25 17:50:56 UTC (rev 26947)
@@ -10,7 +10,7 @@
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools-5.2...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-tests/all/...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-common/all...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-jmx/all/repo/'/>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2010-11-25 17:47:12 UTC (rev 26946)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2010-11-25 17:50:56 UTC (rev 26947)
@@ -10,7 +10,7 @@
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools-5.2...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-tests/all/...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-common/all...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-jmx/all/repo/'/>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2010-11-25 17:47:12 UTC (rev 26946)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2010-11-25 17:50:56 UTC (rev 26947)
@@ -10,7 +10,7 @@
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools-5.2...'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-tests/all/...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-common/all...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-jmx/all/repo/'/>
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26946 - branches/jbosstools-3.2.0.Beta2/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-25 12:47:12 -0500 (Thu, 25 Nov 2010)
New Revision: 26946
Modified:
branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml
Log:
switch to using http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta2/ instead of 8 different sites
Modified: branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml 2010-11-25 17:34:37 UTC (rev 26945)
+++ branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml 2010-11-25 17:47:12 UTC (rev 26946)
@@ -16,7 +16,7 @@
<properties>
<!-- add more inputRepo# here, then reference below; need variables so
that these can be referred to in Ant script later -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.Beta...</inputRepo1>
+ <!-- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.Beta...</inputRepo1>
<inputRepo2>http://download.jboss.org/jbosstools/builds/staging/pi4soa-3.1.x</inputRepo2>
<inputRepo3>http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...</inputRepo3>
<inputRepo4>http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools-5.2</inputRepo4>
@@ -24,7 +24,10 @@
<inputRepo6>http://download.jboss.org/jbosstools/builds/staging/jbosstools-tests</inputRepo6>
<inputRepo7>http://download.jboss.org/jbosstools/builds/staging/jbosstools-common</inputRepo7>
<inputRepo8>http://download.jboss.org/jbosstools/builds/staging/jbosstools-jmx</inputRepo8>
- <inputRepos>1,2,3,4,5,6,7,8</inputRepos>
+ <inputRepos>1,2,3,4,5,6,7,8</inputRepos> -->
+ <!-- use a single composite site so adding more jobs' output is easier -->
+ <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta2/</inputRepo1>
+ <inputRepos>1</inputRepos>
</properties>
<build>
@@ -41,13 +44,13 @@
<quiet>true</quiet>
<tasks>
<property name="inputRepo1" value="${inputRepo1}" />
- <property name="inputRepo2" value="${inputRepo2}" />
+ <!-- <property name="inputRepo2" value="${inputRepo2}" />
<property name="inputRepo3" value="${inputRepo3}" />
<property name="inputRepo4" value="${inputRepo4}" />
<property name="inputRepo5" value="${inputRepo5}" />
<property name="inputRepo6" value="${inputRepo6}" />
<property name="inputRepo7" value="${inputRepo7}" />
- <property name="inputRepo8" value="${inputRepo8}" />
+ <property name="inputRepo8" value="${inputRepo8}" /> -->
<property name="inputRepos" value="${inputRepos}" />
<!-- called AFTER generating update site + zip to add in extra content -->
@@ -91,6 +94,14 @@
can be referred to in Ant script later -->
<repository>
<id>inputRepo1</id>
+ <url>${inputRepo1}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <!-- <repository>
+ <id>inputRepo1</id>
<url>${inputRepo1}/all/repo/</url>
<layout>p2</layout>
<snapshots>
@@ -152,137 +163,6 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
- </repository>
+ </repository> -->
</repositories>
-
- <profiles>
- <profile>
- <id>helios-no-target</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <!--repository> <id>helios</id> <url>http://download.eclipse.org/releases/helios/</url>
- <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases>
- <enabled>true</enabled> </releases> </repository -->
- <repository>
- <id>jboss-helios</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/helios/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <!--repository> <id>webtools32</id> <url>http://download.eclipse.org/webtools/repository/helios</url>
- <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases>
- <enabled>true</enabled> </releases> </repository -->
- <repository>
- <id>jboss-webtools32</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>birt26</id>
- <url>http://download.eclipse.org/birt/update-site/2.6/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <!--repository> <id>swtbot-helios</id> <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository -->
- <repository>
- <id>jboss-swtbot-helios</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>m2eclipse</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>m2eclipse-extras</id>
- <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <!--repository> <id>jboss-orbit</id> <url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository -->
- <repository>
- <id>jboss-thirdparty</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/thirdparty/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>jboss-xulrunner-1.9.1.2</id>
- <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/
- </url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <!--repository> <id>jboss-xulrunner-1.9.2</id> <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/
- </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases> </repository -->
- <repository>
- <id>google eclipse plugins</id>
- <url>http://dl.google.com/eclipse/plugin/3.6</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
- </profiles>
</project>
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26945 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-25 12:34:37 -0500 (Thu, 25 Nov 2010)
New Revision: 26945
Modified:
trunk/build/parent/pom.xml
Log:
switch tests site for composite site
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-11-25 17:18:37 UTC (rev 26944)
+++ trunk/build/parent/pom.xml 2010-11-25 17:34:37 UTC (rev 26945)
@@ -815,8 +815,8 @@
</releases>
</repository>
<repository>
- <id>jbosstools-nightly-tests-trunk</id>
- <url>http://download.jboss.org/jbosstools/builds/staging/jbosstools-tests/all/... </url>
+ <id>jbosstools-nightly-staging-composite-trunk</id>
+ <url>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/ </url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26944 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-11-25 12:18:37 -0500 (Thu, 25 Nov 2010)
New Revision: 26944
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java
Log:
https://jira.jboss.org/browse/JBIDE-7704
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java 2010-11-25 17:15:23 UTC (rev 26943)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java 2010-11-25 17:18:37 UTC (rev 26944)
@@ -18,11 +18,13 @@
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.texteditor.AbstractTextEditor;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
+import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorStandAlone;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
@@ -79,21 +81,8 @@
*/
public static final void checkOpenOnInEditor(IEditorInput editorInput,String editorId,int lineNumber, int lineOffset, String openedOnFileName) throws Throwable {
- IEditorPart editorPart = PlatformUI
- .getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .openEditor(editorInput, editorId);
- StructuredTextEditor textEditor = null;
- if(editorPart instanceof MultiPageEditorPart){
- StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)editorPart, editorInput);
- ((MultiPageEditorPart)editorPart).setActiveEditor(structuredTextEditor);
- textEditor = structuredTextEditor;
- } else if(editorPart instanceof JSPMultiPageEditor) {
- textEditor = ((JSPMultiPageEditor)editorPart).getSourceEditor();
- } else if(editorPart instanceof EditorPartWrapper) {
- StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor(), editorInput);
- ((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor()).setActiveEditor(structuredTextEditor);
- textEditor = structuredTextEditor;
- }
+ StructuredTextEditor textEditor = getStructuredTextEditorPart(editorInput, editorId);
+
int openOnPosition = TestUtil.getLinePositionOffcet(textEditor
.getTextViewer(),lineNumber, lineOffset);
// hack to get hyperlinks detectors, no other was have been founded
@@ -120,6 +109,29 @@
assertEquals(
"Active page should be ", openedOnFileName, activeEditor.getEditorInput().getName()); //$NON-NLS-1$
}
+
+ private static StructuredTextEditor getStructuredTextEditorPart(IEditorInput editorInput,String editorId) throws PartInitException{
+ IEditorPart editorPart = PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .openEditor(editorInput, editorId);
+ StructuredTextEditor textEditor = null;
+ if(editorPart instanceof MultiPageEditorPart){
+ StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)editorPart, editorInput);
+ ((MultiPageEditorPart)editorPart).setActiveEditor(structuredTextEditor);
+ textEditor = structuredTextEditor;
+ } else if(editorPart instanceof JSPMultiPageEditor) {
+ textEditor = ((JSPMultiPageEditor)editorPart).getSourceEditor();
+ } else if(editorPart instanceof EditorPartWrapper
+ &&(((EditorPartWrapper)editorPart).getEditor()) instanceof MultiPageEditorPart) {
+ StructuredTextEditor structuredTextEditor = findStructEditor((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor(), editorInput);
+ ((MultiPageEditorPart)((EditorPartWrapper)editorPart).getEditor()).setActiveEditor(structuredTextEditor);
+ textEditor = structuredTextEditor;
+ } else if(editorPart instanceof EditorPartWrapper &&
+ (((EditorPartWrapper)editorPart).getEditor()) instanceof StructuredTextEditor){
+ textEditor = (StructuredTextEditor) (((EditorPartWrapper)editorPart).getEditor());
+ }
+ return textEditor;
+ }
private static StructuredTextEditor findStructEditor (MultiPageEditorPart part, IEditorInput input){
IEditorPart[] editorParts = part.findEditors(input);
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26943 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-11-25 12:15:23 -0500 (Thu, 25 Nov 2010)
New Revision: 26943
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/ArrayProducer.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/NumberProducer.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/Number_Broken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestQualifier.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestScope.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestType.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6575 Added new tests for unproxyable bean types validation rules (this validation has not been implemented yet).
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2010-11-25 16:39:46 UTC (rev 26942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -41,6 +41,7 @@
defaultPreferences.put(CDIPreferences.MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.UNSATISFIED_INJECTION_POINTS, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.AMBIGUOUS_INJECTION_POINTS, CDIPreferences.WARNING);
+ defaultPreferences.put(CDIPreferences.UNPROXYABLE_BEAN_TYPE, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.INJECT_RESOLVES_TO_NULLABLE_BEAN, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.INJECTED_DECORATOR, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.INJECTED_INTERCEPTOR, CDIPreferences.WARNING);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2010-11-25 16:39:46 UTC (rev 26942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -47,6 +47,10 @@
// treats it as a deployment problem.
public static final String UNSATISFIED_INJECTION_POINTS = INSTANCE.createSeverityOption("unsatisfiedInjectionPoints"); //$NON-NLS-1$
public static final String AMBIGUOUS_INJECTION_POINTS = INSTANCE.createSeverityOption("ambiguousInjectionPoints"); //$NON-NLS-1$
+// 5.4.1. Unproxyable bean types
+// - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
+// the container automatically detects the problem and treats it as a deployment problem.
+ public static final String UNPROXYABLE_BEAN_TYPE = INSTANCE.createSeverityOption("unproxyableBeanType"); //$NON-NLS-1$
// - bean class or producer method or field specifies a @Typed annotation,
// and the value member specifies a class which does not correspond to a type
// in the unrestricted set of bean types of a bean (2.2.2)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-11-25 16:39:46 UTC (rev 26942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -27,6 +27,8 @@
public static String UNSATISFIED_INJECTION_POINTS;
public static String AMBIGUOUS_INJECTION_POINTS;
+ public static String UNPROXYABLE_BEAN_TYPE;
+
public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION;
public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_BEAN_CLASS;
public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_PRODUCER_METHOD;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-11-25 16:39:46 UTC (rev 26942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-11-25 17:15:23 UTC (rev 26943)
@@ -6,6 +6,7 @@
UNSATISFIED_INJECTION_POINTS=No bean is eligible for injection to the injection point
AMBIGUOUS_INJECTION_POINTS=Multiple beans are eligible for injection to the injection point
+UNPROXYABLE_BEAN_TYPE=Injection point declares a type {0} that cannot be proxied by the container resolves to a bean {1} with a normal scope [JSR-299 �5.4.1]
ILLEGAL_TYPE_IN_TYPED_DECLARATION=Bean specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean [JSR-299 �2.2.2]
ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_BEAN_CLASS=Bean class specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean [JSR-299 �2.2.2]
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-11-25 16:39:46 UTC (rev 26942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -45,6 +45,7 @@
new String[][]{
{CDIPreferences.UNSATISFIED_INJECTION_POINTS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_unsatisfiedInjectionPoints_label},
{CDIPreferences.AMBIGUOUS_INJECTION_POINTS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_ambiguousInjectionPoints_label},
+// {CDIPreferences.UNPROXYABLE_BEAN_TYPE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_unproxyableBeanType_label},
{CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label},
{CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label},
{CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariable_label},
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2010-11-25 16:39:46 UTC (rev 26942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -44,6 +44,7 @@
public static String CDIValidatorConfigurationBlock_section_type;
public static String CDIValidatorConfigurationBlock_pb_unsatisfiedInjectionPoints_label;
public static String CDIValidatorConfigurationBlock_pb_ambiguousInjectionPoints_label;
+ public static String CDIValidatorConfigurationBlock_pb_unproxyableBeanType_label;
public static String CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label;
public static String CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label;
public static String CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariable_label;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2010-11-25 16:39:46 UTC (rev 26942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2010-11-25 17:15:23 UTC (rev 26943)
@@ -33,6 +33,7 @@
CDIValidatorConfigurationBlock_section_type=Type
CDIValidatorConfigurationBlock_pb_unsatisfiedInjectionPoints_label=Unsatisfied dependencies for injection point:
CDIValidatorConfigurationBlock_pb_ambiguousInjectionPoints_label=Ambiguous dependencies for injection point:
+CDIValidatorConfigurationBlock_pb_unproxyableBeanType_label=Unproxyable bean type for injection point:
CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label=Illegal type in @Typed:
CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label=Wildcard in producer field type/method return type:
CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariable_label=Variable in producer field type/method return type:
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/ArrayProducer.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/ArrayProducer.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/ArrayProducer.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.unproxyable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+
+public class ArrayProducer {
+
+ @Produces @RequestScoped
+ public TestType[] produce() {
+ return new TestType[0];
+ }
+
+ @Produces @TestQualifier @TestScope
+ public TestType[] produce2() {
+ return new TestType[0];
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/ArrayProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.unproxyable;
+
+import javax.inject.Inject;
+
+public class InjectionPointBean_Broken {
+ @Inject TestType[] arrayBroken;
+ @Inject TestType arrayOk;
+ @Inject @TestQualifier TestType[] arrayBroken2;
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/NumberProducer.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/NumberProducer.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/NumberProducer.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -0,0 +1,29 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.unproxyable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+
+class NumberProducer {
+
+ @Produces
+ @RequestScoped
+ @TestQualifier
+ public int produce() {
+ return 0;
+ }
+
+ @Produces
+ @RequestScoped
+ @TestQualifier
+ public long foo;
+
+ @Produces
+ @RequestScoped
+ @TestQualifier
+ public short foo2;
+
+ @Produces
+ @TestScope
+ @TestQualifier
+ public boolean foo3;
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/NumberProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/Number_Broken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/Number_Broken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/Number_Broken.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.unproxyable;
+
+import javax.inject.Inject;
+
+class Number_Broken {
+
+ @SuppressWarnings("unused")
+ @TestQualifier
+ @Inject private int numberBroken;
+
+ @SuppressWarnings("unused")
+ @TestQualifier
+ @Inject private long numberBroken2;
+
+ @SuppressWarnings("unused")
+ @TestQualifier
+ @Inject private Short numberOk;
+
+ @SuppressWarnings("unused")
+ @TestQualifier
+ @Inject private boolean numberOk1;
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/Number_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestQualifier.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestQualifier.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.unproxyable;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface TestQualifier {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestQualifier.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestScope.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestScope.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestScope.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.unproxyable;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Scope;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Scope
+@Inherited
+@Target({ TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface TestScope {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestScope.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestType.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestType.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestType.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.unproxyable;
+
+public class TestType {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/TestType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2010-11-25 16:39:46 UTC (rev 26942)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2010-11-25 17:15:23 UTC (rev 26943)
@@ -11,6 +11,8 @@
package org.jboss.tools.cdi.core.test.tck.validation;
+import java.text.MessageFormat;
+
import org.eclipse.core.resources.IFile;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
@@ -61,4 +63,74 @@
assertMarkerIsNotCreated(file, CDIValidationMessages.INJECT_RESOLVES_TO_NULLABLE_BEAN, 21);
assertMarkerIsNotCreated(file, CDIValidationMessages.INJECT_RESOLVES_TO_NULLABLE_BEAN, 22);
}
+
+ /**
+ * 5.4.1. Unproxyable bean types
+ * - Array types cannot be proxied by the container.
+ * - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
+ * the container automatically detects the problem and treats it as a deployment problem.
+ *
+ * @throws Exception
+ */
+ public void _testInjectionPointWithArrayType() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java");
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "TestType[]", "ArrayProducer.produce()"), 6);
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "TestType[]", "ArrayProducer.produce2()"), 8);
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "TestType", "TestType"), 7);
+ }
+
+ /**
+ * 5.4.1. Unproxyable bean types
+ * - Primitive types cannot be proxied by the container.
+ * - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
+ * the container automatically detects the problem and treats it as a deployment problem.
+ *
+ * @throws Exception
+ */
+ public void _testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedBean() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/unproxyable/Number_Broken.java");
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "int", "NumberProducer.produce()"), 9);
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "long", "NumberProducer.foo"), 13);
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "Short", "NumberProducer.foo2"), 17);
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "boolean", "NumberProducer.foo3"), 21);
+ }
+
+ /**
+ * 5.4.1. Unproxyable bean types
+ * - Classes which don't have a non-private constructor with no parameters cannot be proxied by the container.
+ * - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
+ * the container automatically detects the problem and treats it as a deployment problem.
+ *
+ * @throws Exception
+ */
+ public void _testClassWithPrivateConstructor() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java");
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "Unproxyable_Broken", "Unproxyable_Broken"), 23);
+ }
+
+ /**
+ * 5.4.1. Unproxyable bean types
+ * - Classes which are declared final cannot be proxied by the container.
+ * - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
+ * the container automatically detects the problem and treats it as a deployment problem.
+ *
+ * @throws Exception
+ */
+ public void _testInjectionPointWhichResolvesToNormalScopedFinalBean() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java");
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "Tuna_Broken", "Tuna_Broken"), 24);
+ }
+
+ /**
+ * 5.4.1. Unproxyable bean types
+ * - Classes which have final methods cannot be proxied by the container.
+ * - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
+ * the container automatically detects the problem and treats it as a deployment problem.
+ *
+ * @throws Exception
+ */
+ public void _testClassWithFinalMethodCannotBeProxied() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java");
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "Tuna_Broken", "Tuna_Broken"), 23);
+ }
}
\ No newline at end of file
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26942 - in trunk/documentation/whatsnew: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-25 11:39:46 -0500 (Thu, 25 Nov 2010)
New Revision: 26942
Added:
trunk/documentation/whatsnew/images/deltacloud-connectionwizard.png
Modified:
trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.Beta2.html
trunk/documentation/whatsnew/images/deltacloud-actions-toseveral.png
trunk/documentation/whatsnew/images/deltacloud-instanceview.png
trunk/documentation/whatsnew/images/deltacloud-servererror.png
Log:
[JBIDE-7647] Creatied Deltacloud N&N for Beta2.
Modified: trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.Beta2.html 2010-11-25 16:11:09 UTC (rev 26941)
+++ trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.Beta2.html 2010-11-25 16:39:46 UTC (rev 26942)
@@ -40,9 +40,9 @@
<b>Deltacloud Server</b>
</td>
<td valign="top">
- <p>We updated the tools to be able to work against the latest Deltacloud server. The tools are currently worka and well tested against Deltacloud 0.0.9.</p>
+ We updated the tools to be able to work against the latest Deltacloud server. The tools are currently works well against a Deltacloud server in version 0.0.9.
<p>
- Related Jiras:
+ Related Jiras:<br />
<a href="http://jira.jboss.org/browse/JBIDE-7401">JBIDE-7401</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7259">JBIDE-7259</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7437">JBIDE-7437</a>,
@@ -52,18 +52,44 @@
<tr>
<td valign="top" align="left">
<a name="itemname3" id="itemname3"></a>
+ <b>New Connection / Edit Connection Wizard</b>
+ </td>
+ <td valign="top">
+ The connection wizard (that allows you to create new connections or edit existing ones)
+ now shows errors and warnings in the title area, like most eclipse wizard do.
+ It now also decorates fields if you enter bogus values.
+ <p><img src="../images/deltacloud-connectionwizard.png" alt="" /></p>
+ <p>
+ Related Jiras:<br/>
+ <a href="http://jira.jboss.org/browse/JBIDE-7305">JBIDE-7305</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7284">JBIDE-7284</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7283">JBIDE-7483</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7282">JBIDE-7482</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7260">JBIDE-7260</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7485">JBIDE-7485</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7317">JBIDE-7317</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7407">JBIDE-7407</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7403">JBIDE-7403</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7360">JBIDE-7360</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7696">JBIDE-7696</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7411">JBIDE-7411</a>,
+ <a href="http://jira.jboss.org/browse/JBIDE-7404">JBIDE-7404</a>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <a name="itemname3" id="itemname3"></a>
<b>Cloud View</b>
</td>
<td valign="top">
- <p>
- We tried to stick to the patterns used in eclipse so that we better match the user expectations.
- We therefore added all relevant actions to the context menu and removed the local view menu.
- You may now refresh the view, create new connections, launch instances, start and stop instances etc.
- right from your context menu.
- We furthermore made sure that we use the default for refresh (F5) and disconnect (delete).
- </p>
+ We tried to stick to the patterns used in eclipse so that we better match the user expectations.
+ We therefore added all relevant actions to the context menu and removed the local view menu.
+ You may now refresh the view, create new connections, launch instances, start and stop instances etc.
+ right from your context menu.
+ We furthermore made sure that we use the default for refresh (F5) and disconnect (delete).
<p><img src="../images/deltacloud-cloudview-contextmenu.png" alt="" /></p>
- Related Jiras:
+ Related Jiras:<br />
<a href="http://jira.jboss.org/browse/JBIDE-7479">JBIDE-7479</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7183">JBIDE-7183</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7367">JBIDE-7367</a>,
@@ -74,7 +100,7 @@
You may now also select several entries in the cloud viewer and choose an action to apply on them
</p>
<p><img src="../images/deltacloud-actions-toseveral.png" alt="" /></p>
- <p>Related Jiras:
+ <p>Related Jiras:</br>
<a href="http://jira.jboss.org/browse/JBIDE-7326">JBIDE-7326</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7306">JBIDE-7306</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7618">JBIDE-7618</a>,
@@ -88,20 +114,22 @@
<p>
The views now refresh immediately as soon as you change any setting to a cloud connection. You don't need to refresh the views any more.
</p>
+ <p>Related Jiras:<br/>
<a href="http://jira.jboss.org/browse/JBIDE-7396">JBIDE-7396</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7518">JBIDE-7518</a>
<p>
Any errors that occur while interacting with the server are now reported in a user friendly manner.
</p>
<p><img src="../images/deltacloud-servererror.png" alt="" /></p>
- <p>Related Jiras:
+ <p>Related Jiras:<br />
<a href="http://jira.jboss.org/browse/JBIDE-7663">JBIDE-7663</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7586">JBIDE-7586</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7459">JBIDE-7459</a>
<p>
- We had a bug in Beta1 that made credentials mix up if you had two connections to the same cloud. We fixed this for Beta2.
+ We unfortunately had a bug in Beta1 that made credentials mix up if you had two connections to the same cloud. We fixed this for Beta2.
</p>
- <a href="http://jira.jboss.org/browse/JBIDE-7625">Related Jira</a>
+ Related Jiras:<br />
+ <a href="http://jira.jboss.org/browse/JBIDE-7625">JBIDE-7625</a>
</td>
</tr>
<tr>
@@ -110,8 +138,8 @@
<b>Properties view</b>
</td>
<td valign="top">
- <p>The properties view had several small issues when it was up to reflect updated settings.</p>
- <p>Related Jiras:
+ The properties view had several small issues when it was up to reflect updated settings.
+ Related Jiras:<br />
<a href="http://jira.jboss.org/browse/JBIDE-7523">JBIDE-7523</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7366">JBIDE-7366</a>
</td>
@@ -122,15 +150,13 @@
<b>Instance View</b>
</td>
<td valign="top">
- <p>
- We enhanced the instance view in several ways and fixed bugs, too. <br />
- There was an issue that prevented the Remote System Explorer to work with instances that run on EC2. <a href="https://jira.jboss.org/browse/JBIDE-7194">This</a> issue was fixed in Beta2.<br />
- We removed the local view menu and put all actions to the context menu so that it better matches what eclipse users may expect.
- You can now select multiple instances and operate on them. The actions now behave exactly as they do in the
- cloud view. We also changed the icons and now display instance states by icons instead of plain text.
- </p>
+ We enhanced the instance view in several ways and fixed bugs, too. <br />
+ There was an issue that prevented the Remote System Explorer to work with instances that run on EC2. <a href="https://jira.jboss.org/browse/JBIDE-7194">This</a> issue was fixed in Beta2.<br />
+ We removed the local view menu and put all actions to the context menu so that it better matches what eclipse users may expect.
+ You can now select multiple instances and operate on them. The actions now behave exactly as they do in the
+ cloud view. We also changed the icons and now display instance states by icons instead of plain text.
<p><img src="../images/deltacloud-instanceview.png" alt="" /></p>
- <p>Related Jiras:
+ <p>Related Jiras:<br />
<a href="http://jira.jboss.org/browse/JBIDE-7194">JBIDE-7194</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7678">JBIDE-7678</a>,
<a href="http://jira.jboss.org/browse/JBIDE-7663">JBIDE-7663</a>,
Modified: trunk/documentation/whatsnew/images/deltacloud-actions-toseveral.png
===================================================================
(Binary files differ)
Added: trunk/documentation/whatsnew/images/deltacloud-connectionwizard.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/deltacloud-connectionwizard.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/images/deltacloud-instanceview.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/whatsnew/images/deltacloud-servererror.png
===================================================================
(Binary files differ)
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26941 - in trunk/jsf/tests: org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-11-25 11:11:09 -0500 (Thu, 25 Nov 2010)
New Revision: 26941
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/JBIDE/4373/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/JBIDE/4373/s-decorate.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/templates/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/templates/insert.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/OpenOnForDecorateTest.java
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/s-decorate.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-7704 moving seam test to right place
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/s-decorate.xhtml
===================================================================
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2010-11-25 15:37:15 UTC (rev 26940)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2010-11-25 16:11:09 UTC (rev 26941)
@@ -180,23 +180,6 @@
}
/**
- * Test openOn mechanism for VpeDefineContainerTemplate
- * in Seam's s:decorate template (SeamDecorateTemplate).
- *
- * @throws CoreException
- * @throws IOException
- */
- public void testOpenOnForSDecorate() throws CoreException, IOException {
- VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "s-decorate.xhtml"); //$NON-NLS-1$
- int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 11, 33);
- Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
- nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
- vpeController.getSourceBuilder().openOn(domNode);
- IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- assertEquals("/templates/insert.xhtml file should be opened","insert.xhtml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
* Test openOn mechanism for VpeIncludeTemplate in ajax4jsf a4j:include.
*
* @throws CoreException
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF 2010-11-25 15:37:15 UTC (rev 26940)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF 2010-11-25 16:11:09 UTC (rev 26941)
@@ -18,7 +18,11 @@
org.jboss.tools.jsf.vpe.facelets,
org.jboss.tools.jsf.vpe.richfaces,
org.jboss.tools.jsf.vpe.seam,
- org.jboss.tools.vpe.html
+ org.jboss.tools.vpe.html,
+ org.eclipse.wst.sse.ui;bundle-version="1.2.0",
+ org.eclipse.jface.text;bundle-version="3.6.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.500",
+ org.jboss.tools.jsf.text.ext.facelets;bundle-version="3.2.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jsf.vpe.seam.test
Bundle-Vendor: %Bundle-Vendor.0
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/JBIDE/4373/s-decorate.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/JBIDE/4373/s-decorate.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/JBIDE/4373/s-decorate.xhtml 2010-11-25 16:11:09 UTC (rev 26941)
@@ -0,0 +1,14 @@
+<!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:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<head>
+</head>
+<body>
+<s:decorate template="/templates/insert.xhtml" styleClass="btn2" style="background-color: blue;" id="id4">
+</s:decorate>
+</body>
+</html>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/JBIDE/4373/s-decorate.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/templates/insert.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/templates/insert.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/templates/insert.xhtml 2010-11-25 16:11:09 UTC (rev 26941)
@@ -0,0 +1,66 @@
+<!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">
+
+<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" align="center">#{user}</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/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/templates/insert.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/OpenOnForDecorateTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/OpenOnForDecorateTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/OpenOnForDecorateTest.java 2010-11-25 16:11:09 UTC (rev 26941)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.seam.test;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.util.SelectionUtil;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.w3c.dom.Node;
+
+/**
+ * Junit test for JBIDE-4373
+ *
+ * @author mareshkau
+ *
+ */
+public class OpenOnForDecorateTest extends VpeTest {
+
+ public OpenOnForDecorateTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Test openOn mechanism for VpeDefineContainerTemplate
+ * in Seam's s:decorate template (SeamDecorateTemplate).
+ *
+ * @throws CoreException
+ * @throws IOException
+ */
+ public void testOpenOnForSDecorate() throws CoreException, IOException {
+ VpeController vpeController = openInVpe(SeamAllTests.IMPORT_PROJECT_NAME, "JBIDE/4373/s-decorate.xhtml"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 11, 33);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("/templates/insert.xhtml file should be opened","insert.xhtml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/OpenOnForDecorateTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-11-25 15:37:15 UTC (rev 26940)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-11-25 16:11:09 UTC (rev 26941)
@@ -32,6 +32,7 @@
suite.addTestSuite(SeamComponentTest.class);
suite.addTestSuite(SeamComponentContentTest.class);
suite.addTestSuite(JBIDE1484Test.class);
+ suite.addTestSuite(OpenOnForDecorateTest.class);
// $JUnit-END$
return new VpeTestSetup(suite);
}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26940 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-11-25 10:37:15 -0500 (Thu, 25 Nov 2010)
New Revision: 26940
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
Log:
Support JBoss EAP Server Type v. 5.x
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-11-25 15:34:08 UTC (rev 26939)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-11-25 15:37:15 UTC (rev 26940)
@@ -389,6 +389,7 @@
public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Middleware";
public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Middleware";
+ public static final String JBOSS_EAP_5_x = "JBoss Enterprise Middleware";
public static final String JBOSS_COMMUNITY = "JBoss Community";
}
@@ -396,6 +397,7 @@
public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Application Platform 4.3 Runtime";
public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0 Runtime";
+ public static final String JBOSS_EAP_5_x = "JBoss Enterprise Application Platform 5.x Runtime";
public static final String JBOSS_AS_5_1 = "JBoss 5.1 Runtime";
}
@@ -403,6 +405,7 @@
public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Application Platform 4.3";
public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0";
+ public static final String JBOSS_EAP_5_x = "JBoss Enterprise Application Platform 5.x";
public static final String JBOSS_AS_5_1 = "JBoss AS 5.1";
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-11-25 15:34:08 UTC (rev 26939)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-11-25 15:37:15 UTC (rev 26940)
@@ -77,7 +77,12 @@
Activator.getDefault().getLog().log(status);
e.printStackTrace();
}
- if (projectProperties.containsKey("JBossEap5.0")){
+ if (projectProperties.containsKey("JBossEap5.x")){
+ JBOSS_EAP_HOME = projectProperties.getProperty("JBossEap5.x"); //$NON-NLS-1$
+ JBOSS_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_EAP_5_x;
+ JBOSS_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_EAP_5_x;
+ JBOSS_SERVER_TYPE = IDELabel.ServerType.JBOSS_EAP_5_x;
+ }else if (projectProperties.containsKey("JBossEap5.0")){
JBOSS_EAP_HOME = projectProperties.getProperty("JBossEap5.0"); //$NON-NLS-1$
JBOSS_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_EAP_5_0;
JBOSS_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_EAP_5_0;
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26939 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test: projects/ShowJarLibrariesTest and 13 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-11-25 10:34:08 -0500 (Thu, 25 Nov 2010)
New Revision: 26939
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.project
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/.jsdtscope
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.jdt.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.component
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/Person.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/resources.properties
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/demo/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/demo/Person.class
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/resources.properties
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/common-annotations.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-beanutils.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-collections.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-digester.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-logging.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-facelets.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-tlds.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jstl.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/standard.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/web.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/index.jsp
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/greeting.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/common.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.properties
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java
Log:
https://jira.jboss.org/browse/JBIDE-7704 , Test project for TaglibXMLUnformatedDTD_JBIDE5642 was added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.classpath 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,17 @@
+<?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.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web;jst.jsf"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_20">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.project 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ShowJarLibrariesTest</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.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>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ </natures>
+</projectDescription>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/.jsdtscope
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/.jsdtscope (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/.jsdtscope 2010-11-25 15:34:08 UTC (rev 26939)
@@ -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/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.jdt.core.prefs 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,8 @@
+#Thu Nov 25 16:57:00 GMT+02:00 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.component 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="ShowJarLibrariesTest">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+ <property name="context-root" value="ShowJarLibrariesTest"/>
+ <property name="java-output-path" value="/ShowJarLibrariesTest/WebContent/WEB-INF/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,7 @@
+<root>
+ <facet id="jst.jsf">
+ <node name="libprov">
+ <attribute name="provider-id" value="jsf-user-library-provider"/>
+ </node>
+ </facet>
+</root>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="java"/>
+ <fixed facet="jst.jsf"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="jst.jsf" version="1.2"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/Person.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/Person.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/demo/Person.java 2010-11-25 15:34:08 UTC (rev 26939)
@@ -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
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/resources.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/resources.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/JavaSource/resources.properties 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,2 @@
+prompt=Your Name\:
+greeting=Hello
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/META-INF/MANIFEST.MF 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/demo/Person.class
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/demo/Person.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/resources.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/resources.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/classes/resources.properties 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,2 @@
+prompt=Your Name\:
+greeting=Hello
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/faces-config.xml 2010-11-25 15:34:08 UTC (rev 26939)
@@ -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
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/common-annotations.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/common-annotations.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-beanutils.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-beanutils.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-collections.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-digester.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-digester.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-facelets.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-facelets.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-tlds.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jsf-tlds.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jstl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/jstl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/standard.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/lib/standard.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/WEB-INF/web.xml 2010-11-25 15:34:08 UTC (rev 26939)
@@ -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>ShowJarLibrariesTest</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>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/index.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/index.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/index.jsp 2010-11-25 15:34:08 UTC (rev 26939)
@@ -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
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/greeting.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/greeting.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/greeting.xhtml 2010-11-25 15:34:08 UTC (rev 26939)
@@ -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
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/inputname.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/pages/inputname.xhtml 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,27 @@
+<!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" />
+
+ <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>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/common.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/common.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/WebContent/templates/common.xhtml 2010-11-25 15:34:08 UTC (rev 26939)
@@ -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
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.properties 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,3 @@
+#
+#Thu Nov 25 16:56:58 GMT+02:00 2010
+classpath.external=
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/ant/build.xml 2010-11-25 15:34:08 UTC (rev 26939)
@@ -0,0 +1,87 @@
+<project name="ShowJarLibrariesTest" basedir="../" default="deploy">
+
+ <!-- Project settings -->
+ <property name="project.distname" value="ShowJarLibrariesTest"/>
+
+ <!-- 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>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-11-25 14:41:05 UTC (rev 26938)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-11-25 15:34:08 UTC (rev 26939)
@@ -52,8 +52,6 @@
suite.addTestSuite(JsfJspJbide6259Test.class);
suite.addTestSuite(JsfJspJbide1704Test.class);
suite.addTestSuite(JsfJspJbide1717Test.class);
- suite.addTestSuite(TaglibXMLUnformatedDTD_JBIDE5642.class);
-
suite.addTest(
new ProjectImportTestSetup(WebContentAssistProviderTest.suite(),
"org.jboss.tools.jsf.ui.test",
@@ -79,7 +77,10 @@
"org.jboss.tools.jsf.ui.test",
new String[]{"projects/test_jsf_project"},
new String[]{"test_jsf_project"}));
-
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(TaglibXMLUnformatedDTD_JBIDE5642.class),
+ "org.jboss.tools.jsf.ui.test",
+ new String[]{"projects/ShowJarLibrariesTest"},
+ new String[]{"ShowJarLibrariesTest"}));
suite.addTestSuite(JsfUiPreferencesPagesTest.class);
return new TestWizardsProject(suite);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java 2010-11-25 14:41:05 UTC (rev 26938)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java 2010-11-25 15:34:08 UTC (rev 26939)
@@ -15,6 +15,10 @@
import junit.framework.TestCase;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
@@ -22,6 +26,8 @@
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
*
@@ -30,15 +36,17 @@
*/
public class TaglibXMLUnformatedDTD_JBIDE5642 extends TestCase {
-
+
+ private static final String PROJECT_NAME = "ShowJarLibrariesTest"; //$NON-NLS-1$
private static final String WEB_PROJECTS_VIEW_ID = "org.jboss.tools.jst.web.ui.navigator.WebProjectsView"; //$NON-NLS-1$
private static final String PACKAGE_EXPLORER_VIEW_ID = "org.eclipse.jdt.ui.PackageExplorer"; //$NON-NLS-1$
- private static final String LIB_PATH = "jsfTest/Tag Libraries/"; //$NON-NLS-1$
+ private static final String LIB_PATH = "/Tag Libraries/"; //$NON-NLS-1$
private static final String LIB_NAME_I = "primefaces-i.taglib.xml - primefaces-2.0.0.RC.jar"; //$NON-NLS-1$
private static final String LIB_NAME_P = "primefaces-p.taglib.xml - primefaces-2.0.0.RC.jar"; //$NON-NLS-1$
private IViewPart webProjectsView;
-
+ private IProject project = null;
+
public TaglibXMLUnformatedDTD_JBIDE5642(String name) {
super(name);
}
@@ -49,17 +57,17 @@
assertNotNull("Web Projects view is not available", webProjectsView); //$NON-NLS-1$
TestUtil.delay(2000);
TestUtil.waitForIdle();
-
+
WebProjectsNavigator projectsNavigator = (WebProjectsNavigator) webProjectsView;
TreeViewer treeViewer = projectsNavigator.getViewer();
assertNotNull(treeViewer);
-
- Object testLibI = findElementByPath(LIB_PATH + LIB_NAME_I, treeViewer);
- assertNotNull("The tag library " + LIB_NAME_I + " was not found", //$NON-NLS-1$ //$NON-NLS-2$
+ String taglibName = PROJECT_NAME + LIB_PATH + LIB_NAME_I;
+ Object testLibI = findElementByPath(taglibName, treeViewer);
+ assertNotNull("The tag library [" + taglibName + "] was not found", //$NON-NLS-1$ //$NON-NLS-2$
testLibI);
-
- Object testLibP = findElementByPath(LIB_PATH + LIB_NAME_P, treeViewer);
- assertNotNull("The tag library " + LIB_NAME_P + " was not found", //$NON-NLS-1$ //$NON-NLS-2$
+ taglibName = PROJECT_NAME + LIB_PATH + LIB_NAME_P;
+ Object testLibP = findElementByPath(taglibName, treeViewer);
+ assertNotNull("The tag library [" + LIB_NAME_P + "] was not found", //$NON-NLS-1$ //$NON-NLS-2$
testLibP);
}
@@ -108,12 +116,21 @@
}
@Override
- protected void tearDown() throws Exception {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .hideView(webProjectsView);
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .showView(PACKAGE_EXPLORER_VIEW_ID);
- super.tearDown();
+ protected void setUp() throws Exception {
+ super.setUp();
+ JobUtils.waitForIdle();
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME);
+ if(project == null) {
+ ProjectImportTestSetup setup = new ProjectImportTestSetup(
+ this,
+ "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
+ "projects/" + PROJECT_NAME, //$NON-NLS-1$
+ PROJECT_NAME);
+ project = setup.importProject();
+ }
+ this.project = project.getProject();
+ this.project.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ JobUtils.waitForIdle();
}
}
14 years, 1 month
- 1
- 0