JBoss Tools SVN: r30829 - trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-25 16:14:05 -0400 (Mon, 25 Apr 2011)
New Revision: 30829
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8572
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java 2011-04-25 20:11:07 UTC (rev 30828)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java 2011-04-25 20:14:05 UTC (rev 30829)
@@ -47,7 +47,8 @@
enums.add((EnumerationProposalType)proposal);
}
}
- assertEquals(4, enums.size());
+ assertEquals(1, enums.size());
+ assertEquals(4, enums.iterator().next().getParams());
break;
}
}
14 years, 11 months
JBoss Tools SVN: r30828 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test: src/org/jboss/tools/cdi/seam/faces/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-25 16:11:07 -0400 (Mon, 25 Apr 2011)
New Revision: 30828
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8572
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF 2011-04-25 19:47:16 UTC (rev 30827)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF 2011-04-25 20:11:07 UTC (rev 30828)
@@ -6,4 +6,5 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.jboss.tools.cdi.seam.faces.core,
org.eclipse.jdt.core,
- org.junit
+ org.junit,
+ org.jboss.tools.jst.web.kb
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java 2011-04-25 19:47:16 UTC (rev 30827)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTagLibTest.java 2011-04-25 20:11:07 UTC (rev 30828)
@@ -10,11 +10,47 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.faces.core.test;
+import java.util.HashSet;
+import java.util.Set;
+
import junit.framework.TestCase;
+import org.jboss.tools.jst.web.kb.internal.proposal.CustomProposalType;
+import org.jboss.tools.jst.web.kb.internal.proposal.EnumerationProposalType;
+import org.jboss.tools.jst.web.kb.internal.taglib.CustomTagLibAttribute;
+import org.jboss.tools.jst.web.kb.taglib.CustomTagLibManager;
+import org.jboss.tools.jst.web.kb.taglib.IAttribute;
+import org.jboss.tools.jst.web.kb.taglib.IComponent;
+import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibrary;
+
/**
* @author Alexey Kazakov
*/
public class SeamFacesTagLibTest extends TestCase {
+ public void testCustomTagLibs() {
+ ICustomTagLibrary[] libs = CustomTagLibManager.getInstance().getLibraries();
+ boolean found = false;
+ for (ICustomTagLibrary lib : libs) {
+ if("http://jboss.org/seam/faces".equals(lib.getURI())) {
+ found = true;
+ IComponent component = lib.getComponent("viewAction");
+ assertNotNull(component);
+ IAttribute attribute = component.getAttribute("phase");
+ assertNotNull(attribute);
+ assertTrue(attribute instanceof CustomTagLibAttribute);
+ CustomTagLibAttribute customAttribute = (CustomTagLibAttribute)attribute;
+ CustomProposalType[] proposals = customAttribute.getProposals();
+ Set<EnumerationProposalType> enums = new HashSet<EnumerationProposalType>();
+ for (CustomProposalType proposal : proposals) {
+ if(proposal instanceof EnumerationProposalType) {
+ enums.add((EnumerationProposalType)proposal);
+ }
+ }
+ assertEquals(4, enums.size());
+ break;
+ }
+ }
+ assertTrue("Can't find http://jboss.org/seam/faces tag lib.", found);
+ }
}
\ No newline at end of file
14 years, 11 months
JBoss Tools SVN: r30827 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-25 15:47:16 -0400 (Mon, 25 Apr 2011)
New Revision: 30827
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
Log:
JBIDE-8214
https://issues.jboss.org/browse/JBIDE-8214
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2011-04-25 19:46:22 UTC (rev 30826)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2011-04-25 19:47:16 UTC (rev 30827)
@@ -556,7 +556,7 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem HIDE="disabled"
+ <XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2011-04-25 19:46:22 UTC (rev 30826)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2011-04-25 19:47:16 UTC (rev 30827)
@@ -856,7 +856,7 @@
<EntityData EntityName="FaceletTaglibExtension"/>
</XActionItem>
</XActionItem>
- <XActionItem HIDE="disabled"
+ <XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
<XActionItemReference entity="FileFaceletTaglib" name="CopyActions"/>
14 years, 11 months
JBoss Tools SVN: r30826 - trunk/struts/plugins/org.jboss.tools.struts/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-25 15:46:22 -0400 (Mon, 25 Apr 2011)
New Revision: 30826
Modified:
trunk/struts/plugins/org.jboss.tools.struts/resources/meta/validator11.meta
trunk/struts/plugins/org.jboss.tools.struts/resources/meta/validator_rules.meta
Log:
JBIDE-8214
https://issues.jboss.org/browse/JBIDE-8214
Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/meta/validator11.meta
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/resources/meta/validator11.meta 2011-04-25 19:45:12 UTC (rev 30825)
+++ trunk/struts/plugins/org.jboss.tools.struts/resources/meta/validator11.meta 2011-04-25 19:46:22 UTC (rev 30826)
@@ -126,7 +126,7 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem HIDE="disabled"
+ <XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/meta/validator_rules.meta
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/resources/meta/validator_rules.meta 2011-04-25 19:45:12 UTC (rev 30825)
+++ trunk/struts/plugins/org.jboss.tools.struts/resources/meta/validator_rules.meta 2011-04-25 19:46:22 UTC (rev 30826)
@@ -180,7 +180,7 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem HIDE="disabled"
+ <XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
14 years, 11 months
JBoss Tools SVN: r30825 - in trunk/jst/plugins/org.jboss.tools.jst.web: src/org/jboss/tools/jst/web/tld/model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-25 15:45:12 -0400 (Mon, 25 Apr 2011)
New Revision: 30825
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld.meta
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/tld20.meta
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileSystemsTreeConstraint.java
Log:
JBIDE-8214
https://issues.jboss.org/browse/JBIDE-8214
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld.meta 2011-04-25 19:39:10 UTC (rev 30824)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld.meta 2011-04-25 19:45:12 UTC (rev 30825)
@@ -177,7 +177,7 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem HIDE="disabled"
+ <XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta 2011-04-25 19:39:10 UTC (rev 30824)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta 2011-04-25 19:45:12 UTC (rev 30825)
@@ -159,7 +159,7 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem HIDE="disabled"
+ <XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/tld20.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/tld20.meta 2011-04-25 19:39:10 UTC (rev 30824)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/tld20.meta 2011-04-25 19:45:12 UTC (rev 30825)
@@ -155,7 +155,7 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem HIDE="disabled"
+ <XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
@@ -388,7 +388,7 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem HIDE="disabled"
+ <XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileSystemsTreeConstraint.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileSystemsTreeConstraint.java 2011-04-25 19:39:10 UTC (rev 30824)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileSystemsTreeConstraint.java 2011-04-25 19:45:12 UTC (rev 30825)
@@ -32,7 +32,8 @@
!entity.startsWith("FileFaceletTaglib") //$NON-NLS-1$
/// && !entity.equals("FileTiles")
) return false;
- return (!"true".equals(object.getAttributeValue("expanded"))); //$NON-NLS-1$ //$NON-NLS-2$
+// return (!"true".equals(object.getAttributeValue("expanded"))); //$NON-NLS-1$ //$NON-NLS-2$
+ return false;
}
public boolean isHidingSomeChildren(XModelObject object) {
14 years, 11 months
JBoss Tools SVN: r30824 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-25 15:39:10 -0400 (Mon, 25 Apr 2011)
New Revision: 30824
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java
Log:
https://issues.jboss.org/browse/JBIDE-8780
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java 2011-04-25 19:32:23 UTC (rev 30823)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java 2011-04-25 19:39:10 UTC (rev 30824)
@@ -39,7 +39,7 @@
if(file != null && file.getFullPath() != null && file.getFullPath().toString().endsWith(".jar")) {
xmodelObject = getXModelObject(tag);
if(xmodelObject != null)
- xmodelObjectName = getFileName(xmodelObject);
+ xmodelObjectName = file.getName()+" : "+getFileName(xmodelObject);
}
}
14 years, 11 months
JBoss Tools SVN: r30823 - in trunk/cdi: tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-25 15:32:23 -0400 (Mon, 25 Apr 2011)
New Revision: 30823
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/
Log:
Moved cdi.seam.text.ext.test plugin to tests folder
14 years, 11 months
JBoss Tools SVN: r30822 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-25 15:30:53 -0400 (Mon, 25 Apr 2011)
New Revision: 30822
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java
Log:
https://issues.jboss.org/browse/JBIDE-8781
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-04-25 19:25:38 UTC (rev 30821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-04-25 19:30:53 UTC (rev 30822)
@@ -22,6 +22,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.jboss.tools.common.core.resources.XModelObjectEditorInput;
import org.jboss.tools.common.el.core.resolver.ELContext;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
@@ -78,7 +79,7 @@
IComponent[] components = PageProcessor.getInstance().getComponents(query, (IPageContext)context);
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
for(IComponent component : components){
- if(component instanceof TLDTag || component instanceof FaceletTag){
+ if(validateComponent(component)){
TLDTagHyperlink link = new TLDTagHyperlink((AbstractComponent)component, reg);
link.setDocument(textViewer.getDocument());
hyperlinks.add(link);
@@ -93,6 +94,21 @@
return parse(textViewer.getDocument(), xmlDocument, region);
}
+ private boolean validateComponent(IComponent component){
+ if(component instanceof TLDTag || component instanceof FaceletTag){
+ IFile file = TLDTagHyperlink.getFile((AbstractComponent)component);
+
+ if(file != null && file.getFullPath() != null && file.getFullPath().toString().endsWith(".jar")) {
+ XModelObject xmodelObject = TLDTagHyperlink.getXModelObject((AbstractComponent)component);
+ if(xmodelObject != null)
+ if(TLDTagHyperlink.getFileName(xmodelObject) != null)
+ return true;
+ }else if(file != null)
+ return true;
+ }
+ return false;
+ }
+
private void sortHyperlinks(ArrayList<IHyperlink> hyperlinks){
for(IHyperlink link : hyperlinks){
if(link instanceof TLDTagHyperlink){
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java 2011-04-25 19:25:38 UTC (rev 30821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java 2011-04-25 19:30:53 UTC (rev 30822)
@@ -32,27 +32,42 @@
public TLDTagHyperlink(AbstractComponent tag, IRegion region){
this.tag = tag;
+ this.region = region;
+
+ IFile file = getFile(tag);
+
+ if(file != null && file.getFullPath() != null && file.getFullPath().toString().endsWith(".jar")) {
+ xmodelObject = getXModelObject(tag);
+ if(xmodelObject != null)
+ xmodelObjectName = getFileName(xmodelObject);
+ }
+ }
+
+ public static IFile getFile(AbstractComponent tag){
ITagLibrary tagLib = tag.getTagLib();
- this.region = region;
IResource r = tagLib.getResource();
- if(r instanceof IFile) {
- IFile file = (IFile)r;
- if(file.getFullPath() != null && file.getFullPath().toString().endsWith(".jar")) {
- Object id = tag.getId();
- if(id instanceof XModelObject) {
- xmodelObject = (XModelObject)id;
- FileAnyImpl fai = null;
- XModelObject f = xmodelObject;
- while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
- if(f instanceof FileAnyImpl) fai = (FileAnyImpl)f;
- xmodelObjectName = FileAnyImpl.toFileName(fai);
- }
- }
- }
+ if(r instanceof IFile)
+ return (IFile)r;
+ return null;
+ }
+
+ public static XModelObject getXModelObject(AbstractComponent tag){
+ Object id = tag.getId();
+ if(id instanceof XModelObject)
+ return (XModelObject)id;
+ return null;
}
+ public static String getFileName(XModelObject xmodelObject){
+ FileAnyImpl fai = null;
+ XModelObject f = xmodelObject;
+ while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
+ if(f instanceof FileAnyImpl) fai = (FileAnyImpl)f;
+ return FileAnyImpl.toFileName(fai);
+ }
+
public AbstractComponent getComponent(){
return tag;
}
@@ -63,7 +78,7 @@
@Override
protected void doHyperlink(IRegion region) {
- if(xmodelObject != null){
+ if(xmodelObjectName != null){
int q = FindObjectHelper.findModelObject(xmodelObject, FindObjectHelper.IN_EDITOR_ONLY);
if(q == 1) {
openFileFailed();
14 years, 11 months
JBoss Tools SVN: r30821 - in trunk/cdi: plugins and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-25 15:25:38 -0400 (Mon, 25 Apr 2011)
New Revision: 30821
Modified:
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml
trunk/cdi/plugins/pom.xml
trunk/cdi/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8572
Modified: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml 2011-04-25 19:00:35 UTC (rev 30820)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml 2011-04-25 19:25:38 UTC (rev 30821)
@@ -35,4 +35,18 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.cdi.seam.faces.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.cdi.seam.text.ext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Modified: trunk/cdi/plugins/pom.xml
===================================================================
--- trunk/cdi/plugins/pom.xml 2011-04-25 19:00:35 UTC (rev 30820)
+++ trunk/cdi/plugins/pom.xml 2011-04-25 19:25:38 UTC (rev 30821)
@@ -14,6 +14,8 @@
<module>org.jboss.tools.cdi.xml.ui</module>
<module>org.jboss.tools.cdi.seam.solder.core</module>
<module>org.jboss.tools.cdi.seam.config.core</module>
+ <module>org.jboss.tools.cdi.seam.faces.core</module>
+ <module>org.jboss.tools.cdi.seam.text.ext</module>
</modules>
</project>
Modified: trunk/cdi/tests/pom.xml
===================================================================
--- trunk/cdi/tests/pom.xml 2011-04-25 19:00:35 UTC (rev 30820)
+++ trunk/cdi/tests/pom.xml 2011-04-25 19:25:38 UTC (rev 30821)
@@ -12,6 +12,8 @@
<module>org.jboss.tools.cdi.ui.test</module>
<module>org.jboss.tools.cdi.seam.solder.core.test</module>
<module>org.jboss.tools.cdi.seam.config.core.test</module>
+ <module>org.jboss.tools.cdi.seam.faces.core.test</module>
+ <module>org.jboss.tools.cdi.seam.text.ext.test</module>
</modules>
</project>
14 years, 11 months
JBoss Tools SVN: r30820 - in trunk/maven/plugins: org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-04-25 15:00:35 -0400 (Mon, 25 Apr 2011)
New Revision: 30820
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java
Log:
JBIDE-8687 JSF tooling adds an Faces Servlet declaration with no servlet mappings on project import
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-04-25 18:59:58 UTC (rev 30819)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-04-25 19:00:35 UTC (rev 30820)
@@ -10,10 +10,18 @@
******************************************************************************/
package org.jboss.tools.maven.jsf.configurators;
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
@@ -25,6 +33,9 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.jboss.tools.maven.core.IJBossMavenConstants;
import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider;
import org.jboss.tools.maven.jsf.MavenJSFActivator;
@@ -42,6 +53,9 @@
private static final String JSF_API2_GROUP_ID = "com.sun.faces"; //$NON-NLS-1$
private static final String JSF_API_ARTIFACT_ID = "jsf-api"; //$NON-NLS-1$
+ private static final String WEB_XML = "WEB-INF/web.xml";
+ private static final String WAR_SOURCE_FOLDER = "/src/main/webapp";
+
protected static final IProjectFacet dynamicWebFacet;
protected static final IProjectFacetVersion dynamicWebVersion;
@@ -84,7 +98,7 @@
if (jsfVersion != null) {
final IFacetedProject fproj = ProjectFacetsManager.create(project);
if (fproj != null && "war".equals(packaging)) { //$NON-NLS-1$
- installWarFacets(fproj, jsfVersion, monitor);
+ installWarFacets(fproj, jsfVersion, mavenProject, monitor);
}
}
}
@@ -117,18 +131,22 @@
}
- private void installWarFacets(IFacetedProject fproj, String jsfVersion,IProgressMonitor monitor) throws CoreException {
+ private void installWarFacets(IFacetedProject fproj,
+ String jsfVersion, MavenProject mavenProject,
+ IProgressMonitor monitor) throws CoreException {
if (!fproj.hasProjectFacet(dynamicWebFacet)) {
Activator.log(Messages.JSFProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet);
}
- installJSFFacet(fproj, jsfVersion, monitor);
+ installJSFFacet(fproj, jsfVersion, mavenProject, monitor);
installM2Facet(fproj, monitor);
}
- private void installJSFFacet(IFacetedProject fproj, String jsfVersionString, IProgressMonitor monitor)
+ private void installJSFFacet(IFacetedProject fproj,
+ String jsfVersionString, MavenProject mavenProject,
+ IProgressMonitor monitor)
throws CoreException {
if (!fproj.hasProjectFacet(jsfFacet)) {
if (jsfVersionString.startsWith("1.1")) { //$NON-NLS-1$
@@ -140,12 +158,132 @@
fproj.installProjectFacet(jsfVersion12, model, monitor);
}
if (jsfVersionString.startsWith("2.0")) { //$NON-NLS-1$
+ String webXmlString = null;
+ IFile webXml = null;
+ webXml = getWebXml(fproj, mavenProject);
+ boolean webXmlExists = webXml != null && webXml.exists();
+ if (!configureWebxml() && webXmlExists) {
+ IStructuredModel webXmlModel = null;
+ try {
+ webXmlModel = StructuredModelManager.getModelManager().getModelForRead(webXml);
+ IStructuredDocument doc = webXmlModel.getStructuredDocument();
+ webXmlString = doc.get();
+ } catch (IOException e) {
+ MavenJSFActivator.log(e);
+ } finally {
+ if (webXmlModel != null) {
+ webXmlModel.releaseFromRead();
+ }
+ }
+ }
IDataModel model = MavenJSFActivator.getDefault().createJSFDataModel(fproj,jsfVersion20);
- fproj.installProjectFacet(jsfVersion20, model, monitor);
+ fproj.installProjectFacet(jsfVersion20, model, monitor);
+ if (!configureWebxml() && webXmlExists && webXmlString != null) {
+ IStructuredModel webXmlModel = null;
+ try {
+ webXmlModel = StructuredModelManager.getModelManager().getModelForEdit(webXml);
+ IStructuredDocument doc = webXmlModel.getStructuredDocument();
+ doc.set(webXmlString);
+ webXmlModel.save();
+ } catch (IOException e) {
+ MavenJSFActivator.log(e);
+ } finally {
+ if (webXmlModel != null) {
+ webXmlModel.releaseFromEdit();
+ }
+ }
+ }
}
}
}
+ private IFile getWebXml(IFacetedProject fproj, MavenProject mavenProject) {
+ IFile webXml;
+ String customWebXml = getCustomWebXml(mavenProject,
+ fproj.getProject());
+ if (customWebXml == null) {
+ webXml = fproj.getProject().getFolder(getWarSourceDirectory(mavenProject,fproj.getProject())).getFile(WEB_XML);
+ } else {
+ webXml = fproj.getProject().getFile(customWebXml);
+ }
+ return webXml;
+ }
+
+ private String getWarSourceDirectory(MavenProject mavenProject,
+ IProject project) {
+ Plugin plugin = mavenProject
+ .getPlugin("org.apache.maven.plugins:maven-war-plugin");
+ if (plugin == null) {
+ return null;
+ }
+ Xpp3Dom config = (Xpp3Dom) plugin.getConfiguration();
+ if (config == null) {
+ return WAR_SOURCE_FOLDER;
+ }
+ Xpp3Dom[] warSourceDirectory = config.getChildren("warSourceDirectory");
+ if (warSourceDirectory != null && warSourceDirectory.length > 0) {
+ String dir = warSourceDirectory[0].getValue();
+ if (project != null) {
+ return tryProjectRelativePath(project, dir).toOSString();
+ }
+ return dir;
+ }
+ return WAR_SOURCE_FOLDER;
+ }
+
+ private IPath tryProjectRelativePath(IProject project,
+ String resourceLocation) {
+ if (resourceLocation == null) {
+ return null;
+ }
+ IPath projectLocation = project.getLocation();
+ IPath directory = Path.fromOSString(resourceLocation);
+ if (projectLocation == null || !projectLocation.isPrefixOf(directory)) {
+ return directory;
+ }
+ return directory.removeFirstSegments(projectLocation.segmentCount())
+ .makeRelative().setDevice(null);
+ }
+
+
+ public String getCustomWebXml(MavenProject mavenProject, IProject project) {
+ Plugin plugin = mavenProject
+ .getPlugin("org.apache.maven.plugins:maven-war-plugin");
+ if (plugin == null) {
+ return null;
+ }
+ Xpp3Dom config = (Xpp3Dom) plugin.getConfiguration();
+ if (config != null) {
+ Xpp3Dom webXmlDom = config.getChild("webXml");
+ if (webXmlDom != null && webXmlDom.getValue() != null) {
+ String webXmlFile = webXmlDom.getValue().trim();
+ webXmlFile = getRelativePath(project, webXmlFile);
+ return webXmlFile;
+ }
+ }
+ return null;
+ }
+
+ private static String getRelativePath(IProject project, String absolutePath) {
+ File basedir = project.getLocation().toFile();
+ String relative;
+ if (absolutePath.equals(basedir.getAbsolutePath())) {
+ relative = ".";
+ } else if (absolutePath.startsWith(basedir.getAbsolutePath())) {
+ relative = absolutePath.substring(basedir.getAbsolutePath()
+ .length() + 1);
+ } else {
+ relative = absolutePath;
+ }
+ return relative.replace('\\', '/'); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ private boolean configureWebxml() {
+ IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+ return store.getBoolean(Activator.CONFIGURE_WEBXML_JSF20);
+ }
+
+
private String getJSFVersion(MavenProject mavenProject) {
String version = null;
version = Activator.getDefault().getDependencyVersion(mavenProject, JSF_API_GROUP_ID, JSF_API_ARTIFACT_ID);
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-04-25 18:59:58 UTC (rev 30819)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-04-25 19:00:35 UTC (rev 30820)
@@ -46,6 +46,10 @@
public static final String CONFIGURE_JSF = "configureJSF"; //$NON-NLS-1$
public static final boolean CONFIGURE_JSF_VALUE = true;
+
+ public static final String CONFIGURE_WEBXML_JSF20 = "configureWebxmlJSF20"; //$NON-NLS-1$
+
+ public static final boolean CONFIGURE_WEBXML_JSF20_VALUE = false;
public static final boolean CONFIGURE_PORTLET_VALUE = true;
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2011-04-25 18:59:58 UTC (rev 30819)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2011-04-25 19:00:35 UTC (rev 30820)
@@ -19,6 +19,7 @@
*/
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.jboss.tools.maven.ui.messages"; //$NON-NLS-1$
+ public static String ConfiguratorPreferencePage_Configure_Webxml_JSF20;
public static String AutoResizeTableLayout_Unknown_column_layout_data;
public static String MavenFacetInstallPage_Add_M2_capabilities_to_this_Web_Project;
public static String MavenFacetInstallPage_Artifact_Id;
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-04-25 18:59:58 UTC (rev 30819)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-04-25 19:00:35 UTC (rev 30820)
@@ -26,6 +26,7 @@
ConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet=JBoss Portlet Core facet
ConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet=JBoss Seam Portlet facet
ConfiguratorPreferencePage_Configure_JSF_facet=JSF facet
+ConfiguratorPreferencePage_Configure_Webxml_JSF20=web.xml for JSF 2.0 facet
ConfiguratorPreferencePage_Configure_CDI_facet=CDI facet
ConfiguratorPreferencePage_Configure_Hibernate=Hibernate
ConfiguratorPreferencePage_Configure_Seam_Artifacts=Seam Artifacts (view folder, model source folder, package ...)
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java 2011-04-25 18:59:58 UTC (rev 30819)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java 2011-04-25 19:00:35 UTC (rev 30820)
@@ -46,6 +46,7 @@
private Button configureSeamRuntimeButton;
private Button configureSeamArtifactsButton;
private Button configureJSFButton;
+ private Button configureWebxmlJSF20Button;
private Button configurePortletButton;
private Button configureJSFPortletButton;
private Button configureSeamPortletButton;
@@ -98,6 +99,11 @@
configureJSFButton.setText(Messages.ConfiguratorPreferencePage_Configure_JSF_facet);
boolean configureJSF = store.getBoolean(Activator.CONFIGURE_JSF);
configureJSFButton.setSelection(configureJSF);
+
+ configureWebxmlJSF20Button = new Button(composite,SWT.CHECK);
+ configureWebxmlJSF20Button.setText(Messages.ConfiguratorPreferencePage_Configure_Webxml_JSF20);
+ boolean configureWebxml = store.getBoolean(Activator.CONFIGURE_WEBXML_JSF20);
+ configureWebxmlJSF20Button.setSelection(configureWebxml);
}
if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_PORTLET)) {
@@ -147,6 +153,7 @@
protected void performDefaults() {
if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_JSF)) {
configureJSFButton.setSelection(Activator.CONFIGURE_JSF_VALUE);
+ configureWebxmlJSF20Button.setSelection(Activator.CONFIGURE_WEBXML_JSF20_VALUE);
}
if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_SEAM)) {
configureSeamButton.setSelection(Activator.CONFIGURE_SEAM_VALUE);
@@ -204,6 +211,7 @@
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_JSF)) {
store.setValue(Activator.CONFIGURE_JSF, configureJSFButton.getSelection());
+ store.setValue(Activator.CONFIGURE_WEBXML_JSF20, configureWebxmlJSF20Button.getSelection());
}
if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_PORTLET)) {
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java 2011-04-25 18:59:58 UTC (rev 30819)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java 2011-04-25 19:00:35 UTC (rev 30820)
@@ -40,6 +40,9 @@
Activator.CONFIGURE_JSF,
Activator.CONFIGURE_JSF_VALUE);
node.putBoolean(
+ Activator.CONFIGURE_WEBXML_JSF20,
+ Activator.CONFIGURE_WEBXML_JSF20_VALUE);
+ node.putBoolean(
Activator.CONFIGURE_PORTLET,
Activator.CONFIGURE_PORTLET_VALUE);
node.putBoolean(
14 years, 11 months