JBoss Tools SVN: r30889 - trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-04-27 19:39:07 -0400 (Wed, 27 Apr 2011)
New Revision: 30889
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
Log:
Fix for intermittent errors in VPE related to catching exceptions that not related to VPE
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2011-04-27 23:06:37 UTC (rev 30888)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2011-04-27 23:39:07 UTC (rev 30889)
@@ -31,3 +31,4 @@
org.eclipse.wst.html.core,
org.jboss.tools.common.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: .
14 years, 11 months
JBoss Tools SVN: r30888 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-27 19:06:37 -0400 (Wed, 27 Apr 2011)
New Revision: 30888
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8800
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-04-27 22:26:34 UTC (rev 30887)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-04-27 23:06:37 UTC (rev 30888)
@@ -143,6 +143,16 @@
regionList.add(new Region(1237, 14));
regionList.add(new Region(1252, 8));
recognitionTest.put("org.jboss.tools.common.text.ext.jsp.EXPRESSION", regionList);
+
+ regionList = new ArrayList<Region>();
+ regionList.add(new Region(680, 1));
+ regionList.add(new Region(763, 1));
+ regionList.add(new Region(870, 1));
+ regionList.add(new Region(920, 1));
+ regionList.add(new Region(971, 1));
+ regionList.add(new Region(1029, 1));
+ regionList.add(new Region(1098, 1));
+ recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION", regionList);
int counter = 0;
for (int i = 0; i < document.getLength(); i++) {
@@ -150,8 +160,10 @@
boolean recognized = elPartitioner.recognize(testData.document, testData.getHyperlinkRegion());
if (recognized) {
String childPartitionType = elPartitioner.getChildPartitionType(testData.document, testData.getHyperlinkRegion());
+ //System.out.println("Type - "+childPartitionType+" offset - "+i);
if (childPartitionType != null) {
ArrayList<Region> test = (ArrayList<Region>)recognitionTest.get(childPartitionType);
+ assertNotNull("There are no regions for partition type - "+childPartitionType, test);
boolean testResult = false;
Iterator<Region> regions = test.iterator();
Region r = null;
14 years, 11 months
JBoss Tools SVN: r30887 - branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-04-27 18:26:34 -0400 (Wed, 27 Apr 2011)
New Revision: 30887
Modified:
branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java
Log:
fix for intermittently failed VPE Tests
Modified: branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java
===================================================================
--- branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-04-27 22:17:21 UTC (rev 30886)
+++ branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-04-27 22:26:34 UTC (rev 30887)
@@ -37,6 +37,7 @@
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
+import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
@@ -140,10 +141,6 @@
Platform.removeLogListener(this);
- if (getException() != null) {
- throw new Exception(getException());
- }
-
super.tearDown();
}
@@ -164,18 +161,20 @@
* the plugin
*/
public void logging(IStatus status, String plugin) {
- switch (status.getSeverity()) {
- case IStatus.ERROR:
- setException(status.getException());
- break;
- case IStatus.WARNING:
- if (isCheckWarning())
- setException(status.getException());
- break;
- default:
- break;
+ if(VpePlugin.PLUGIN_ID.equals(status.getPlugin())) {
+ switch (status.getSeverity()) {
+ case IStatus.ERROR:
+ setException(status.getException());
+ break;
+ case IStatus.WARNING:
+ if (isCheckWarning()) {
+ setException(status.getException());
+ }
+ break;
+ default:
+ break;
+ }
}
-
}
/**
14 years, 11 months
JBoss Tools SVN: r30886 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test: projects/CDIConfigTest/src/org/jboss and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-27 18:17:21 -0400 (Wed, 27 Apr 2011)
New Revision: 30886
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Horse.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Knight.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Sword.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml 2011-04-27 22:16:57 UTC (rev 30885)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/beans.xml 2011-04-27 22:17:21 UTC (rev 30886)
@@ -6,6 +6,7 @@
xmlns:test602="urn:java:org.jboss.test602.report"
xmlns:test603="urn:java:org.jboss.test603"
xmlns:test6041="urn:java:org.jboss.test6041"
+ xmlns:test6042="urn:java:org.jboss.test6042"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
<config:MyAnnotation>
<s:Qualifier1/>
@@ -62,4 +63,24 @@
</test6041:stringArrayField>
</test6041:ArrayFieldValue>
+<test6042:Knight>
+ <test6042:sword>
+ <s:value>
+ <test6042:Sword type="sharp"/>
+ </s:value>
+ </test6042:sword>
+ <test6042:horse>
+ <s:value>
+ <test6042:Horse>
+ <test6042:name>
+ <s:value>billy</s:value>
+ </test6042:name>
+ <test6042:shoe>
+ <s:Inject/>
+ </test6042:shoe>
+ </test6042:Horse>
+ </s:value>
+ </test6042:horse>
+</test6042:Knight>
+
</beans>
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Horse.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Horse.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Horse.java 2011-04-27 22:17:21 UTC (rev 30886)
@@ -0,0 +1,6 @@
+package org.jboss.test6042;
+
+public class Horse {
+ String name;
+ String shoe;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Horse.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Knight.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Knight.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Knight.java 2011-04-27 22:17:21 UTC (rev 30886)
@@ -0,0 +1,7 @@
+package org.jboss.test6042;
+
+public class Knight {
+ Sword sword;
+ Horse horse;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Knight.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Sword.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Sword.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Sword.java 2011-04-27 22:17:21 UTC (rev 30886)
@@ -0,0 +1,6 @@
+package org.jboss.test6042;
+
+public class Sword {
+ String type;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/test6042/Sword.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-04-27 22:16:57 UTC (rev 30885)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-04-27 22:17:21 UTC (rev 30886)
@@ -10,10 +10,12 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IMemberValuePair;
+import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IJavaAnnotation;
import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature;
+import org.jboss.tools.cdi.seam.config.core.CDISeamConfigConstants;
import org.jboss.tools.cdi.seam.config.core.CDISeamConfigExtension;
import org.jboss.tools.cdi.seam.config.core.ConfigDefinitionContext;
import org.jboss.tools.cdi.seam.config.core.definition.SeamBeanDefinition;
@@ -187,4 +189,74 @@
}
+ /**
+<test6042:Knight>
+ <test6042:sword>
+ <s:value>
+ <test6042:Sword type="sharp"/>
+ </s:value>
+ </test6042:sword>
+ <test6042:horse>
+ <s:value>
+ <test6042:Horse>
+ <test6042:name>
+ <value>billy</value>
+ </test6042:name>
+ <test6042:shoe>
+ <Inject/>
+ </test6042:shoe>
+ </test6042:Horse>
+ </s:value>
+ </test6042:horse>
+</test6042:Knight>
+ */
+ public void testInlineBeanDeclarations() {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+ ConfigDefinitionContext context = (ConfigDefinitionContext)getConfigExtension(cdi).getContext();
+ SeamBeansDefinition d = getBeansDefinition(context, "src/META-INF/beans.xml");
+
+ Set<SeamBeanDefinition> ds = findBeanDefinitionByTagName(d, "test6042:Knight");
+ assertEquals(1, ds.size());
+ SeamBeanDefinition knight = ds.iterator().next();
+
+ SeamFieldDefinition f = knight.getField("sword");
+ assertNotNull(f);
+ ds = findBeanDefinitionByTagName(d, "test6042:Sword");
+ assertEquals(1, ds.size());
+ SeamBeanDefinition sword = ds.iterator().next();
+ assertTrue(sword.isInline());
+ IJavaAnnotation a1 = sword.getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER);
+ assertNotNull(a1);
+ IJavaAnnotation a2 = f.getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER);
+ assertTrue(a1 == a2);
+ IJavaAnnotation inject = f.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
+ assertNotNull(inject);
+
+ SeamFieldDefinition swordType = sword.getField("type");
+ assertNotNull(swordType);
+ assertEquals("sharp", swordType.getValue());
+
+ f = knight.getField("horse");
+ assertNotNull(f);
+ ds = findBeanDefinitionByTagName(d, "test6042:Horse");
+ assertEquals(1, ds.size());
+ SeamBeanDefinition horse = ds.iterator().next();
+ assertTrue(horse.isInline());
+ a1 = horse.getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER);
+ assertNotNull(a1);
+ a2 = f.getAnnotation(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER);
+ assertTrue(a1 == a2);
+ inject = f.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
+ assertNotNull(inject);
+
+ SeamFieldDefinition horseName = horse.getField("name");
+ assertNotNull(horseName);
+ assertEquals("billy", horseName.getValue());
+ SeamFieldDefinition shoe = horse.getField("shoe");
+ assertNotNull(shoe);
+ inject = shoe.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
+ assertNotNull(inject);
+
+ }
+
}
14 years, 11 months
JBoss Tools SVN: r30885 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core: definition and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-27 18:16:57 -0400 (Wed, 27 Apr 2011)
New Revision: 30885
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigConstants.java 2011-04-27 19:51:37 UTC (rev 30884)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigConstants.java 2011-04-27 22:16:57 UTC (rev 30885)
@@ -21,6 +21,8 @@
//Problem id: node name was not resolved to Java type
public String ERROR_UNRESOLVED_TYPE = "Unresolved type";
+ public String ERROR_UNRESOLVED_MEMBER = "Unresolved member";
+
//Problem id: node was expected to be resolved to annotation type
public String ERROR_ANNOTATION_EXPECTED = "Annotation expected";
@@ -44,4 +46,6 @@
public String KEYWORD_PARAMETERS = "parameters";
public String ATTR_DIMENSIONS = "dimensions";
+
+ public String INLINE_BEAN_QUALIFIER = "org.jboss.seam.config.xml.fieldset.InlineBeanQualifier";
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java 2011-04-27 19:51:37 UTC (rev 30884)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamBeanDefinition.java 2011-04-27 22:16:57 UTC (rev 30885)
@@ -15,6 +15,7 @@
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement;
+import org.jboss.tools.cdi.seam.config.core.scanner.SAXNode;
/**
*
@@ -22,16 +23,33 @@
*
*/
public class SeamBeanDefinition extends SeamMemberDefinition {
+ boolean inline = false;
IType type = null;
List<SeamFieldDefinition> fields = new ArrayList<SeamFieldDefinition>();
List<SeamMethodDefinition> methods = new ArrayList<SeamMethodDefinition>();
public SeamBeanDefinition() {}
+ public SAXElement getElement() {
+ return (SAXElement)getNode();
+ }
+
+ public void setInline(boolean b) {
+ inline = b;
+ }
+
+ public boolean isInline() {
+ return inline;
+ }
+
public void setType(IType type) {
this.type = type;
}
+ public IType getType() {
+ return type;
+ }
+
public void addField(SeamFieldDefinition field) {
fields.add(field);
}
@@ -42,8 +60,7 @@
public SeamFieldDefinition getField(String name) {
for (SeamFieldDefinition d: fields) {
- SAXElement e = d.getElement();
- if(name.equals(e.getLocalName())) return d;
+ if(name.equals(d.getName())) return d;
}
return null;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java 2011-04-27 19:51:37 UTC (rev 30884)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamFieldDefinition.java 2011-04-27 22:16:57 UTC (rev 30885)
@@ -16,6 +16,8 @@
import java.util.Map;
import org.eclipse.jdt.core.IField;
+import org.jboss.tools.cdi.seam.config.core.scanner.SAXAttribute;
+import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement;
import org.jboss.tools.cdi.seam.config.core.scanner.SAXText;
/**
@@ -35,6 +37,13 @@
this.field = field;
}
+ public String getName() {
+ if(field != null) return field.getElementName();
+ if(getNode() instanceof SAXElement) return ((SAXElement)getNode()).getLocalName();
+ if(getNode() instanceof SAXAttribute) return ((SAXAttribute)getNode()).getName();
+ return null;
+ }
+
public String getValue() {
return listValue == null || listValue.size() == 0 ? null : listValue.get(0).getValue();
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java 2011-04-27 19:51:37 UTC (rev 30884)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java 2011-04-27 22:16:57 UTC (rev 30885)
@@ -15,6 +15,7 @@
import org.jboss.tools.cdi.core.IJavaAnnotation;
import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement;
+import org.jboss.tools.cdi.seam.config.core.scanner.SAXNode;
import org.jboss.tools.common.text.ITextSourceReference;
/**
@@ -23,19 +24,19 @@
*
*/
public abstract class SeamMemberDefinition {
- protected SAXElement element;
+ protected SAXNode node;
protected SAXElement replaces = null;
protected SAXElement modifies = null;
protected Map<String, IJavaAnnotation> annotations = new HashMap<String, IJavaAnnotation>();
public SeamMemberDefinition() {}
- public void setElement(SAXElement element) {
- this.element = element;
+ public void setNode(SAXNode node) {
+ this.node = node;
}
- public SAXElement getElement() {
- return element;
+ public SAXNode getNode() {
+ return node;
}
public void setReplaces(SAXElement replaces) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java 2011-04-27 19:51:37 UTC (rev 30884)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java 2011-04-27 22:16:57 UTC (rev 30885)
@@ -12,11 +12,9 @@
import org.jboss.tools.common.text.ITextSourceReference;
-public class SAXAttribute extends SAXNode {
+public class SAXAttribute extends SAXText {
private String name;
private ITextSourceReference nameLocation;
- private String value;
- private ITextSourceReference valueLocation;
private SAXElement parent;
@@ -28,28 +26,20 @@
return name;
}
- public void setValue(String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
-
public void setNameLocation(ITextSourceReference location) {
nameLocation = location;
}
- public void setValueLocation(ITextSourceReference location) {
- valueLocation = location;
- }
-
public ITextSourceReference getNameLocation() {
return nameLocation;
}
+ public void setValueLocation(ITextSourceReference location) {
+ setLocation(location);
+ }
+
public ITextSourceReference getValueLocation() {
- return valueLocation;
+ return getLocation();
}
public void setParent(SAXElement parent) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java 2011-04-27 19:51:37 UTC (rev 30884)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java 2011-04-27 22:16:57 UTC (rev 30885)
@@ -127,6 +127,14 @@
SAXAttribute a = new SAXAttribute();
a.setName(n);
a.setValue(v);
+ int n_start = document.get().indexOf(n, start);
+ if(n_start >= 0) {
+ a.setNameLocation(new Location(n_start, n.length()));
+ int v_start = document.get().indexOf('"', n_start);
+ if(v_start >= 0) {
+ a.setValueLocation(new Location(v_start + 1, v.length()));
+ }
+ }
//TODO
element.addAttribute(a);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-04-27 19:51:37 UTC (rev 30884)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-04-27 22:16:57 UTC (rev 30885)
@@ -12,8 +12,10 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.text.IDocument;
+import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.IJavaAnnotation;
+import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.AnnotationLiteral;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.seam.config.core.CDISeamConfigConstants;
@@ -73,7 +75,7 @@
if(typeCheck.isAnnotation) {
scanAnnotation(element, type);
} else {
- scanBean(element, type);
+ scanBean(element, type, false);
}
}
@@ -95,9 +97,10 @@
}
- private void scanBean(SAXElement element, IType type) {
+ private SeamBeanDefinition scanBean(SAXElement element, IType type, boolean inline) {
SeamBeanDefinition def = new SeamBeanDefinition();
- def.setElement(element);
+ def.setInline(inline);
+ def.setNode(element);
def.setType(type);
result.addBeanDefinition(def);
List<SAXElement> es = element.getChildElements();
@@ -130,14 +133,25 @@
} else if(m instanceof IMethod) {
def.addMethod(scanMethod(element, (IMethod)m));
} else {
- result.addUnresolvedNode(c, "Cannot resolve member.");
+ result.addUnresolvedNode(c, CDISeamConfigConstants.ERROR_UNRESOLVED_MEMBER);
}
}
+ Set<String> as = element.getAttributeNames();
+ for (String name: as) {
+ SAXAttribute a = element.getAttribute(name);
+ IField f = type.getField(name);
+ if(f == null || !f.exists()) {
+ result.addUnresolvedNode(a, CDISeamConfigConstants.ERROR_UNRESOLVED_MEMBER);
+ } else {
+ def.addField(scanField(a, f));
+ }
+ }
+ return def;
}
private SeamFieldDefinition scanField(SAXElement element, IField field) {
SeamFieldDefinition def = new SeamFieldDefinition();
- def.setElement(element);
+ def.setNode(element);
def.setField(field);
if(Util.hasText(element)) {
def.addValue(element.getTextNode());
@@ -149,7 +163,7 @@
if(Util.hasText(c)) {
def.addValue(c.getTextNode());
} else {
- scanFieldValue(c);
+ scanFieldValue(def, c);
}
continue;
} else if(Util.isEntry(c)) {
@@ -167,21 +181,36 @@
return def;
}
+ private SeamFieldDefinition scanField(SAXAttribute a, IField field) {
+ SeamFieldDefinition def = new SeamFieldDefinition();
+ def.setNode(a);
+ def.setField(field);
+ def.addValue(a);
+ return def;
+ }
+
/**
* Scan field value for inline bean declarations.
* @param element
*/
- private void scanFieldValue(SAXElement element) {
+ private void scanFieldValue(SeamFieldDefinition def, SAXElement element) {
if(!Util.isConfigRelevant(element)) return;
List<SAXElement> es = element.getChildElements();
for (SAXElement c: es) {
if(!Util.isConfigRelevant(c)) continue;
- IType type = Util.resolveType(element, project);
+ IType type = Util.resolveType(c, project);
if(type == null) continue;
- TypeCheck typeCheck = new TypeCheck(type, element);
+ TypeCheck typeCheck = new TypeCheck(type, c);
if(typeCheck.isCorrupted) return;
if(!typeCheck.isAnnotation) {
- scanBean(element, type);
+ SeamBeanDefinition inline = scanBean(c, type, true);
+ IJavaAnnotation q = createInlineBeanQualifier();
+ if(q != null) {
+ inline.addAnnotation(q);
+ def.addAnnotation(q);
+ IJavaAnnotation inject = createInject();
+ if(inject != null) def.addAnnotation(inject);
+ }
}
}
}
@@ -196,14 +225,14 @@
if(Util.hasText(c)) {
key = c.getTextNode();
} else {
- scanFieldValue(c);
+ scanFieldValue(def, c);
}
}
if(Util.isValue(c)) {
if(Util.hasText(c)) {
value = c.getTextNode();
} else {
- scanFieldValue(c);
+ scanFieldValue(def, c);
}
}
}
@@ -214,7 +243,7 @@
private SeamMethodDefinition scanMethod(SAXElement element, IMethod method) {
SeamMethodDefinition def = new SeamMethodDefinition();
- def.setElement(element);
+ def.setNode(element);
def.setMethod(method);
List<SAXElement> es = element.getChildElements();
for (SAXElement c: es) {
@@ -245,7 +274,7 @@
private SeamParameterDefinition scanParameter(SAXElement element) {
if(!Util.isConfigRelevant(element)) return null;
SeamParameterDefinition def = new SeamParameterDefinition();
- def.setElement(element);
+ def.setNode(element);
if(Util.isArray(element)) {
if(element.hasAttribute(CDISeamConfigConstants.ATTR_DIMENSIONS)) {
def.setDimensions(element.getAttribute(CDISeamConfigConstants.ATTR_DIMENSIONS).getValue());
@@ -340,4 +369,23 @@
}
}
+ static long inlineBeanCount = 0;
+
+ IJavaAnnotation createInlineBeanQualifier() {
+ IType type = project.getType(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER);
+ if(type == null) {
+ return null;
+ }
+ long id = inlineBeanCount++;
+ return new AnnotationLiteral(resource, 0, 0, "" + id, IMemberValuePair.K_STRING, type);
+ }
+
+ IJavaAnnotation createInject() {
+ IType type = project.getType(CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
+ if(type == null) {
+ return null;
+ }
+ return new AnnotationLiteral(resource, 0, 0, null, 0, type);
+ }
+
}
14 years, 11 months
JBoss Tools SVN: r30884 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-27 15:51:37 -0400 (Wed, 27 Apr 2011)
New Revision: 30884
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties
Log:
reverting mistaken commit (changed RSE to RSE2 to test display)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties 2011-04-27 18:27:03 UTC (rev 30883)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties 2011-04-27 19:51:37 UTC (rev 30884)
@@ -4,4 +4,4 @@
AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.systemCopyServer
ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60
-RSEMethodName=Remote System Deployment2
\ No newline at end of file
+RSEMethodName=Remote System Deployment
\ No newline at end of file
14 years, 11 months
JBoss Tools SVN: r30883 - in trunk/maven: tests/org.jboss.tools.maven.ui.bot.test/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-04-27 14:27:03 -0400 (Wed, 27 Apr 2011)
New Revision: 30883
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java
Log:
JBIDE-8797 Test failure in Maven trunk component
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2011-04-27 17:51:19 UTC (rev 30882)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2011-04-27 18:27:03 UTC (rev 30883)
@@ -18,6 +18,7 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -747,20 +748,20 @@
build.getPlugins().add(plugin);
}
- public static PomResourceImpl loadResource(IFile pomFile) throws CoreException {
- String path = pomFile.getFullPath().toOSString();
- URI uri = URI.createFileURI(path);
- try {
- PomResourceFactoryImpl factory = new PomResourceFactoryImpl();
- PomResourceImpl resource = (PomResourceImpl) factory.createResource(uri);
- resource.load(Collections.EMPTY_MAP);
- return resource;
-
- } catch (Exception ex) {
- String msg = "Can't load model " + pomFile;
- log(ex);
- throw new CoreException(new Status(IStatus.ERROR,
- IMavenConstants.PLUGIN_ID, -1, msg, ex));
- }
- }
+ public static PomResourceImpl loadResource(IFile pomFile)
+ throws CoreException {
+ String path = pomFile.getFullPath().toOSString();
+ URI uri = URI.createPlatformResourceURI(path, true);
+ try {
+ org.eclipse.emf.ecore.resource.Resource pomResource = new PomResourceFactoryImpl()
+ .createResource(uri);
+ pomResource.load(new HashMap());
+ return (PomResourceImpl) pomResource;
+ } catch (Exception ex) {
+ String msg = "Can't load model " + pomFile;
+ log(ex);
+ throw new CoreException(new Status(IStatus.ERROR,
+ IMavenConstants.PLUGIN_ID, -1, msg, ex));
+ }
+ }
}
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-04-27 17:51:19 UTC (rev 30882)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-04-27 18:27:03 UTC (rev 30883)
@@ -35,7 +35,9 @@
org.eclipse.jst.jee,
org.eclipse.jst.jee.ejb,
org.eclipse.jst.jee.ui,
- org.eclipse.jst.jee.web
+ org.eclipse.jst.jee.web,
+ org.eclipse.m2e.lifecyclemapping.defaults;bundle-version="0.13.0",
+ org.eclipse.m2e.launching;bundle-version="0.13.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-RegisterBuddy: org.apache.log4j
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-04-27 17:51:19 UTC (rev 30882)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-04-27 18:27:03 UTC (rev 30883)
@@ -491,6 +491,18 @@
}
@Test
+ public void testAsLocation() {
+ String asLocation = JBOSS_AS_HOME;
+ assertTrue("Invalid JBoss AS location:" + asLocation, new File(asLocation).isDirectory());
+ }
+
+ @Test
+ public void testSeamLocation() {
+ String seamLocation = SEAM_HOME_PROPERTY;
+ assertTrue("Invalid Seam Runtime location:" + seamLocation, new File(seamLocation).isDirectory());
+ }
+
+ @Test
public void testErrors() throws Exception {
checkErrors(PROJECT_NAME);
checkErrors(EAR_PROJECT_NAME);
@@ -511,7 +523,9 @@
for (int i = 0; i < projectMarkers.length; i++) {
if (projectMarkers[i].getAttribute(IMarker.SEVERITY,
IMarker.SEVERITY_ERROR) == IMarker.SEVERITY_ERROR) {
- markers.add(projectMarkers[i]);
+ if (!"org.eclipse.m2e.core.maven2Problem.lifecycleMapping".equals(projectMarkers[i].getType())) {
+ markers.add(projectMarkers[i]);
+ }
}
}
assertTrue("The '" + projectName + "' contains errors.", markers.size() == 0);
@@ -545,7 +559,7 @@
warProjectItem.select();
SWTBotMenu runAs = tree.contextMenu("Run As");
- runAs.menu("6 Maven build...").click();
+ runAs.menu("5 Maven build...").click();
SWTBotShell shell = bot.shell("Edit Configuration");
shell.activate();
14 years, 11 months
JBoss Tools SVN: r30882 - trunk/common/plugins/org.jboss.tools.common.el.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-04-27 13:51:19 -0400 (Wed, 27 Apr 2011)
New Revision: 30882
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
Log:
fix for runtime configuration in manifests. it should have class path '.' to be available on class path in dev environment for plugins which depends on it.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-04-27 17:35:35 UTC (rev 30881)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-04-27 17:51:19 UTC (rev 30882)
@@ -23,3 +23,4 @@
org.eclipse.ui,
org.eclipse.jdt.ui;bundle-version="[3.5.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: .
14 years, 11 months
JBoss Tools SVN: r30881 - branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-27 13:35:35 -0400 (Wed, 27 Apr 2011)
New Revision: 30881
Modified:
branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
Log:
JBIDE-8275
https://issues.jboss.org/browse/JBIDE-8275
Modified: branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
===================================================================
--- branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-04-27 17:26:08 UTC (rev 30880)
+++ branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-04-27 17:35:35 UTC (rev 30881)
@@ -44,6 +44,7 @@
import org.eclipse.jdt.core.search.SearchPattern;
import org.eclipse.jdt.core.search.SearchRequestor;
import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
+import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IWorkbenchPage;
@@ -176,6 +177,14 @@
result = temporaryFile.getAbsolutePath();
}
}
+ } else if (fragmentRoot instanceof JavaElement) {
+ IResource resource = ((JavaElement)fragmentRoot).resource();
+ if(resource instanceof IContainer && resource.exists()) {
+ IFile f = ((IContainer)resource).getFile(new Path(classPathResource));
+ if(f != null && f.exists()) {
+ result = f.getLocation().toFile().getAbsolutePath();
+ }
+ }
}
}
} catch (JavaModelException e) {
14 years, 11 months
JBoss Tools SVN: r30880 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-27 13:26:08 -0400 (Wed, 27 Apr 2011)
New Revision: 30880
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
Log:
JBIDE-8275
https://issues.jboss.org/browse/JBIDE-8275
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-04-27 16:59:06 UTC (rev 30879)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-04-27 17:26:08 UTC (rev 30880)
@@ -44,6 +44,7 @@
import org.eclipse.jdt.core.search.SearchPattern;
import org.eclipse.jdt.core.search.SearchRequestor;
import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
+import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IWorkbenchPage;
@@ -176,6 +177,14 @@
result = temporaryFile.getAbsolutePath();
}
}
+ } else if (fragmentRoot instanceof JavaElement) {
+ IResource resource = ((JavaElement)fragmentRoot).resource();
+ if(resource instanceof IContainer && resource.exists()) {
+ IFile f = ((IContainer)resource).getFile(new Path(classPathResource));
+ if(f != null && f.exists()) {
+ result = f.getLocation().toFile().getAbsolutePath();
+ }
+ }
}
}
} catch (JavaModelException e) {
14 years, 11 months