JBoss Tools SVN: r24547 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-08-30 09:48:15 -0400 (Mon, 30 Aug 2010)
New Revision: 24547
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorWithStereotypeThatIsBinding.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/StereotypeAndBinding.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6935
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorWithStereotypeThatIsBinding.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorWithStereotypeThatIsBinding.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorWithStereotypeThatIsBinding.java 2010-08-30 13:48:15 UTC (rev 24547)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@StereotypeAndBinding
+public class InterceptorWithStereotypeThatIsBinding {
+
+ @AroundInvoke
+ public Object intercept(InvocationContext ctx) throws Exception {
+ return ctx.proceed();
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/InterceptorWithStereotypeThatIsBinding.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/StereotypeAndBinding.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/StereotypeAndBinding.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/StereotypeAndBinding.java 2010-08-30 13:48:15 UTC (rev 24547)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.interceptors;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Stereotype;
+import javax.interceptor.InterceptorBinding;
+
+@Stereotype
+@InterceptorBinding
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+public @interface StereotypeAndBinding {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/interceptors/StereotypeAndBinding.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/InterceptorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2010-08-30 13:47:14 UTC (rev 24546)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2010-08-30 13:48:15 UTC (rev 24547)
@@ -13,6 +13,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.JavaModelException;
@@ -20,6 +21,7 @@
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
+import org.jboss.tools.cdi.core.IStereotype;
/**
* @author Alexey Kazakov
@@ -80,7 +82,24 @@
assertEquals("Wrong number of interceptor binding declarations", 2, ds.size());
assertContainsBindingDeclarationWithValue(ds, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.BindingC", "c1");
}
-
+
+ public void testStereotypeCanBeInterceptorBinding() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/StereotypeAndBinding.java");
+ IStereotype s = cdiProject.getStereotype("org.jboss.jsr299.tck.tests.jbt.validation.interceptors.StereotypeAndBinding");
+ assertNotNull(s);
+ IInterceptorBinding b = cdiProject.getInterceptorBinding("org.jboss.jsr299.tck.tests.jbt.validation.interceptors.StereotypeAndBinding");
+ assertNotNull(b);
+
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.jbt.validation.interceptors.InterceptorWithStereotypeThatIsBinding");
+ assertEquals("Wrong number of the beans", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertTrue("The bean should be an interceptor", bean instanceof IClassBean);
+ IClassBean interceptor = (IClassBean)bean;
+ assertFalse("The interceptor should inherites interceptor bindings", interceptor.getInterceptorBindings().isEmpty());
+
+ }
+
+
void assertContainsBindings(Set<IInterceptorBinding> bs, String... classNames) {
Set<String> bsn = new HashSet<String>();
for (IInterceptorBinding b: bs) {
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r24546 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-08-30 09:47:14 -0400 (Mon, 30 Aug 2010)
New Revision: 24546
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
Log:
https://jira.jboss.org/browse/JBIDE-6935
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-08-30 13:40:45 UTC (rev 24545)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-08-30 13:47:14 UTC (rev 24546)
@@ -170,7 +170,7 @@
Set<IQualifier> qs = new HashSet<IQualifier>();
for(IAnnotationDeclaration a: definition.getAnnotations()) {
int k = getCDIProject().getNature().getDefinitions().getAnnotationKind(a.getType());
- if((k & AnnotationDefinition.QUALIFIER) > 0) {
+ if(k > 0 && (k & AnnotationDefinition.QUALIFIER) > 0) {
IQualifierDeclaration q = (IQualifierDeclaration)a;
result.add(q);
if(q.getQualifier() != null) qs.add(q.getQualifier());
@@ -250,7 +250,7 @@
Set<IScopeDeclaration> result = new HashSet<IScopeDeclaration>();
for (IAnnotationDeclaration d: ds) {
int k = n.getDefinitions().getAnnotationKind(d.getType());
- if((k & AnnotationDefinition.SCOPE) > 0) {
+ if(k > 0 && (k & AnnotationDefinition.SCOPE) > 0) {
result.add((IScopeDeclaration)d);
}
}
@@ -344,5 +344,5 @@
}
return result;
}
-
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-08-30 13:40:45 UTC (rev 24545)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-08-30 13:47:14 UTC (rev 24546)
@@ -683,7 +683,7 @@
}
int k = n.getDefinitions().getAnnotationKind(annotationType);
- return (k & AnnotationDefinition.QUALIFIER) > 0;
+ return k > 0 && (k & AnnotationDefinition.QUALIFIER) > 0;
}
public boolean isScope(IType annotationType) {
@@ -695,7 +695,7 @@
}
int k = n.getDefinitions().getAnnotationKind(annotationType);
- return (k & AnnotationDefinition.SCOPE) > 0;
+ return k > 0 && (k & AnnotationDefinition.SCOPE) > 0;
}
public boolean isStereotype(IType annotationType) {
@@ -707,7 +707,7 @@
}
int k = n.getDefinitions().getAnnotationKind(annotationType);
- return (k & AnnotationDefinition.STEREOTYPE) > 0;
+ return k > 0 && (k & AnnotationDefinition.STEREOTYPE) > 0;
}
public Set<IBean> resolve(Set<IBean> beans) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-08-30 13:40:45 UTC (rev 24545)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-08-30 13:47:14 UTC (rev 24546)
@@ -70,19 +70,19 @@
a.setDeclaration(ts[i], contextType);
AnnotationDeclaration b = null;
int kind = context.getAnnotationKind(a.getType());
- if((kind & AnnotationDefinition.STEREOTYPE) > 0) {
+ if(kind > 0 && (kind & AnnotationDefinition.STEREOTYPE) > 0) {
b = new StereotypeDeclaration(a);
annotations.add(b);
}
- if((kind & AnnotationDefinition.INTERCEPTOR_BINDING) > 0) {
+ if(kind > 0 && (kind & AnnotationDefinition.INTERCEPTOR_BINDING) > 0) {
b = new InterceptorBindingDeclaration(a);
annotations.add(b);
}
- if((kind & AnnotationDefinition.QUALIFIER) > 0) {
+ if(kind > 0 && (kind & AnnotationDefinition.QUALIFIER) > 0) {
b = new QualifierDeclaration(a);
annotations.add(b);
}
- if((kind & AnnotationDefinition.SCOPE) > 0) {
+ if(kind > 0 && (kind & AnnotationDefinition.SCOPE) > 0) {
b = new ScopeDeclaration(a);
annotations.add(b);
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r24545 - in trunk/jst/plugins: org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-08-30 09:40:45 -0400 (Mon, 30 Aug 2010)
New Revision: 24545
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLWizard.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java
Log:
https://jira.jboss.org/browse/JBIDE-6920
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2010-08-30 12:33:27 UTC (rev 24544)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/CreateJSPFileSupport.java 2010-08-30 13:40:45 UTC (rev 24545)
@@ -33,6 +33,10 @@
protected Map<String,File> templates = new TreeMap<String,File>();
TaglibSet taglibs;
+ public TaglibSet getTaglibs() {
+ return taglibs;
+ }
+
public void reset() {
taglibs = null;
selectedTaglibs.clear();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLWizard.java 2010-08-30 12:33:27 UTC (rev 24544)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLWizard.java 2010-08-30 13:40:45 UTC (rev 24545)
@@ -72,6 +72,7 @@
addPage(this.fNewFileTemplatesPage);
this.newXHTMLWizardSelectTagLibrariesPage = getURISelectionPage();
+ if(jspFileSupport.getTaglibs()!=null&&jspFileSupport.getTaglibs().getDescriptions().length>0)
addPage(this.newXHTMLWizardSelectTagLibrariesPage);
}
@Override
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r24544 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-08-30 08:33:27 -0400 (Mon, 30 Aug 2010)
New Revision: 24544
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java
Log:
https://jira.jboss.org/browse/JBIDE-6935
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-08-30 08:11:13 UTC (rev 24543)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-08-30 12:33:27 UTC (rev 24544)
@@ -170,7 +170,7 @@
Set<IQualifier> qs = new HashSet<IQualifier>();
for(IAnnotationDeclaration a: definition.getAnnotations()) {
int k = getCDIProject().getNature().getDefinitions().getAnnotationKind(a.getType());
- if(k == AnnotationDefinition.QUALIFIER) {
+ if((k & AnnotationDefinition.QUALIFIER) > 0) {
IQualifierDeclaration q = (IQualifierDeclaration)a;
result.add(q);
if(q.getQualifier() != null) qs.add(q.getQualifier());
@@ -250,7 +250,7 @@
Set<IScopeDeclaration> result = new HashSet<IScopeDeclaration>();
for (IAnnotationDeclaration d: ds) {
int k = n.getDefinitions().getAnnotationKind(d.getType());
- if(k == AnnotationDefinition.SCOPE) {
+ if((k & AnnotationDefinition.SCOPE) > 0) {
result.add((IScopeDeclaration)d);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-08-30 08:11:13 UTC (rev 24543)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-08-30 12:33:27 UTC (rev 24544)
@@ -585,7 +585,7 @@
Set<IType> result = new HashSet<IType>();
List<AnnotationDefinition> ds = n.getDefinitions().getAllAnnotations();
for (AnnotationDefinition d: ds) {
- if(d.getKind() == AnnotationDefinition.QUALIFIER) {
+ if((d.getKind() & AnnotationDefinition.QUALIFIER) > 0) {
result.add(d.getType());
}
}
@@ -683,7 +683,7 @@
}
int k = n.getDefinitions().getAnnotationKind(annotationType);
- return k == AnnotationDefinition.QUALIFIER;
+ return (k & AnnotationDefinition.QUALIFIER) > 0;
}
public boolean isScope(IType annotationType) {
@@ -695,7 +695,7 @@
}
int k = n.getDefinitions().getAnnotationKind(annotationType);
- return k == AnnotationDefinition.SCOPE;
+ return (k & AnnotationDefinition.SCOPE) > 0;
}
public boolean isStereotype(IType annotationType) {
@@ -707,7 +707,7 @@
}
int k = n.getDefinitions().getAnnotationKind(annotationType);
- return k == AnnotationDefinition.STEREOTYPE;
+ return (k & AnnotationDefinition.STEREOTYPE) > 0;
}
public Set<IBean> resolve(Set<IBean> beans) {
@@ -961,28 +961,31 @@
scopesByPath.clear();
List<AnnotationDefinition> ds = n.getDefinitions().getAllAnnotations();
for (AnnotationDefinition d: ds) {
- if(d.getKind() == AnnotationDefinition.STEREOTYPE) {
+ if((d.getKind() & AnnotationDefinition.STEREOTYPE) > 0) {
StereotypeElement s = new StereotypeElement();
initAnnotationElement(s, d);
stereotypes.put(d.getQualifiedName(), s);
if(d.getResource() != null && d.getResource().getFullPath() != null) {
stereotypesByPath.put(d.getResource().getFullPath(), s);
}
- } else if(d.getKind() == AnnotationDefinition.INTERCEPTOR_BINDING) {
+ }
+ if((d.getKind() & AnnotationDefinition.INTERCEPTOR_BINDING) > 0) {
InterceptorBindingElement s = new InterceptorBindingElement();
initAnnotationElement(s, d);
interceptorBindings.put(d.getQualifiedName(), s);
if(d.getResource() != null && d.getResource().getFullPath() != null) {
interceptorBindingsByPath.put(d.getResource().getFullPath(), s);
}
- } else if(d.getKind() == AnnotationDefinition.QUALIFIER) {
+ }
+ if((d.getKind() & AnnotationDefinition.QUALIFIER) > 0) {
QualifierElement s = new QualifierElement();
initAnnotationElement(s, d);
qualifiers.put(d.getQualifiedName(), s);
if(d.getResource() != null && d.getResource().getFullPath() != null) {
qualifiersByPath.put(d.getResource().getFullPath(), s);
}
- } else if(d.getKind() == AnnotationDefinition.SCOPE) {
+ }
+ if((d.getKind() & AnnotationDefinition.SCOPE) > 0) {
ScopeElement s = new ScopeElement();
initAnnotationElement(s, d);
scopes.put(d.getQualifiedName(), s);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-08-30 08:11:13 UTC (rev 24543)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-08-30 12:33:27 UTC (rev 24544)
@@ -68,17 +68,30 @@
AnnotationDeclaration a = new AnnotationDeclaration();
a.setProject(context.getProject());
a.setDeclaration(ts[i], contextType);
+ AnnotationDeclaration b = null;
int kind = context.getAnnotationKind(a.getType());
- if(kind == AnnotationDefinition.STEREOTYPE) {
- a = new StereotypeDeclaration(a);
- } else if(kind == AnnotationDefinition.INTERCEPTOR_BINDING) {
- a = new InterceptorBindingDeclaration(a);
- } else if(kind == AnnotationDefinition.QUALIFIER) {
- a = new QualifierDeclaration(a);
- } else if(kind == AnnotationDefinition.SCOPE) {
- a = new ScopeDeclaration(a);
+ if((kind & AnnotationDefinition.STEREOTYPE) > 0) {
+ b = new StereotypeDeclaration(a);
+ annotations.add(b);
}
- annotations.add(a);
+ if((kind & AnnotationDefinition.INTERCEPTOR_BINDING) > 0) {
+ b = new InterceptorBindingDeclaration(a);
+ annotations.add(b);
+ }
+ if((kind & AnnotationDefinition.QUALIFIER) > 0) {
+ b = new QualifierDeclaration(a);
+ annotations.add(b);
+ }
+ if((kind & AnnotationDefinition.SCOPE) > 0) {
+ b = new ScopeDeclaration(a);
+ annotations.add(b);
+ }
+ if(b == null) {
+ annotations.add(a);
+ } else {
+ a = b;
+ }
+
if(a.getTypeName() != null) {
annotationsByType.put(a.getTypeName(), a);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java 2010-08-30 08:11:13 UTC (rev 24543)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java 2010-08-30 12:33:27 UTC (rev 24544)
@@ -31,10 +31,10 @@
public static final int NON_RELEVANT = 0;
public static final int BASIC = 1; //has Inherited, Target, Retention
public static final int CDI = 2; //has Model, Named, Typed, *Scoped, New
- public static final int QUALIFIER = 3; //has Qualifier
- public static final int STEREOTYPE = 4; //has Stereotype
- public static final int INTERCEPTOR_BINDING = 5; //has InterceptorBinding
- public static final int SCOPE = 6; //has Scope or NormalScope
+ public static final int QUALIFIER = 4; //has Qualifier
+ public static final int STEREOTYPE = 8; //has Stereotype
+ public static final int INTERCEPTOR_BINDING = 16; //has InterceptorBinding
+ public static final int SCOPE = 32; //has Scope or NormalScope
//TODO add other definition kinds of interest
protected int kind = NON_RELEVANT;
@@ -75,19 +75,25 @@
if(ds.containsKey(CDIConstants.SCOPE_ANNOTATION_TYPE_NAME)
|| ds.containsKey(CDIConstants.NORMAL_SCOPE_ANNOTATION_TYPE_NAME)) {
kind = SCOPE;
- } else if(ds.containsKey(CDIConstants.STEREOTYPE_ANNOTATION_TYPE_NAME)) {
- kind = STEREOTYPE;
- } else if(ds.containsKey(CDIConstants.QUALIFIER_ANNOTATION_TYPE_NAME)) {
- kind = QUALIFIER;
- } else if(ds.containsKey(CDIConstants.INTERCEPTOR_BINDING_ANNOTATION_TYPE_NAME)) {
- kind = INTERCEPTOR_BINDING;
- } else if(AnnotationHelper.BASIC_ANNOTATION_TYPES.contains(qualifiedName)) {
- kind = AnnotationDefinition.BASIC;
- } else if(AnnotationHelper.CDI_ANNOTATION_TYPES.contains(qualifiedName)) {
- kind = AnnotationDefinition.CDI;
}
+ if(ds.containsKey(CDIConstants.STEREOTYPE_ANNOTATION_TYPE_NAME)) {
+ kind |= STEREOTYPE;
+ }
+ if(ds.containsKey(CDIConstants.QUALIFIER_ANNOTATION_TYPE_NAME)) {
+ kind |= QUALIFIER;
+ }
+ if(ds.containsKey(CDIConstants.INTERCEPTOR_BINDING_ANNOTATION_TYPE_NAME)) {
+ kind |= INTERCEPTOR_BINDING;
+ }
+ if(kind == NON_RELEVANT) {
+ if(AnnotationHelper.BASIC_ANNOTATION_TYPES.contains(qualifiedName)) {
+ kind = AnnotationDefinition.BASIC;
+ } else if(AnnotationHelper.CDI_ANNOTATION_TYPES.contains(qualifiedName)) {
+ kind = AnnotationDefinition.CDI;
+ }
+ }
- if(kind == QUALIFIER || kind == INTERCEPTOR_BINDING) {
+ if((kind & QUALIFIER) > 0 || (kind & INTERCEPTOR_BINDING) > 0) {
initMemberDefinitions(contextType, context);
}
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r24543 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test: resources/editor and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-08-30 04:11:13 -0400 (Mon, 30 Aug 2010)
New Revision: 24543
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/test.properties
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java
Log:
Fixes for JBT 3.2.0.M2
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,34 +1,33 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<!--<h:inputText value="#{user.name}" required="true">
- <f:validateLength maximum="30" minimum="3"/>
- </h:inputText>-->
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<!--
+<h:inputText value="#{user.name}" required="true">
+ <f:validateLength maximum="30" minimum="3"/>
+ </h:inputText>
+ -->
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,36 +1,33 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<!--<h:commandButton action="hello" value="Say Hello!" />-->
+<!-- <h:commandButton action="hello" value="Say Hello!" /> -->
</FORM>
</DIV>
</TD>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,37 +1,34 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
@@ -39,4 +36,6 @@
</TABLE>
</DIV>
</DIV>
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.M2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201008232021N-H413-M2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 260px ! important; top: 119px ! important;" >
+</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,36 +1,33 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<!-- <h:commandButton action="hello" value="Say Hello!" />-->
+<!-- <h:commandButton action="hello" value="Say Hello!" /> -->
</FORM>
</DIV>
</TD>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,27 +1,26 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Hello!
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H3 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H3 style="-moz-user-modify: read-write;" title="h3" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.hello_message}" >
Hello
</SPAN>
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" >
,
+
</SPAN>
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:outputText value: #{user.name}" >
Any Name
</SPAN>
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" >
!
+
</SPAN>
</H3>
</DIV>
@@ -30,4 +29,6 @@
</TABLE>
</DIV>
</DIV>
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.M2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201008232021N-H413-M2/ve/dragIcon.gif" style="display: none ! important; position: absolute; cursor: move;" >
+</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,37 +1,34 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="Any Name"/>
-
+<INPUT value="Any Name" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
@@ -39,4 +36,6 @@
</TABLE>
</DIV>
</DIV>
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.M2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201008232021N-H413-M2/ve/dragIcon.gif" style="display: none ! important; position: absolute; cursor: move;" >
+</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,27 +1,27 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Hello!
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H3 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H3 style="-moz-user-modify: read-write;" title="h3" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.hello_message}" >
Hello
</SPAN>
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" >
,
+
</SPAN>
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:outputText value: #{user.name}" >
#{user.name}
</SPAN>
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" >
+
!
+
</SPAN>
</H3>
</DIV>
@@ -30,4 +30,6 @@
</TABLE>
</DIV>
</DIV>
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.M2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201008232021N-H413-M2/ve/dragIcon.gif" style="display: none ! important; position: absolute; cursor: move;" >
+</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,37 +1,34 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+ <SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
@@ -39,4 +36,6 @@
</TABLE>
</DIV>
</DIV>
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.M2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201008232021N-H413-M2/ve/dragIcon.gif" style="display: none ! important; position: absolute; cursor: move;" >
+</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,37 +1,34 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;" >
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,41 +1,39 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<DIV CLASS="__any__tag__caption" STYLE="-moz-user-modify: read-only;">
-tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
+<DIV class="__any__tag__caption" style="-moz-user-modify: read-only;" title="tagunknown" >
+tagunknown
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+</BR>
</DIV>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
@@ -43,4 +41,6 @@
</TABLE>
</DIV>
</DIV>
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.M2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201008232021N-H413-M2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
+</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,37 +1,34 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,41 +1,39 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;">
-tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
+<DIV class="__any__tag__caption" style="border: 1px solid green; -moz-user-modify: read-only;" title="tagunknown" >
+tagunknown
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+</BR>
</DIV>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,74 +1,80 @@
-<BODY ID="__content__area__">
-<SPAN>
-<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;">
+<BODY id="__content__area__" >
+<SPAN >
+<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" >
jsp:directive.taglib
-</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
</SPAN>
-<SPAN>
-<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;">
+<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+</BR>
+</SPAN>
+<SPAN >
+<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" >
jsp:directive.taglib
-</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
</SPAN>
-<SPAN>
-<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;">
+<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+</BR>
+</SPAN>
+<SPAN >
+<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" title="f:loadBundle var: Message basename: demo.Messages" >
f:loadBundle
-</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
</SPAN>
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<SPAN>
-<H1 STYLE="-moz-user-modify: read-write;">
+<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+</BR>
+</SPAN>
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
+<SPAN >
+<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" title="title" >
+title
+</SPAN>
+<SPAN class="vpe-text" >
Input User Name Page
-</H1>
-<SPAN CLASS="vpe-text">
-Input User Name Page
</SPAN>
</SPAN>
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<SPAN>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<SPAN >
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
-</UL><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
+</UL>
+<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+</BR>
</SPAN>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<SPAN>
-<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;">
+<SPAN >
+<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" title="f:validateLength maximum: 30 minimum: 3" >
f:validateLength
-</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
</SPAN>
+<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+</BR>
</SPAN>
-<SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
</SPAN>
+<SPAN >
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
+<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+</BR>
+</SPAN>
</FORM>
</DIV>
</TD>
@@ -76,4 +82,6 @@
</TABLE>
</DIV>
</DIV>
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.M2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201008232021N-H413-M2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 7px ! important; top: -14px ! important;" >
+</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,37 +1,34 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
#{Message.header}
</SPAN>
</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
#{Message.prompt_message}
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2010-08-30 08:11:13 UTC (rev 24543)
@@ -1,4 +1,4 @@
JSFProjectName=JBIDETestProject
FaceletsProjectName=FaceletsTestProject
Apachev6.0=D\:/Java/apache-tomcat-6.0.18
-JBossEap4.3=${jbosstools.test.jboss.home}
\ No newline at end of file
+JBossEap5.0=/opt/jbdevstudio4.0.0.M2/jboss-eap/jboss-as
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/test.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/test.properties (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/test.properties 2010-08-30 08:11:13 UTC (rev 24543)
@@ -0,0 +1,2 @@
+
+Input=Input
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/test.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java 2010-08-30 08:11:13 UTC (rev 24543)
@@ -138,18 +138,23 @@
}
if ("#comment".equals(vpeNode.getNodeName())){ //$NON-NLS-1$
- String vpeNodeValue = vpeNode.getNodeValue();
+ String vpeNodeValue = vpeNode.getNodeValue().trim();
try {
- vpeNodeValue = clearStringFromRSymbols(vpeNodeValue);
+ vpeNodeValue = clearStringFromSpecSymbol("\t",clearStringFromSpecSymbol("\r",vpeNodeValue));
} catch (Exception e) {
}
- if ((modelNode.getNodeValue() != null)
- && (!modelNode.getNodeValue().trim().equalsIgnoreCase(
- vpeNodeValue.trim()))) {
- throw new ComparisonException("value of " + vpeNode.getNodeName() //$NON-NLS-1$
- + " is \"" + vpeNodeValue.trim() //$NON-NLS-1$
- + "\" but must be \"" + modelNode.getNodeValue().trim() //$NON-NLS-1$
- + "\""); //$NON-NLS-1$
+ if (modelNode.getNodeValue() != null){
+ String modelNodeValue = modelNode.getNodeValue().trim();
+ try {
+ modelNodeValue = clearStringFromSpecSymbol("\t",clearStringFromSpecSymbol("\r" , modelNodeValue));
+ } catch (Exception e) {
+ }
+ if (!modelNodeValue.equalsIgnoreCase(vpeNodeValue)) {
+ throw new ComparisonException("value of " + vpeNode.getNodeName() //$NON-NLS-1$
+ + " is\n\"" + vpeNodeValue //$NON-NLS-1$
+ + "\" but must be\n\"" + modelNodeValue //$NON-NLS-1$
+ + "\""); //$NON-NLS-1$
+ }
}
} else {
if ((modelNode.getNodeValue() != null)
@@ -163,9 +168,18 @@
}
// compare node's attributes
if (modelNode.getNodeType() == Node.ELEMENT_NODE) {
-
- compareAttributes(modelNode.getAttributes(), vpeNode
- .getAttributes());
+ boolean attrVpetemporarydndelementFound = false;
+ if (modelNode.getNodeName().equalsIgnoreCase("IMG")){
+ NamedNodeMap attrMap = modelNode.getAttributes();
+ for (int index = 0 ; (!attrVpetemporarydndelementFound) && (index < attrMap.getLength()) ; index++){
+ if (((Attr)attrMap.item(index)).getName().equalsIgnoreCase("vpetemporarydndelement")){
+ attrVpetemporarydndelementFound = true;
+ }
+ }
+ }
+ if (!attrVpetemporarydndelementFound){
+ compareAttributes(modelNode.getAttributes(), vpeNode.getAttributes());
+ }
}
// compare children
@@ -301,14 +315,19 @@
}
}
-
- private static String clearStringFromRSymbols(String string){
- int index = string.indexOf("\r"); //$NON-NLS-1$
+ /**
+ * Clear string from special symbol
+ * @param symbol
+ * @param string
+ * @return
+ */
+ private static String clearStringFromSpecSymbol(String symbol,String string){
+ int index = string.indexOf(symbol); //$NON-NLS-1$
while (index!=-1) {
String stringAfterSymbol = string.substring(index+1);
String stringBeforeSymbol = string.substring(0,index);
string = stringBeforeSymbol.concat(stringAfterSymbol);
- index = string.indexOf("\r"); //$NON-NLS-1$
+ index = string.indexOf(symbol); //$NON-NLS-1$
}
return string;
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java 2010-08-30 08:11:13 UTC (rev 24543)
@@ -101,7 +101,7 @@
+ "' but it doesn't", editorText.contains(testText));
// Insert text via Visual Editor to inserted h:outputText tag
node = swtBotWebBrowser.getDomNodeByTagName(
- swtBotWebBrowser.getNsIDOMDocument(), "#text", 6);
+ swtBotWebBrowser.getNsIDOMDocument(), "#text", 5);
botExt.sleep(Timing.time2S());
swtBotWebBrowser.selectDomNode(node, 5);
String insertString = "ab9876CD";
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java 2010-08-30 08:11:13 UTC (rev 24543)
@@ -68,7 +68,7 @@
} catch (InterruptedException e) {
// Ignore
}
-
+ multiPageEditor.selectPage(IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
assertTrue("Web Browser has to contain text " + insertText + " but it doesn't.",swtBotWebBrowserExt.containsNodeWithValue(swtBotWebBrowserExt.getNsIDOMDocument(), insertText));
xhtmlTextEditor.close();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-08-30 08:11:13 UTC (rev 24543)
@@ -41,11 +41,12 @@
closePage();
openPage();
- checkIsShow();
+ checkIsHide();
//Test Hide Selection Bar button with confirm
selectPrompt();
+ selectSelection();
bot.toolbarButtonWithTooltip(HID_SEL_BAR).click();
bot.shell("Confirm hide selection bar").activate();
bot.button(IDELabel.Button.OK).click();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2010-08-30 08:11:13 UTC (rev 24543)
@@ -41,7 +41,7 @@
closePage();
openPage();
- checkIsShow();
+ checkIsHide();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java 2010-08-30 08:11:13 UTC (rev 24543)
@@ -13,6 +13,7 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.test.WidgetVariables;
@@ -64,7 +65,8 @@
bot.checkBox(IDELabel.NewXHTMLFileDialog.USE_XHTML_TEMPLATE_CHECK_BOX).select();
bot.table().select(IDELabel.NewXHTMLFileDialog.TEMPLATE_FACELET_FORM_XHTML_NAME);
bot.button(IDELabel.Button.FINISH).click();
-
+ webContentTreeItem.expand();
+ bot.sleep(Timing.time1S());
SWTBotTreeItem xhtmlTestPageTreeItem = webContentTreeItem.getNode(TEST_NEW_XHTML_FILE_NAME);
String checkResult = CheckFileChangesSaving.checkIt(bot,bot.editorByTitle(TEST_NEW_XHTML_FILE_NAME).toTextEditor(), tree, xhtmlTestPageTreeItem,
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2010-08-30 08:11:13 UTC (rev 24543)
@@ -114,7 +114,7 @@
* @param node
* @param depth
*/
- private static void displayNsIDOMNode(nsIDOMNode node , int depth) {
+ public static void displayNsIDOMNode(nsIDOMNode node , int depth) {
System.out.println("");
System.out.print(fillString(' ', depth) + "<" + node.getNodeName() + " ");
@@ -123,7 +123,7 @@
nsIDOMNamedNodeMap modelAttributes = node.getAttributes();
for (int i = 0; i < modelAttributes.getLength(); i++) {
nsIDOMNode modelAttr = modelAttributes.item(i);
- System.out.print(modelAttr.getNodeName() + "=" + modelAttr.getNodeValue().replaceAll("\n", "") + " ");
+ System.out.print(modelAttr.getNodeName() + "=\"" + modelAttr.getNodeValue().replaceAll("\n", " ") + "\" ");
}
}
System.out.println(">");
@@ -145,7 +145,7 @@
displayNsIDOMNode(child, depth + 2);
}
- System.out.println(fillString(' ', depth) + "<" + node.getNodeName() + "/>");
+ System.out.println(fillString(' ', depth) + "</" + node.getNodeName() + ">");
}
/**
* Displays complete browser DOM
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java 2010-08-30 08:11:13 UTC (rev 24543)
@@ -79,8 +79,8 @@
String taglib00 = bot.table().cell(0, 0);
String taglib10 = bot.table().cell(1, 0);
bot.button(WidgetVariables.OK_BUTTON).click();
+ assertEquals("Wrong table value.", "taglibName:tagName", taglib10); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("Wrong table value.", "lib:tag", taglib00); //$NON-NLS-1$ //$NON-NLS-2$
- assertEquals("Wrong table value.", "taglibName:tagName", taglib10); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-08-29 12:49:11 UTC (rev 24542)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-08-30 08:11:13 UTC (rev 24543)
@@ -36,7 +36,7 @@
.expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB_EDITORS_VPE).select(); //$NON-NLS-1$
bot.tabItem(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB_EDITORS_VPE_VISUAL_TEMPLATES).activate(); //$NON-NLS-1$
try{
- this.bot.button(IDELabel.Button.ADD_WITHOUT_DOTS).click(); //$NON-NLS-1$
+ this.bot.button(IDELabel.Button.ADD).click(); //$NON-NLS-1$
this.bot.button(IDELabel.Button.CANCEL).click(); //$NON-NLS-1$
} catch(WidgetNotFoundException ex){
fail("Preference Page has not been created"+ex);//$NON-NLS-1$
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r24542 - in trunk: cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-08-29 08:49:11 -0400 (Sun, 29 Aug 2010)
New Revision: 24542
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidationDelegate.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6523 beans.xml validation
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-08-28 19:28:10 UTC (rev 24541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-08-29 12:49:11 UTC (rev 24542)
@@ -192,6 +192,14 @@
IStereotype getStereotype(IPath path);
/**
+ * Returns the stereotype which is declared in the given IType.
+ *
+ * @param type
+ * @return the stereotype which is declared in the given IType
+ */
+ IStereotype getStereotype(IType type);
+
+ /**
* Returns all the available intercepter binding types.
*
* @return all the available intercepter binding types
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-08-28 19:28:10 UTC (rev 24541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-08-29 12:49:11 UTC (rev 24542)
@@ -28,7 +28,6 @@
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
@@ -866,14 +865,35 @@
return n.getProject().getFullPath();
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IBeanManager#getStereotype(java.lang.String)
+ */
public StereotypeElement getStereotype(String qualifiedName) {
return stereotypes.get(qualifiedName);
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IBeanManager#getStereotype(org.eclipse.core.runtime.IPath)
+ */
public StereotypeElement getStereotype(IPath path) {
return stereotypesByPath.get(path);
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IBeanManager#getStereotype(org.eclipse.jdt.core.IType)
+ */
+ public StereotypeElement getStereotype(IType type) {
+ IPath path = type.getPath();
+ return stereotypesByPath.get(path);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IBeanManager#getInterceptorBindings()
+ */
public IInterceptorBinding[] getInterceptorBindings() {
IInterceptorBinding[] result = new IInterceptorBinding[interceptorBindings.size()];
synchronized (interceptorBindings) {
@@ -886,6 +906,10 @@
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IBeanManager#getInterceptorBinding(java.lang.String)
+ */
public InterceptorBindingElement getInterceptorBinding(String qualifiedName) {
return interceptorBindings.get(qualifiedName);
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java 2010-08-29 12:49:11 UTC (rev 24542)
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.internal.core.validation;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IMemberValuePair;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.CDIUtil;
+import org.jboss.tools.cdi.core.IAnnotationDeclaration;
+import org.jboss.tools.cdi.core.ICDIAnnotation;
+import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IScope;
+import org.jboss.tools.cdi.core.IStereotype;
+import org.jboss.tools.cdi.core.preferences.CDIPreferences;
+
+/**
+ * CDI annotation validator.
+ *
+ * @author Alexey Kazakov
+ */
+public class AnnotationValidationDelegate extends CDICoreValidationDelegate {
+
+ public AnnotationValidationDelegate(CDICoreValidator validator) {
+ super(validator);
+ }
+
+ public void validateStereotypeAnnotationTypeAnnotations(IStereotype stereotype, IResource resource) throws JavaModelException {
+ /*
+ * Stereotype annotation type should be annotated with @Target with correct targets [JSR-299 §2.7.1]
+ * Stereotype annotation type should be annotated with @Retention(RUNTIME)
+ */
+ String[][] variants = {{TARGET_METHOD, TARGET_FIELD, TARGET_TYPE},
+ {TARGET_METHOD, TARGET_FIELD},
+ {TARGET_TYPE}, {TARGET_METHOD}, {TARGET_FIELD}};
+ validateTargetAnnotation(stereotype, variants, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE, resource);
+
+ /*
+ * Stereotype annotation type should be annotated with @Retention(RUNTIME)
+ */
+ validateRetentionAnnotation(stereotype, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE, resource);
+ }
+
+ /**
+ * Validates a scope type.
+ *
+ * @param qualifier
+ */
+ public void validateScopeType(IScope scope) {
+ if(scope == null) {
+ return;
+ }
+ IResource resource = scope.getResource();
+ if (resource == null || !resource.getName().toLowerCase().endsWith(".java")) {
+ // validate sources only
+ return;
+ }
+
+ try {
+ validateScopeAnnotationTypeAnnotations(scope, resource);
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ }
+
+ private void validateScopeAnnotationTypeAnnotations(IScope scope, IResource resource) throws JavaModelException {
+ /*
+ * Scope annotation type should be annotated with @Target({TYPE, METHOD, FIELD})
+ */
+ String[][] variants = {{TARGET_TYPE, TARGET_METHOD, TARGET_FIELD}};
+ validateTargetAnnotation(scope, variants, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE, resource);
+
+ /*
+ * Scope annotation type should be annotated with @Retention(RUNTIME)
+ */
+ validateRetentionAnnotation(scope, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE, resource);
+ }
+
+ void validateRetentionAnnotation(ICDIAnnotation type, String message, IResource resource) throws JavaModelException {
+ IAnnotationDeclaration retention = type.getAnnotationDeclaration(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME);
+ if(retention == null) {
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(type.getSourceType().getNameRange()), resource);
+ } else {
+ IMemberValuePair[] ps = retention.getDeclaration().getMemberValuePairs();
+ boolean ok = false;
+ for (IMemberValuePair p: ps) {
+ if(!"value".equals(p.getMemberName())) continue;
+ Object o = p.getValue();
+ if(o != null) {
+ ok = true;
+ String s = o.toString();
+ int i = s.lastIndexOf('.');
+ if(i >= 0) s = s.substring(i + 1);
+ if(!"RUNTIME".equals(s)) ok = false;
+ }
+ }
+ if(!ok) {
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, retention, resource);
+ }
+ }
+ }
+
+ Set<String> getTargetAnnotationValues(IAnnotationDeclaration target) throws JavaModelException {
+ Set<String> result = new HashSet<String>();
+ IMemberValuePair[] ps = target.getDeclaration().getMemberValuePairs();
+ for (IMemberValuePair p: ps) {
+ if(!"value".equals(p.getMemberName())) continue;
+ Object o = p.getValue();
+ if(o instanceof Object[]) {
+ Object[] os = (Object[])o;
+ for (Object q: os) {
+ String s = q.toString();
+ int i = s.lastIndexOf('.');
+ if(i >= 0) s = s.substring(i + 1);
+ result.add(s);
+ }
+ } else if(o != null) {
+ String s = o.toString();
+ int i = s.lastIndexOf('.');
+ if(i >= 0) s = s.substring(i + 1);
+ result.add(s);
+ }
+ }
+ return result;
+ }
+
+ static String TARGET_METHOD = "METHOD";
+ static String TARGET_FIELD = "FIELD";
+ static String TARGET_PARAMETER = "PARAMETER";
+ static String TARGET_TYPE = "TYPE";
+
+ public void validateQualifierAnnotationTypeAnnotations(IQualifier qualifier, IResource resource) throws JavaModelException {
+ /*
+ * Qualifier annotation type should be annotated with @Target({METHOD, FIELD, PARAMETER, TYPE}) or @Target({"FIELD", "PARAMETER"})
+ * Qualifier annotation type should be annotated with @Retention(RUNTIME)
+ */
+ String[][] variants = {{TARGET_METHOD, TARGET_FIELD, TARGET_PARAMETER, TARGET_TYPE},
+ {TARGET_FIELD, TARGET_PARAMETER}};
+ validateTargetAnnotation(qualifier, variants, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE, resource);
+
+ /*
+ * Qualifier annotation type should be annotated with @Retention(RUNTIME)
+ */
+ validateRetentionAnnotation(qualifier, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE, resource);
+ }
+
+ private void validateTargetAnnotation(ICDIAnnotation annotationType, String[][] variants, String message, IResource resource) throws JavaModelException {
+ IAnnotationDeclaration target = annotationType.getAnnotationDeclaration(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
+ if(target == null) {
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(annotationType.getSourceType().getNameRange()), resource);
+ } else {
+ Set<String> vs = getTargetAnnotationValues(target);
+ boolean ok = false;
+ for (int i = 0; i < variants.length; i++) {
+ if(vs.size() == variants[i].length) {
+ boolean ok2 = true;
+ String[] values = variants[i];
+ for (String s: values) {
+ if(!vs.contains(s)) {
+ ok2 = false;
+ break;
+ }
+ }
+ if(ok2) {
+ ok = true;
+ break;
+ }
+ }
+ }
+ if(!ok) {
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, target, resource);
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2010-08-29 12:49:11 UTC (rev 24542)
@@ -0,0 +1,531 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.internal.core.validation;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaConventions;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+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.IClassBean;
+import org.jboss.tools.cdi.core.IDecorator;
+import org.jboss.tools.cdi.core.IInterceptor;
+import org.jboss.tools.cdi.core.IStereotype;
+import org.jboss.tools.cdi.core.preferences.CDIPreferences;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * beans.xml validator
+ *
+ * @author Alexey Kazakov
+ */
+public class BeansXmlValidationDelegate extends CDICoreValidationDelegate {
+
+ private AlternativeClassValidator alternativeClassValidator;
+ private AlternativeStereotypeValidator alternativeStereotypeValidator;
+ private DecoratorTypeValidator decoratorTypeValidator;
+ private InterceptorTypeValidator interceptorTypeValidator;
+
+ public BeansXmlValidationDelegate(CDICoreValidator validator) {
+ super(validator);
+ }
+
+ private AlternativeClassValidator getAlternativeClassValidator() {
+ if(alternativeClassValidator==null) {
+ alternativeClassValidator = new AlternativeClassValidator(validator.cdiProject);
+ }
+ return alternativeClassValidator;
+ }
+
+ private AlternativeStereotypeValidator getAlternativeStereotypeValidator() {
+ if(alternativeStereotypeValidator==null) {
+ alternativeStereotypeValidator = new AlternativeStereotypeValidator(validator.cdiProject);
+ }
+ return alternativeStereotypeValidator;
+ }
+
+ private DecoratorTypeValidator getDecoratorTypeValidator() {
+ if(decoratorTypeValidator==null) {
+ decoratorTypeValidator = new DecoratorTypeValidator(validator.cdiProject);
+ }
+ return decoratorTypeValidator;
+ }
+
+ private InterceptorTypeValidator getInterceptorTypeValidator() {
+ if(interceptorTypeValidator==null) {
+ interceptorTypeValidator = new InterceptorTypeValidator(validator.cdiProject);
+ }
+ return interceptorTypeValidator;
+ }
+
+ public void validateBeansXml(IFile beansXml) {
+ IModelManager manager = StructuredModelManager.getModelManager();
+ if(manager == null) {
+ // this may happen if plug-in org.eclipse.wst.sse.core
+ // is stopping or un-installed, that is Eclipse is shutting down.
+ // there is no need to report it, just stop validation.
+ return;
+ }
+
+ IStructuredModel model = null;
+ try {
+ model = manager.getModelForRead(beansXml);
+ if (model instanceof IDOMModel) {
+ IDOMModel domModel = (IDOMModel) model;
+ IDOMDocument document = domModel.getDocument();
+
+ /*
+ * 5.1.1. Declaring selected alternatives for a bean archive
+ * - Each child <class> element must specify the name of an alternative bean class. If there is no class with the specified
+ * name, or if the class with the specified name is not an alternative bean class, the container automatically detects the problem
+ * and treats it as a deployment problem.
+ * - If the same type is listed twice under the <alternatives> element, the container automatically detects the problem and
+ * treats it as a deployment problem.
+ */
+ validateTypeBeanForBeansXml(
+ getAlternativeClassValidator(),
+ document,
+ beansXml);
+
+ /*
+ * 5.1.1. Declaring selected alternatives for a bean archive
+ * - Each child <stereotype> element must specify the name of an @Alternative stereotype annotation. If there is no annotation
+ * with the specified name, or the annotation is not an @Alternative stereotype, the container automatically detects the
+ * problem and treats it as a deployment problem.
+ * - If the same type is listed twice under the <alternatives> element, the container automatically detects the problem and
+ * treats it as a deployment problem.
+ */
+ validateTypeBeanForBeansXml(
+ getAlternativeStereotypeValidator(),
+ document,
+ beansXml);
+
+ /*
+ * 8.2. Decorator enablement and ordering
+ * - Each child <class> element must specify the name of a decorator bean class. If there is no class with the specified name,
+ * or if the class with the specified name is not a decorator bean class, the container automatically detects the problem and
+ * treats it as a deployment problem.
+ * - If the same class is listed twice under the <decorators> element, the container automatically detects the problem and
+ * treats it as a deployment problem.
+ */
+ validateTypeBeanForBeansXml(
+ getDecoratorTypeValidator(),
+ document,
+ beansXml);
+
+ /*
+ * 9.4. Interceptor enablement and ordering
+ * - Each child <class> element must specify the name of an interceptor class. If there is no class with the specified name, or if
+ * the class with the specified name is not an interceptor class, the container automatically detects the problem and treats it as
+ * a deployment problem.
+ * - If the same class is listed twice under the <interceptors> element, the container automatically detects the problem and treats it as
+ * a deployment problem.
+ */
+ validateTypeBeanForBeansXml(
+ getInterceptorTypeValidator(),
+ document,
+ beansXml);
+ }
+ } catch (CoreException e) {
+ CDICorePlugin.getDefault().logError(e);
+ } catch (IOException e) {
+ CDICorePlugin.getDefault().logError(e);
+ } finally {
+ if (model != null) {
+ model.releaseFromRead();
+ }
+ }
+ }
+
+ private void validateTypeBeanForBeansXml(TypeValidator typeValidator, IDOMDocument document, IFile beansXml) {
+ try {
+ NodeList parentNodeList = document.getElementsByTagName(typeValidator.getParrentElementname());
+ for (int i = 0; i < parentNodeList.getLength(); i++) {
+ Node parentNode = parentNodeList.item(i);
+ if(parentNode instanceof Element) {
+ List<TypeNode> typeNodes = getTypeElements((Element)parentNode, typeValidator.getTypeElementName());
+ Map<String, TypeNode> uniqueTypes = new HashMap<String, TypeNode>();
+ for (TypeNode typeNode : typeNodes) {
+ IType type = getType(beansXml, typeNode, typeValidator.getUnknownTypeErrorMessage());
+ if(type!=null) {
+ if(!type.isBinary()) {
+ validator.getValidationContext().addLinkedCoreResource(beansXml.getFullPath().toOSString(), type.getPath(), false);
+ }
+ if(!typeValidator.validateKindOfType(type)) {
+ validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
+ new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml);
+ } else if(type.isBinary()) {
+ if(!typeValidator.validateBinaryType(type)) {
+ validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
+ new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml);
+ }
+ continue;
+ } else {
+ if(!typeValidator.validateSourceType(type)) {
+ validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
+ new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml);
+ }
+ }
+ TypeNode node = uniqueTypes.get(typeNode.getTypeName());
+ if(node!=null) {
+ if(!node.isMarkedAsDuplicated()) {
+ validator.addError(typeValidator.getDuplicateTypeErrorMessage(), CDIPreferences.DUPLICATE_TYPE_IN_BEANS_XML,
+ new String[]{}, node.getLength(), node.getStartOffset(), beansXml);
+ }
+ node.setMarkedAsDuplicated(true);
+ validator.addError(typeValidator.getDuplicateTypeErrorMessage(), CDIPreferences.DUPLICATE_TYPE_IN_BEANS_XML,
+ new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml);
+ }
+ uniqueTypes.put(typeNode.getTypeName(), typeNode);
+ }
+ }
+ }
+ }
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ }
+
+ private IType getType(IFile beansXml, TypeNode node, String errorMessage) {
+ IType type = null;
+ if(node.getTypeName()!=null) {
+ try {
+ type = EclipseJavaUtil.findType(validator.javaProject, node.getTypeName());
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ return null;
+ }
+ }
+ if(type==null) {
+ addLinkedResourcesForUnknownType(beansXml, node.getTypeName());
+ validator.addError(errorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
+ new String[]{}, node.getLength(), node.getStartOffset(), beansXml);
+ }
+ return type;
+ }
+
+ private void addLinkedResourcesForUnknownType(IFile beansXml, String typeName) {
+ if(typeName!=null && typeName.trim().length()>0) {
+ IStatus status = JavaConventions.validateJavaTypeName(typeName, CompilerOptions.VERSION_1_7, CompilerOptions.VERSION_1_7);
+ if(status.getSeverity()!=IStatus.ERROR) {
+ String packagePath = typeName.replace('.', '/');
+ Set<IFolder> sources = validator.getSourceFolders();
+ for (IFolder source : sources) {
+ IPath path = source.getFullPath().append(packagePath + ".java"); //$NON-NLS-1$
+ validator.getValidationContext().addLinkedCoreResource(beansXml.getFullPath().toOSString(), path, false);
+ }
+ }
+ }
+ }
+
+ private List<TypeNode> getTypeElements(Element parentElement, String typeElementName) {
+ List<TypeNode> result = new ArrayList<TypeNode>();
+ NodeList list = parentElement.getElementsByTagName(typeElementName);
+ for (int i = 0; i < list.getLength(); i++) {
+ Node classNode = list.item(i);
+ NodeList children = classNode.getChildNodes();
+
+ boolean empty = true;
+ for (int j = 0; j < children.getLength(); j++) {
+ Node node = children.item(j);
+ if(node.getNodeType() == Node.TEXT_NODE) {
+ String value = node.getNodeValue();
+ if(value!=null) {
+ String className = value.trim();
+ if(className.length()==0) {
+ continue;
+ }
+ empty = false;
+ if(node instanceof IndexedRegion) {
+ int start = ((IndexedRegion)node).getStartOffset() + value.indexOf(className);
+ int length = className.length();
+ result.add(new TypeNode(start, length, className));
+ break;
+ }
+ }
+ }
+ }
+
+ if(empty && classNode instanceof IndexedRegion) {
+ int start = ((IndexedRegion)classNode).getStartOffset();
+ int end = ((IndexedRegion)classNode).getEndOffset();
+ int length = end - start;
+ result.add(new TypeNode(start, length, null));
+ }
+ }
+ return result;
+ }
+
+ private static class TypeNode {
+ private int startOffset;
+ private int length;
+ private String typeName;
+ private boolean markedAsDuplicated;
+
+ public TypeNode(int startOffset, int length, String typeName) {
+ this.startOffset = startOffset;
+ this.length = length;
+ this.typeName = typeName;
+ }
+
+ public int getStartOffset() {
+ return startOffset;
+ }
+
+ public void setStartOffset(int startOffset) {
+ this.startOffset = startOffset;
+ }
+
+ public int getLength() {
+ return length;
+ }
+
+ public void setLength(int length) {
+ this.length = length;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public boolean isMarkedAsDuplicated() {
+ return markedAsDuplicated;
+ }
+
+ public void setMarkedAsDuplicated(boolean markedAsDuplicated) {
+ this.markedAsDuplicated = markedAsDuplicated;
+ }
+ }
+
+ private static interface TypeValidator {
+
+ boolean validateSourceType(IType type);
+
+ boolean validateBinaryType(IType type) throws JavaModelException;
+
+ /**
+ * Validates if the type represens class/annotation/...
+ * @param type
+ * @return
+ * @throws JavaModelException
+ */
+ boolean validateKindOfType(IType type) throws JavaModelException;
+
+ String getTypeElementName();
+
+ String getParrentElementname();
+
+ String getUnknownTypeErrorMessage();
+
+ String getIllegalTypeErrorMessage();
+
+ String getDuplicateTypeErrorMessage();
+ }
+
+ private static abstract class AbstractTypeValidator implements TypeValidator {
+ ICDIProject cdiProject;
+
+ public AbstractTypeValidator(ICDIProject cdiProject) {
+ this.cdiProject = cdiProject;
+ }
+
+ public String getTypeElementName() {
+ return "class"; //$NON-NLS-1$
+ }
+
+ public boolean validateKindOfType(IType type) throws JavaModelException {
+ return type.isClass();
+ }
+
+ public boolean validateBinaryType(IType type) throws JavaModelException {
+ IAnnotation[] annotations = type.getAnnotations();
+ for (IAnnotation annotation : annotations) {
+ if(annotation.getElementName().equals(getAnnotationName())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected abstract String getAnnotationName();
+ }
+
+ private static class AlternativeClassValidator extends AbstractTypeValidator {
+
+ public AlternativeClassValidator(ICDIProject cdiProject) {
+ super(cdiProject);
+ }
+
+ public boolean validateSourceType(IType type) {
+ IClassBean classBean = cdiProject.getBeanClass(type);
+ return classBean!=null && classBean.isAlternative();
+ }
+
+ public String getParrentElementname() {
+ return "alternatives"; //$NON-NLS-1$
+ }
+
+ public String getUnknownTypeErrorMessage() {
+ return CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME;
+ }
+
+ public String getIllegalTypeErrorMessage() {
+ return CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS;
+ }
+
+ public String getDuplicateTypeErrorMessage() {
+ return CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE;
+ }
+
+ @Override
+ protected String getAnnotationName() {
+ return CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME;
+ }
+ }
+
+ private static class AlternativeStereotypeValidator extends AbstractTypeValidator {
+
+ public AlternativeStereotypeValidator(ICDIProject cdiProject) {
+ super(cdiProject);
+ }
+
+ public boolean validateSourceType(IType type) {
+ IStereotype stereotype = cdiProject.getStereotype(type);
+ return stereotype!=null && stereotype.isAlternative();
+ }
+
+ @Override
+ public boolean validateKindOfType(IType type) throws JavaModelException {
+ return type.isAnnotation();
+ }
+
+ @Override
+ public String getTypeElementName() {
+ return "stereotype"; //$NON-NLS-1$
+ }
+
+ public String getParrentElementname() {
+ return "alternatives"; //$NON-NLS-1$
+ }
+
+ public String getUnknownTypeErrorMessage() {
+ return CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME;
+ }
+
+ public String getIllegalTypeErrorMessage() {
+ return CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION;
+ }
+
+ public String getDuplicateTypeErrorMessage() {
+ return CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE;
+ }
+
+ @Override
+ protected String getAnnotationName() {
+ return CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME;
+ }
+ }
+
+ private static class DecoratorTypeValidator extends AbstractTypeValidator {
+
+ public DecoratorTypeValidator(ICDIProject cdiProject) {
+ super(cdiProject);
+ }
+
+ public boolean validateSourceType(IType type) {
+ IClassBean classBean = cdiProject.getBeanClass(type);
+ return classBean instanceof IDecorator;
+ }
+
+ public String getParrentElementname() {
+ return "decorators"; //$NON-NLS-1$
+ }
+
+ public String getUnknownTypeErrorMessage() {
+ return CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME;
+ }
+
+ public String getIllegalTypeErrorMessage() {
+ return CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS;
+ }
+
+ public String getDuplicateTypeErrorMessage() {
+ return CDIValidationMessages.DUPLICATE_DECORATOR_CLASS;
+ }
+
+ @Override
+ protected String getAnnotationName() {
+ return CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME;
+ }
+ }
+
+ private static class InterceptorTypeValidator extends AbstractTypeValidator {
+
+ public InterceptorTypeValidator(ICDIProject cdiProject) {
+ super(cdiProject);
+ }
+
+ public boolean validateSourceType(IType type) {
+ IClassBean classBean = cdiProject.getBeanClass(type);
+ return classBean instanceof IInterceptor;
+ }
+
+ public String getParrentElementname() {
+ return "interceptors"; //$NON-NLS-1$
+ }
+
+ public String getUnknownTypeErrorMessage() {
+ return CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME;
+ }
+
+ public String getIllegalTypeErrorMessage() {
+ return CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS;
+ }
+
+ public String getDuplicateTypeErrorMessage() {
+ return CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS;
+ }
+
+ @Override
+ protected String getAnnotationName() {
+ return CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME;
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidationDelegate.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidationDelegate.java 2010-08-29 12:49:11 UTC (rev 24542)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.internal.core.validation;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class CDICoreValidationDelegate {
+
+ protected CDICoreValidator validator;
+
+ public CDICoreValidationDelegate(CDICoreValidator validator) {
+ this.validator = validator;
+ }
+
+ public CDICoreValidator getValidator() {
+ return validator;
+ }
+
+ public void setValidator(CDICoreValidator validator) {
+ this.validator = validator;
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidationDelegate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-08-28 19:28:10 UTC (rev 24541)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-08-29 12:49:11 UTC (rev 24542)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.validation;
-import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
@@ -46,14 +45,8 @@
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.validation.internal.core.ValidationException;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -101,9 +94,6 @@
import org.jboss.tools.jst.web.kb.validation.IValidationContext;
import org.jboss.tools.jst.web.kb.validation.IValidator;
import org.jboss.tools.jst.web.kb.validation.ValidationUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* @author Alexey Kazakov
@@ -115,6 +105,9 @@
String projectName;
IJavaProject javaProject;
+ private BeansXmlValidationDelegate beansXmlValidator = new BeansXmlValidationDelegate(this);
+ private AnnotationValidationDelegate annptationValidator = new AnnotationValidationDelegate(this);
+
/*
* (non-Javadoc)
*
@@ -232,7 +225,7 @@
// Get all the paths of related resources for given file. These
// links were saved in previous validation process.
- Set<String> oldReletedResources = validationContext.getVariableNamesByCoreResource(currentFile.getFullPath(), false);
+ Set<String> oldReletedResources = getValidationContext().getVariableNamesByCoreResource(currentFile.getFullPath(), false);
if (oldReletedResources != null) {
for (String resourcePath : oldReletedResources) {
resources.add(Path.fromOSString(resourcePath));
@@ -243,14 +236,16 @@
// Validate all collected linked resources.
// Remove all links between collected resources because they will be
// linked again during validation.
- validationContext.removeLinkedCoreResources(resources);
+ getValidationContext().removeLinkedCoreResources(resources);
IFile[] filesToValidate = new IFile[resources.size()];
int i = 0;
// We have to remove markers from all collected source files first
for (IPath linkedResource : resources) {
filesToValidate[i] = root.getFile(linkedResource);
- removeAllMessagesFromResource(filesToValidate[i++]);
+ if(filesToValidate[i].isAccessible()) {
+ removeAllMessagesFromResource(filesToValidate[i++]);
+ }
}
i = 0;
// Then we can validate them
@@ -301,12 +296,12 @@
Set<String> scopes = cdiProject.getScopeNames();
for (String scope: scopes) {
- validateScopeType(cdiProject.getScope(scope));
+ annptationValidator.validateScopeType(cdiProject.getScope(scope));
}
List<IFile> beansXmls = getAllBeansXmls();
for (IFile beansXml : beansXmls) {
- validateBeansXml(beansXml);
+ beansXmlValidator.validateBeansXml(beansXml);
}
return OK_STATUS;
@@ -325,7 +320,7 @@
if("beans.xml".equalsIgnoreCase(file.getName()) && CDIPreferences.shouldValidateBeansXml(file.getProject())) {
// TODO should we check the path of the beans.xml? Or it's better to check the every beans.xml even if it is not in META-INF or WEB-INF.
- validateBeansXml(file);
+ beansXmlValidator.validateBeansXml(file);
} else {
Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
for (IBean bean : beans) {
@@ -338,13 +333,37 @@
validateQualifier(qualifier);
IScope scope = cdiProject.getScope(file.getFullPath());
- validateScopeType(scope);
+ annptationValidator.validateScopeType(scope);
IInterceptorBinding binding = cdiProject.getInterceptorBinding(file.getFullPath());
validateInterceptorBinding(binding);
}
}
+ Set<IFolder> sourceFolders = null;
+
+ Set<IFolder> getSourceFolders() {
+ if(sourceFolders==null) {
+ sourceFolders = new HashSet<IFolder>();
+ IPackageFragmentRoot[] roots;
+ try {
+ // From source folders
+ roots = javaProject.getPackageFragmentRoots();
+ for (int i = 0; i < roots.length; i++) {
+ if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
+ IResource source = roots[i].getCorrespondingResource();
+ if(source instanceof IFolder) {
+ sourceFolders.add((IFolder)source);
+ }
+ }
+ }
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ }
+ return sourceFolders;
+ }
+
/**
* Returns all the beans.xml from META-INF and WEB-INF folders
*
@@ -352,31 +371,21 @@
*/
private List<IFile> getAllBeansXmls() {
List<IFile> beansXmls = new ArrayList<IFile>();
- IPackageFragmentRoot[] roots;
- try {
- // From source folders
- roots = javaProject.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
- IResource source = roots[i].getCorrespondingResource();
- if(source instanceof IFolder) {
- IResource beansXml = ((IFolder)source).findMember(new Path("/META-INF/beans.xml")); //$NON-NLS-1$
- if(beansXml!=null && beansXml instanceof IFile) {
- beansXmls.add((IFile)beansXml);
- }
- }
- }
+ // From source folders
+ Set<IFolder> sourceFolders = getSourceFolders();
+ for (IFolder source : sourceFolders) {
+ IResource beansXml = source.findMember(new Path("/META-INF/beans.xml")); //$NON-NLS-1$
+ if(beansXml!=null && beansXml instanceof IFile) {
+ beansXmls.add((IFile)beansXml);
}
- // From WEB-INF folder
- IVirtualComponent com = ComponentCore.createComponent(rootProject);
- if(com!=null) {
- IVirtualFile beansXml = com.getRootFolder().getFile(new Path("/WEB-INF/beans.xml")); //$NON-NLS-1$
- if(beansXml!=null && beansXml.getUnderlyingFile().isAccessible()) {
- beansXmls.add(beansXml.getUnderlyingFile());
- }
+ }
+ // From WEB-INF folder
+ IVirtualComponent com = ComponentCore.createComponent(rootProject);
+ if(com!=null) {
+ IVirtualFile beansXml = com.getRootFolder().getFile(new Path("/WEB-INF/beans.xml")); //$NON-NLS-1$
+ if(beansXml!=null && beansXml.getUnderlyingFile().isAccessible()) {
+ beansXmls.add(beansXml.getUnderlyingFile());
}
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
}
return beansXmls;
}
@@ -396,14 +405,14 @@
// Collect all relations between the bean and other CDI elements.
String name = bean.getName();
if (name != null) {
- validationContext.addVariableNameForELValidation(name);
+ getValidationContext().addVariableNameForELValidation(name);
}
String beanPath = bean.getResource().getFullPath().toOSString();
Set<IScopeDeclaration> scopeDeclarations = bean.getScopeDeclarations();
for (IScopeDeclaration scopeDeclaration : scopeDeclarations) {
IScope scope = scopeDeclaration.getScope();
if (!scope.getSourceType().isReadOnly()) {
- validationContext.addLinkedCoreResource(beanPath, scope.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(beanPath, scope.getResource().getFullPath(), false);
}
}
addLinkedStereotypes(beanPath, bean);
@@ -411,7 +420,7 @@
for (IQualifierDeclaration qualifierDeclaration : qualifierDeclarations) {
IQualifier qualifier = qualifierDeclaration.getQualifier();
if (!qualifier.getSourceType().isReadOnly()) {
- validationContext.addLinkedCoreResource(beanPath, qualifier.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(beanPath, qualifier.getResource().getFullPath(), false);
}
}
@@ -455,7 +464,7 @@
for (IStereotypeDeclaration stereotypeDeclaration : stereotypeDeclarations) {
IStereotype stereotype = stereotypeDeclaration.getStereotype();
if (!stereotype.getSourceType().isReadOnly()) {
- validationContext.addLinkedCoreResource(beanPath, stereotype.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(beanPath, stereotype.getResource().getFullPath(), false);
}
}
}
@@ -465,7 +474,7 @@
for (IInterceptorBindingDeclaration bindingDeclaration : bindingDeclarations) {
IInterceptorBinding binding = bindingDeclaration.getInterceptorBinding();
if (!binding.getSourceType().isReadOnly()) {
- validationContext.addLinkedCoreResource(beanPath, binding.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(beanPath, binding.getResource().getFullPath(), false);
}
}
}
@@ -554,7 +563,7 @@
return;
}
if(!specializingBean.getBeanClass().isReadOnly()) {
- validationContext.addLinkedCoreResource(bean.getSourcePath().toOSString(), specializingBean.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(bean.getSourcePath().toOSString(), specializingBean.getResource().getFullPath(), false);
}
String beanClassName = bean.getBeanClass().getElementName();
@@ -862,7 +871,7 @@
addError(errorMessageKey, preferencesKey, declaration, bean.getResource());
}
} else {
- validationContext.addLinkedCoreResource(bean.getSourcePath().toOSString(), iMethod.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(bean.getSourcePath().toOSString(), iMethod.getResource().getFullPath(), false);
}
}
}
@@ -1050,7 +1059,7 @@
addError(CDIValidationMessages.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, CDIPreferences.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, producer.getProducesAnnotation(), producer.getResource());
saveAllSuperTypesAsLinkedResources(classBean);
} else {
- validationContext.addLinkedCoreResource(classBean.getSourcePath().toOSString(), method.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(classBean.getSourcePath().toOSString(), method.getResource().getFullPath(), false);
}
}
@@ -1107,7 +1116,7 @@
for (IParametedType type : types) {
IType superType = type.getType();
if(superType!=null && !superType.isBinary() && superType.getResource()!=null && superType!=bean.getBeanClass()) {
- validationContext.addLinkedCoreResource(bean.getSourcePath().toOSString(), superType.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(bean.getSourcePath().toOSString(), superType.getResource().getFullPath(), false);
}
}
}
@@ -1635,7 +1644,7 @@
Set<IParametedType> decoratedParametedTypes = decorator.getDecoratedTypes();
List<String> supers = null;
if(!delegateType.isReadOnly()) {
- validationContext.addLinkedCoreResource(decorator.getResource().getFullPath().toOSString(), delegateType.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(decorator.getResource().getFullPath().toOSString(), delegateType.getResource().getFullPath(), false);
}
for (IParametedType decoratedParametedType : decoratedParametedTypes) {
IType decoratedType = decoratedParametedType.getType();
@@ -1643,7 +1652,7 @@
continue;
}
if(!decoratedType.isReadOnly()) {
- validationContext.addLinkedCoreResource(decorator.getResource().getFullPath().toOSString(), decoratedType.getResource().getFullPath(), false);
+ getValidationContext().addLinkedCoreResource(decorator.getResource().getFullPath().toOSString(), decoratedType.getResource().getFullPath(), false);
}
String decoratedTypeName = decoratedType.getFullyQualifiedName();
// Ignore the type of the decorator class bean
@@ -1873,111 +1882,28 @@
}
try {
- validateStereotypeAnnotationTypeAnnotations(stereotype, resource);
+ annptationValidator.validateStereotypeAnnotationTypeAnnotations(stereotype, resource);
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
}
- private void validateStereotypeAnnotationTypeAnnotations(IStereotype stereotype, IResource resource) throws JavaModelException {
- /*
- * Stereotype annotation type should be annotated with @Target with correct targets [JSR-299 §2.7.1]
- * Stereotype annotation type should be annotated with @Retention(RUNTIME)
- */
- String[][] variants = {{TARGET_METHOD, TARGET_FIELD, TARGET_TYPE},
- {TARGET_METHOD, TARGET_FIELD},
- {TARGET_TYPE}, {TARGET_METHOD}, {TARGET_FIELD}};
- validateTargetAnnotation(stereotype, variants, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE, resource);
-
- /*
- * Stereotype annotation type should be annotated with @Retention(RUNTIME)
- */
- validateRetentionAnnotation(stereotype, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE, resource);
- }
-
- /**
- * Validates a qualifier.
- *
- * @param qualifier
- */
- private void validateScopeType(IScope scope) {
- if(scope == null) {
+ private void validateInterceptorBinding(IInterceptorBinding binding) {
+ if(binding==null) {
return;
}
- IResource resource = scope.getResource();
+ IResource resource = binding.getResource();
if (resource == null || !resource.getName().toLowerCase().endsWith(".java")) {
// validate sources only
return;
}
-
- try {
- validateScopeAnnotationTypeAnnotations(scope, resource);
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- }
-
- private void validateScopeAnnotationTypeAnnotations(IScope scope, IResource resource) throws JavaModelException {
/*
- * Scope annotation type should be annotated with @Target({TYPE, METHOD, FIELD})
+ * 9.5.2. Interceptor binding types with members
+ * array-valued or annotation-valued member of an interceptor binding type is not annotated @Nonbinding (Non-Portable behavior)
*/
- String[][] variants = {{TARGET_TYPE, TARGET_METHOD, TARGET_FIELD}};
- validateTargetAnnotation(scope, variants, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE, resource);
-
- /*
- * Scope annotation type should be annotated with @Retention(RUNTIME)
- */
- validateRetentionAnnotation(scope, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE, resource);
+ validateAnnotationMembers(binding, CDIValidationMessages.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, CDIValidationMessages.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, CDIPreferences.MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER);
}
- void validateRetentionAnnotation(ICDIAnnotation type, String message, IResource resource) throws JavaModelException {
- IAnnotationDeclaration retention = type.getAnnotationDeclaration(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME);
- if(retention == null) {
- addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(type.getSourceType().getNameRange()), resource);
- } else {
- IMemberValuePair[] ps = retention.getDeclaration().getMemberValuePairs();
- boolean ok = false;
- for (IMemberValuePair p: ps) {
- if(!"value".equals(p.getMemberName())) continue;
- Object o = p.getValue();
- if(o != null) {
- ok = true;
- String s = o.toString();
- int i = s.lastIndexOf('.');
- if(i >= 0) s = s.substring(i + 1);
- if(!"RUNTIME".equals(s)) ok = false;
- }
- }
- if(!ok) {
- addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, retention, resource);
- }
- }
- }
-
- Set<String> getTargetAnnotationValues(IAnnotationDeclaration target) throws JavaModelException {
- Set<String> result = new HashSet<String>();
- IMemberValuePair[] ps = target.getDeclaration().getMemberValuePairs();
- for (IMemberValuePair p: ps) {
- if(!"value".equals(p.getMemberName())) continue;
- Object o = p.getValue();
- if(o instanceof Object[]) {
- Object[] os = (Object[])o;
- for (Object q: os) {
- String s = q.toString();
- int i = s.lastIndexOf('.');
- if(i >= 0) s = s.substring(i + 1);
- result.add(s);
- }
- } else if(o != null) {
- String s = o.toString();
- int i = s.lastIndexOf('.');
- if(i >= 0) s = s.substring(i + 1);
- result.add(s);
- }
- }
- return result;
- }
-
/**
* Validates a qualifier.
*
@@ -2002,78 +1928,13 @@
* Qualifier annotation type should be annotated with @Target({METHOD, FIELD, PARAMETER, TYPE})
*/
try {
- validateQualifierAnnotationTypeAnnotations(qualifier, resource);
+ annptationValidator.validateQualifierAnnotationTypeAnnotations(qualifier, resource);
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
}
- static String TARGET_METHOD = "METHOD";
- static String TARGET_FIELD = "FIELD";
- static String TARGET_PARAMETER = "PARAMETER";
- static String TARGET_TYPE = "TYPE";
-
- private void validateQualifierAnnotationTypeAnnotations(IQualifier qualifier, IResource resource) throws JavaModelException {
- /*
- * Qualifier annotation type should be annotated with @Target({METHOD, FIELD, PARAMETER, TYPE}) or @Target({"FIELD", "PARAMETER"})
- * Qualifier annotation type should be annotated with @Retention(RUNTIME)
- */
- String[][] variants = {{TARGET_METHOD, TARGET_FIELD, TARGET_PARAMETER, TARGET_TYPE},
- {TARGET_FIELD, TARGET_PARAMETER}};
- validateTargetAnnotation(qualifier, variants, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE, resource);
-
- /*
- * Qualifier annotation type should be annotated with @Retention(RUNTIME)
- */
- validateRetentionAnnotation(qualifier, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE, resource);
- }
-
- private void validateTargetAnnotation(ICDIAnnotation annotationType, String[][] variants, String message, IResource resource) throws JavaModelException {
- IAnnotationDeclaration target = annotationType.getAnnotationDeclaration(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
- if(target == null) {
- addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(annotationType.getSourceType().getNameRange()), resource);
- } else {
- Set<String> vs = getTargetAnnotationValues(target);
- boolean ok = false;
- for (int i = 0; i < variants.length; i++) {
- if(vs.size() == variants[i].length) {
- boolean ok2 = true;
- String[] values = variants[i];
- for (String s: values) {
- if(!vs.contains(s)) {
- ok2 = false;
- break;
- }
- }
- if(ok2) {
- ok = true;
- break;
- }
- }
- }
- if(!ok) {
- addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, target, resource);
- }
- }
- }
-
- private void validateInterceptorBinding(IInterceptorBinding binding) {
- if(binding==null) {
- return;
- }
- IResource resource = binding.getResource();
- if (resource == null || !resource.getName().toLowerCase().endsWith(".java")) {
- // validate sources only
- return;
- }
- /*
- * 9.5.2. Interceptor binding types with members
- * array-valued or annotation-valued member of an interceptor binding type is not annotated @Nonbinding (Non-Portable behavior)
- */
- validateAnnotationMembers(binding, CDIValidationMessages.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, CDIValidationMessages.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, CDIPreferences.MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER);
- }
-
- private void validateAnnotationMembers(ICDIAnnotation annotation, String arrayMessageErrorKey, String annotationValueErrorKey, String preferencesKey) {
+ void validateAnnotationMembers(ICDIAnnotation annotation, String arrayMessageErrorKey, String annotationValueErrorKey, String preferencesKey) {
IType type = annotation.getSourceType();
try {
IMethod[] methods = type.getMethods();
@@ -2108,241 +1969,4 @@
CDICorePlugin.getDefault().logError(e);
}
}
-
- private void validateBeansXml(IFile beansXml) {
- IModelManager manager = StructuredModelManager.getModelManager();
- if(manager == null) {
- // this may happen if plug-in org.eclipse.wst.sse.core
- // is stopping or un-installed, that is Eclipse is shutting down.
- // there is no need to report it, just stop validation.
- return;
- }
-
- IStructuredModel model = null;
- try {
- model = manager.getModelForRead(beansXml);
- if (model instanceof IDOMModel) {
- IDOMModel domModel = (IDOMModel) model;
- IDOMDocument document = domModel.getDocument();
-
- /*
- * 5.1.1. Declaring selected alternatives for a bean archive
- * - Each child <class> element must specify the name of an alternative bean class. If there is no class with the specified
- * name, or if the class with the specified name is not an alternative bean class, the container automatically detects the problem
- * and treats it as a deployment problem.
- * - If the same type is listed twice under the <alternatives> element, the container automatically detects the problem and
- * treats it as a deployment problem.
- */
- validateTypeBeanForBeansXml(document, beansXml, "class", false, "alternatives", CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME); //$NON-NLS-1$
-
- /*
- * 5.1.1. Declaring selected alternatives for a bean archive
- * - Each child <stereotype> element must specify the name of an @Alternative stereotype annotation. If there is no annotation
- * with the specified name, or the annotation is not an @Alternative stereotype, the container automatically detects the
- * problem and treats it as a deployment problem.
- * - If the same type is listed twice under the <alternatives> element, the container automatically detects the problem and
- * treats it as a deployment problem.
- */
- validateTypeBeanForBeansXml(document, beansXml, "stereotype", true, "alternatives", CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME, CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME); //$NON-NLS-1$
-
- /*
- * 8.2. Decorator enablement and ordering
- * - Each child <class> element must specify the name of a decorator bean class. If there is no class with the specified name,
- * or if the class with the specified name is not a decorator bean class, the container automatically detects the problem and
- * treats it as a deployment problem.
- * - If the same class is listed twice under the <decorators> element, the container automatically detects the problem and
- * treats it as a deployment problem.
- */
- validateTypeBeanForBeansXml(document, beansXml, "class", false, "decorators", CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, CDIValidationMessages.DUPLICATE_DECORATOR_CLASS, CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME); //$NON-NLS-1$
-
- /*
- * 9.4. Interceptor enablement and ordering
- * - Each child <class> element must specify the name of an interceptor class. If there is no class with the specified name, or if
- * the class with the specified name is not an interceptor class, the container automatically detects the problem and treats it as
- * a deployment problem.
- * - If the same class is listed twice under the <interceptors> element, the container automatically detects the problem and treats it as
- * a deployment problem.
- */
- validateTypeBeanForBeansXml(document, beansXml, "class", false, "interceptors", CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS, CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME); //$NON-NLS-1$
- }
- } catch (CoreException e) {
- CDICorePlugin.getDefault().logError(e);
- } catch (IOException e) {
- CDICorePlugin.getDefault().logError(e);
- } finally {
- if (model != null) {
- model.releaseFromRead();
- }
- }
- }
-
- private void validateTypeBeanForBeansXml(IDOMDocument document, IFile beansXml, String typeElementName, boolean annotationType, String parentElementName, String unknownTypeErrorMessage, String illegalTypeErrorMessage, String duplicateTypeErrorMessage, String annotationName) {
- try {
- NodeList parentNodeList = document.getElementsByTagName(parentElementName);
- for (int i = 0; i < parentNodeList.getLength(); i++) {
- Node parentNode = parentNodeList.item(i);
- if(parentNode instanceof Element) {
- List<TypeNode> typeNodes = getTypeElements((Element)parentNode, typeElementName);
- Map<String, TypeNode> uniqueTypes = new HashMap<String, TypeNode>();
- for (TypeNode typeNode : typeNodes) {
- IType type = getType(beansXml, typeNode, unknownTypeErrorMessage);
- if(type!=null) {
- if(!type.isBinary()) {
- validationContext.addLinkedCoreResource(beansXml.getFullPath().toOSString(), type.getPath(), false);
- }
- if(!(annotationType?type.isAnnotation():type.isClass())) {
- addError(illegalTypeErrorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
- new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml);
- } else if(type.isBinary()) {
- IAnnotation[] annotations = type.getAnnotations();
- boolean found = false;
- for (IAnnotation annotation : annotations) {
- if(annotation.getElementName().equals(annotationName)) {
- found = true;
- break;
- }
- }
- if(!found) {
- addError(illegalTypeErrorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
- new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml);
- }
- continue;
- } else {
- // TODO we should check Decorators/Interceptors as well as Alternatives (classes/stereotypes)!
- IClassBean classBean = getClassBean(type);
- if(classBean==null || !classBean.isAlternative()) {
- addError(illegalTypeErrorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
- new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml);
- }
- }
- TypeNode node = uniqueTypes.get(typeNode.getTypeName());
- if(node!=null) {
- if(!node.isMarkedAsDuplicated()) {
- addError(duplicateTypeErrorMessage, CDIPreferences.DUPLICATE_TYPE_IN_BEANS_XML,
- new String[]{}, node.getLength(), node.getStartOffset(), beansXml);
- }
- node.setMarkedAsDuplicated(true);
- addError(duplicateTypeErrorMessage, CDIPreferences.DUPLICATE_TYPE_IN_BEANS_XML,
- new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml);
- }
- uniqueTypes.put(typeNode.getTypeName(), typeNode);
- }
- }
- }
- }
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- }
-
- private IClassBean getClassBean(IType type) {
- IPath path = type.getPath();
- Set<IBean> beans = cdiProject.getBeans(path);
- for (IBean bean : beans) {
- if(bean instanceof IClassBean) {
- return (IClassBean)bean;
- }
- }
- return null;
- }
-
- private IType getType(IFile beansXml, TypeNode node, String errorMessage) {
- IType type = null;
- if(node.getTypeName()!=null) {
- try {
- type = EclipseJavaUtil.findType(javaProject, node.getTypeName());
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- return null;
- }
- }
- if(type==null) {
- addError(errorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
- new String[]{}, node.getLength(), node.getStartOffset(), beansXml);
- }
- return type;
- }
-
- private List<TypeNode> getTypeElements(Element parentElement, String typeElementName) {
- List<TypeNode> result = new ArrayList<TypeNode>();
- NodeList list = parentElement.getElementsByTagName(typeElementName);
- for (int i = 0; i < list.getLength(); i++) {
- Node classNode = list.item(i);
- NodeList children = classNode.getChildNodes();
-
- boolean empty = true;
- for (int j = 0; j < children.getLength(); j++) {
- Node node = children.item(j);
- if(node.getNodeType() == Node.TEXT_NODE) {
- String value = node.getNodeValue();
- if(value!=null) {
- String className = value.trim();
- if(className.length()==0) {
- continue;
- }
- empty = false;
- if(node instanceof IndexedRegion) {
- int start = ((IndexedRegion)node).getStartOffset() + value.indexOf(className);
- int length = className.length();
- result.add(new TypeNode(start, length, className));
- break;
- }
- }
- }
- }
-
- if(empty && classNode instanceof IndexedRegion) {
- int start = ((IndexedRegion)classNode).getStartOffset();
- int end = ((IndexedRegion)classNode).getEndOffset();
- int length = end - start;
- result.add(new TypeNode(start, length, null));
- }
- }
- return result;
- }
-
- private static class TypeNode {
- private int startOffset;
- private int length;
- private String typeName;
- private boolean markedAsDuplicated;
-
- public TypeNode(int startOffset, int length, String typeName) {
- this.startOffset = startOffset;
- this.length = length;
- this.typeName = typeName;
- }
-
- public int getStartOffset() {
- return startOffset;
- }
-
- public void setStartOffset(int startOffset) {
- this.startOffset = startOffset;
- }
-
- public int getLength() {
- return length;
- }
-
- public void setLength(int length) {
- this.length = length;
- }
-
- public String getTypeName() {
- return typeName;
- }
-
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- public boolean isMarkedAsDuplicated() {
- return markedAsDuplicated;
- }
-
- public void setMarkedAsDuplicated(boolean markedAsDuplicated) {
- this.markedAsDuplicated = markedAsDuplicated;
- }
- }
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml 2010-08-28 19:28:10 UTC (rev 24541)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml 2010-08-29 12:49:11 UTC (rev 24542)
@@ -34,8 +34,8 @@
<class>org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator.TimestampLogger</class>
- <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator>
- <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator>
+ <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</class>
</decorators>
<interceptors>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-08-28 19:28:10 UTC (rev 24541)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-08-29 12:49:11 UTC (rev 24542)
@@ -1472,7 +1472,7 @@
*/
public void testNoAlternativeClassWithSpecifiedName() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, 4);
+ assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, false, 7);
assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, 19);
}
@@ -1483,7 +1483,7 @@
*/
public void testIllegalAlternativeClassWithSpecifiedName() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, 7);
+ assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, 4);
assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, 19);
}
@@ -1517,22 +1517,12 @@
*/
public void testSameAlternativeClassListedTwice() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 20, 22);
+ assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 20, 22, 26, 27);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 17);
assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 19);
}
/**
- * 5.1.1. Declaring selected alternatives for a bean archive
- * - If the same type is listed twice under the <alternatives> element, the container automatically detects the problem and
- * treats it as a deployment problem.
- */
- public void testSameAlternativeAnnotationListedTwice() throws Exception {
- IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 26, 27);
- assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 17);
- }
-
- /**
* 8.2. Decorator enablement and ordering
* - Each child <class> element must specify the name of a decorator bean class. If there is no class with the specified name,
* the container automatically detects the problem and treats it as a deployment problem.
@@ -1631,10 +1621,14 @@
return AbstractResourceMarkerTest.getMarkersNumberByGroupName(resource, null);
}
- private static void assertMarkerIsCreated(IResource resource, String message, int... expectedLines) throws CoreException {
- AbstractResourceMarkerTest.assertMarkerIsCreated(resource, AbstractResourceMarkerTest.MARKER_TYPE, convertMessageToPatern(message), expectedLines);
+ private static void assertMarkerIsCreated(IResource resource, String pattern, int... expectedLines) throws CoreException {
+ assertMarkerIsCreated(resource, pattern, true, expectedLines);
}
+ private static void assertMarkerIsCreated(IResource resource, String message, boolean pattern, int... expectedLines) throws CoreException {
+ AbstractResourceMarkerTest.assertMarkerIsCreated(resource, AbstractResourceMarkerTest.MARKER_TYPE, pattern?convertMessageToPatern(message):message, pattern, expectedLines);
+ }
+
private static void assertMarkerIsNotCreated(IResource resource, String message) throws CoreException {
AbstractResourceMarkerTest.assertMarkerIsNotCreated(resource, AbstractResourceMarkerTest.MARKER_TYPE, convertMessageToPatern(message));
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java 2010-08-28 19:28:10 UTC (rev 24541)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java 2010-08-29 12:49:11 UTC (rev 24542)
@@ -187,6 +187,10 @@
return this.getClass();
}
+ public IValidationContext getValidationContext() {
+ return validationContext;
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#addError(java.lang.String, int, java.lang.String[], int, int, org.eclipse.core.resources.IResource)
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2010-08-28 19:28:10 UTC (rev 24541)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2010-08-29 12:49:11 UTC (rev 24542)
@@ -41,10 +41,10 @@
super(name);
}
- public static int findMarkerLine(IResource resource, String type, String pattern)
+ public static int findMarkerLine(IResource resource, String type, String errorMessage, boolean pattern)
throws CoreException {
int number = -1;
- List<Integer> lines = findMarkerLines(resource, type, pattern);
+ List<Integer> lines = findMarkerLines(resource, type, errorMessage, pattern);
if(!lines.isEmpty()) {
number = lines.get(0);
}
@@ -53,8 +53,13 @@
public static List<Integer> findMarkerLines(IResource resource, String type,
String pattern) throws CoreException {
+ return findMarkerLines(resource, type, pattern, true);
+ }
+
+ public static List<Integer> findMarkerLines(IResource resource, String type,
+ String errorMessage, boolean pattern) throws CoreException {
List<Integer> numbers = new ArrayList<Integer>();
- IMarker[] markers = findMarkers(resource, type, pattern);
+ IMarker[] markers = findMarkers(resource, type, errorMessage, pattern);
for (int i = 0; i < markers.length; i++) {
numbers.add(markers[i].getAttribute(IMarker.LINE_NUMBER, -1));
}
@@ -63,11 +68,15 @@
}
public static IMarker[] findMarkers(IResource resource, String type, String pattern) throws CoreException {
+ return findMarkers(resource, type, pattern, true);
+ }
+
+ public static IMarker[] findMarkers(IResource resource, String type, String errorMessage, boolean pattern) throws CoreException {
List<IMarker> result = new ArrayList<IMarker>();
IMarker[] markers = resource.findMarkers(type, true, IResource.DEPTH_INFINITE);
for (int i = 0; i < markers.length; i++) {
String message = markers[i].getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$
- if ((message.matches(pattern)||message.equals(pattern)) && markers[i].exists()) {
+ if (pattern?message.matches(errorMessage)||message.equals(errorMessage):message.equals(errorMessage) && markers[i].exists()) {
result.add(markers[i]);
}
}
@@ -75,19 +84,23 @@
}
public static void assertMarkerIsCreated(IResource resource, MarkerData markerData) throws CoreException {
- assertMarkerIsCreated(resource, markerData.type, markerData.pattern, markerData.line);
+ assertMarkerIsCreated(resource, markerData.type, markerData.pattern, true, markerData.line);
}
- public static void assertMarkerIsCreated(IResource resource, String type, String pattern, int... expectedLines)
+ public static void assertMarkerIsCreated(IResource resource, String type, String pattern, int... expectedLines) throws CoreException {
+ assertMarkerIsCreated(resource, type, pattern, true, expectedLines);
+ }
+
+ public static void assertMarkerIsCreated(IResource resource, String type, String errorMessage, boolean pattern, int... expectedLines)
throws CoreException {
List<Integer> lines = findMarkerLines(
- resource, type, pattern);
+ resource, type, errorMessage, pattern);
- assertFalse("Marker matches the '" + pattern + "' pattern wasn't found", //$NON-NLS-1$ //$NON-NLS-2$
+ assertFalse("Marker matches the '" + errorMessage + "' pattern wasn't found", //$NON-NLS-1$ //$NON-NLS-2$
lines.isEmpty());
- assertEquals("Wrong number of found marker matches the '" + pattern + "' pattern", //$NON-NLS-1$//$NON-NLS-2$
+ assertEquals("Wrong number of found marker matches the '" + errorMessage + "' pattern", //$NON-NLS-1$//$NON-NLS-2$
expectedLines.length, lines.size());
StringBuffer expectedString = new StringBuffer();
@@ -114,7 +127,7 @@
break;
}
}
- assertTrue("Marker matches the '" + pattern + "' pattern was found at wrong lines. Expected: " + expectedString + " but were: " + realString, //$NON-NLS-1$//$NON-NLS-2$
+ assertTrue("Marker matches the '" + errorMessage + "' pattern was found at wrong lines. Expected: " + expectedString + " but were: " + realString, //$NON-NLS-1$//$NON-NLS-2$
found);
}
}
@@ -123,7 +136,7 @@
IResource resource, String type, String pattern, int lineNumber,
int startPosition, int endPosition) throws CoreException {
- IMarker[] markers = findMarkers(resource, type, pattern);
+ IMarker[] markers = findMarkers(resource, type, pattern, true);
StringBuffer sb = new StringBuffer("[");
for (int i = 0; i < markers.length; i++) {
int line = markers[i].getAttribute(IMarker.LINE_NUMBER, -1);
@@ -149,8 +162,12 @@
}
public static void assertMarkerIsNotCreated(IResource resource, String type, String pattern, int expectedLine) throws CoreException {
- List<Integer> lines = findMarkerLines(resource, type, pattern);
+ assertMarkerIsNotCreated(resource, type, pattern, true, expectedLine);
+ }
+ public static void assertMarkerIsNotCreated(IResource resource, String type, String errorMessage, boolean pattern, int expectedLine) throws CoreException {
+ List<Integer> lines = findMarkerLines(resource, type, errorMessage, pattern);
+
assertFalse("Marker matches the '" + pattern + "' pattern was found", lines.contains(expectedLine)); //$NON-NLS-1$ //$NON-NLS-2$
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r24541 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-28 15:28:10 -0400 (Sat, 28 Aug 2010)
New Revision: 24541
Modified:
trunk/build/publish.sh
Log:
ignore warning lines and checksum failures
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-08-28 19:17:10 UTC (rev 24540)
+++ trunk/build/publish.sh 2010-08-28 19:28:10 UTC (rev 24541)
@@ -136,9 +136,10 @@
bl=${STAGINGDIR}/logs/BUILDLOG.txt
wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl}
fl=${STAGINGDIR}/logs/FAIL_LOG.txt
-sed -ne "/<<< FAI/,+9 p" ${bl} | sed -e "/AILURE/,+9 s/\(.\+AILURE.\+\)/\n----------\n\n\1/g" > ${fl}
-sed -ne "/ FAI/ p" ${bl} | sed -e "/AILURE \[/ s/\(.\+AILURE \[.\+\)/\n----------\n\n\1/g" >> ${fl}
-sed -ne "/ SKI/ p" ${bl} | sed -e "/KIPPED \[/ s/\(.\+KIPPED \[.\+\)/\n----------\n\n\1/g" >> ${fl}
+# ignore warning lines and checksum failures
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/<<< FAI/,+9 p" | sed -e "/AILURE/,+9 s/\(.\+AILURE.\+\)/\n----------\n\n\1/g" > ${fl}
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/ FAI/ p" | sed -e "/AILURE \[/ s/\(.\+AILURE \[.\+\)/\n----------\n\n\1/g" >> ${fl}
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/ SKI/ p" | sed -e "/KIPPED \[/ s/\(.\+KIPPED \[.\+\)/\n----------\n\n\1/g" >> ${fl}
fc=$(sed -ne "/FAI\|LURE/ p" ${fl} | wc -l)
if [[ $fc != "0" ]]; then
echo "" >> ${fl}; echo -n "FAI" >> ${fl}; echo -n "LURES FOUND: "$fc >> ${fl};
@@ -148,8 +149,9 @@
echo "" >> ${fl}; echo -n "SKI" >> ${fl}; echo -n "PS FOUND: "$fc >> ${fl};
fi
el=${STAGINGDIR}/logs/ERRORLOG.txt
-sed -ne "/<<< ERR/,+9 p" ${bl} | sed -e "/RROR/,+9 s/\(.\+RROR.\+\)/\n----------\n\n\1/g" > ${el}
-sed -ne "/\[ERR/,+2 p" ${bl} | sed -e "/ROR\] Fai/,+2 s/\(.\+ROR\] Fai.\+\)/\n----------\n\n\1/g" >> ${el}
+# ignore warning lines and checksum failures
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/<<< ERR/,+9 p" | sed -e "/RROR/,+9 s/\(.\+RROR.\+\)/\n----------\n\n\1/g" > ${el}
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/\[ERR/,+2 p" | sed -e "/ROR\] Fai/,+2 s/\(.\+ROR\] Fai.\+\)/\n----------\n\n\1/g" >> ${el}
ec=$(sed -ne "/ERR\|RROR/ p" ${el} | wc -l)
if [[ $ec != "0" ]]; then
echo "" >> ${el}; echo -n "ERR" >> ${el}; echo "ORS FOUND: "$ec >> ${el};
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r24540 - branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-28 15:17:10 -0400 (Sat, 28 Aug 2010)
New Revision: 24540
Modified:
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
Log:
fix path to test-pom.xml
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2010-08-28 19:17:10 UTC (rev 24540)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../build/parent/pom.xml</relativePath>
+ <relativePath>../test-pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
<artifactId>jsf.generic.test</artifactId>
<version>0.0.1-SNAPSHOT</version>
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r24539 - in branches/jbosstools-3.2.0.M2: archives/site and 79 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-28 10:32:23 -0400 (Sat, 28 Aug 2010)
New Revision: 24539
Modified:
branches/jbosstools-3.2.0.M2/archives/site/pom.xml
branches/jbosstools-3.2.0.M2/as/site/pom.xml
branches/jbosstools-3.2.0.M2/birt/features/org.jboss.tools.birt.test.feature/pom.xml
branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.core/pom.xml
branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml
branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.oda/pom.xml
branches/jbosstools-3.2.0.M2/birt/site/pom.xml
branches/jbosstools-3.2.0.M2/birt/tests/org.jboss.tools.birt.core.test/pom.xml
branches/jbosstools-3.2.0.M2/bpel/site/pom.xml
branches/jbosstools-3.2.0.M2/build/parent/pom.xml
branches/jbosstools-3.2.0.M2/build/pom.xml
branches/jbosstools-3.2.0.M2/build/product/pom.xml
branches/jbosstools-3.2.0.M2/cdi/site/pom.xml
branches/jbosstools-3.2.0.M2/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
branches/jbosstools-3.2.0.M2/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml
branches/jbosstools-3.2.0.M2/common/site/pom.xml
branches/jbosstools-3.2.0.M2/deltacloud/site/pom.xml
branches/jbosstools-3.2.0.M2/drools/features/org.drools.eclipse.feature/pom.xml
branches/jbosstools-3.2.0.M2/drools/features/org.drools.eclipse.task.feature/pom.xml
branches/jbosstools-3.2.0.M2/drools/features/org.guvnor.tools.feature/pom.xml
branches/jbosstools-3.2.0.M2/drools/plugins/org.drools.eclipse.task/pom.xml
branches/jbosstools-3.2.0.M2/drools/plugins/org.drools.eclipse/pom.xml
branches/jbosstools-3.2.0.M2/drools/plugins/org.eclipse.webdav/pom.xml
branches/jbosstools-3.2.0.M2/drools/plugins/org.guvnor.tools/pom.xml
branches/jbosstools-3.2.0.M2/drools/pom.xml
branches/jbosstools-3.2.0.M2/drools/site/pom.xml
branches/jbosstools-3.2.0.M2/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml
branches/jbosstools-3.2.0.M2/drools/tests/pom.xml
branches/jbosstools-3.2.0.M2/esb/site/pom.xml
branches/jbosstools-3.2.0.M2/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
branches/jbosstools-3.2.0.M2/examples/site/pom.xml
branches/jbosstools-3.2.0.M2/flow/site/pom.xml
branches/jbosstools-3.2.0.M2/freemarker/site/pom.xml
branches/jbosstools-3.2.0.M2/gwt/features/org.jboss.tools.gwt.feature/pom.xml
branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/pom.xml
branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml
branches/jbosstools-3.2.0.M2/hibernatetools/site/pom.xml
branches/jbosstools-3.2.0.M2/jbpm/site/pom.xml
branches/jbosstools-3.2.0.M2/jmx/site/pom.xml
branches/jbosstools-3.2.0.M2/jsf/site/pom.xml
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
branches/jbosstools-3.2.0.M2/jst/site/pom.xml
branches/jbosstools-3.2.0.M2/labs/features/pom.xml
branches/jbosstools-3.2.0.M2/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml
branches/jbosstools-3.2.0.M2/labs/plugins/pom.xml
branches/jbosstools-3.2.0.M2/labs/tests/pom.xml
branches/jbosstools-3.2.0.M2/maven/site/pom.xml
branches/jbosstools-3.2.0.M2/modeshape/site/pom.xml
branches/jbosstools-3.2.0.M2/pom.xml
branches/jbosstools-3.2.0.M2/portlet/features/pom.xml
branches/jbosstools-3.2.0.M2/portlet/plugins/pom.xml
branches/jbosstools-3.2.0.M2/portlet/pom.xml
branches/jbosstools-3.2.0.M2/portlet/site/pom.xml
branches/jbosstools-3.2.0.M2/portlet/tests/pom.xml
branches/jbosstools-3.2.0.M2/profiler/site/pom.xml
branches/jbosstools-3.2.0.M2/runtime/features/org.jboss.tools.runtime.feature/pom.xml
branches/jbosstools-3.2.0.M2/runtime/features/pom.xml
branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/pom.xml
branches/jbosstools-3.2.0.M2/runtime/plugins/pom.xml
branches/jbosstools-3.2.0.M2/runtime/site/pom.xml
branches/jbosstools-3.2.0.M2/smooks/site/pom.xml
branches/jbosstools-3.2.0.M2/struts/site/pom.xml
branches/jbosstools-3.2.0.M2/tests/plugins/org.jboss.tools.tests/pom.xml
branches/jbosstools-3.2.0.M2/tests/site/pom.xml
branches/jbosstools-3.2.0.M2/thirdparty/features/pom.xml
branches/jbosstools-3.2.0.M2/thirdparty/plugins/pom.xml
branches/jbosstools-3.2.0.M2/tptp/site/pom.xml
branches/jbosstools-3.2.0.M2/vpe/features/pom.xml
branches/jbosstools-3.2.0.M2/vpe/plugins/pom.xml
branches/jbosstools-3.2.0.M2/vpe/pom.xml
branches/jbosstools-3.2.0.M2/vpe/site/pom.xml
branches/jbosstools-3.2.0.M2/vpe/tests/pom.xml
branches/jbosstools-3.2.0.M2/ws/site/pom.xml
Log:
https://jira.jboss.org/browse/JBDS-1247 apply patch for removing relativePath from pom.xml files, minus changes in jsf/tests
Modified: branches/jbosstools-3.2.0.M2/archives/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/archives/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/archives/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/as/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/as/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/as/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/birt/features/org.jboss.tools.birt.test.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/birt/features/org.jboss.tools.birt.test.feature/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/birt/features/org.jboss.tools.birt.test.feature/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.core/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.core/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.core/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.oda/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.oda/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.oda/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/birt/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/birt/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/birt/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/birt/tests/org.jboss.tools.birt.core.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/birt/tests/org.jboss.tools.birt.core.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/birt/tests/org.jboss.tools.birt.core.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/bpel/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/bpel/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/bpel/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/build/parent/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/build/parent/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -11,7 +11,7 @@
</modules>
<properties>
- <!-- <tychoVersion>0.10.0-SNAPSHOT</tychoVersion> -->
+ <!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion-->
<tychoVersion>0.9.0</tychoVersion>
<scmBranch>trunk</scmBranch>
<BUILD_ALIAS>M2</BUILD_ALIAS>
Modified: branches/jbosstools-3.2.0.M2/build/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/build/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/build/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,670 +1,651 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<modelVersion>4.0.0</modelVersion>
-<groupId>org.jboss.tools</groupId>
-<artifactId>build</artifactId>
-<version>0.0.1-SNAPSHOT</version>
-<packaging>pom</packaging>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>build</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
-<profiles>
+ <profiles>
- <profile>
- <id>libs</id>
- <activation>
- <property>
- <name>coverage</name>
- </property>
- </activation>
- <modules>
- <module>libs</module>
- </modules>
- </profile>
+ <profile>
+ <id>libs</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <modules>
+ <module>libs</module>
+ </modules>
+ </profile>
- <profile>
- <id>tests</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>as-bootstrap</name>
- </property>
- </activation>
- <modules>
- <module>../tests</module>
- </modules>
- </profile>
+ <profile>
+ <id>tests</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>as-bootstrap</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../tests</module>
+ </modules>
+ </profile>
- <profile>
- <id>jmx</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../jmx</module>
- </modules>
- </profile>
+ <profile>
+ <id>jmx</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../jmx</module>
+ </modules>
+ </profile>
- <profile>
- <id>jmx-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../jmx</module>
- </modules>
- </profile>
-
- <profile>
- <id>archives</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>as-bootstrap</name>
- </property>
- </activation>
- <modules>
- <module>../archives</module>
- </modules>
- </profile>
+ <profile>
+ <id>jmx-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../jmx</module>
+ </modules>
+ </profile>
- <profile>
- <id>archives-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../archives</module>
- </modules>
- </profile>
+ <profile>
+ <id>archives</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>as-bootstrap</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../archives</module>
+ </modules>
+ </profile>
- <profile>
- <id>as</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>as-bootstrap</name>
- </property>
- </activation>
- <modules>
- <module>../as</module>
- </modules>
- </profile>
+ <profile>
+ <id>archives-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../archives</module>
+ </modules>
+ </profile>
- <profile>
- <id>as-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../archives</module>
- <module>../jmx</module>
- <module>../as</module>
- </modules>
- </profile>
+ <profile>
+ <id>as</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>as-bootstrap</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../as</module>
+ </modules>
+ </profile>
- <profile>
- <id>common</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../common</module>
- </modules>
- </profile>
+ <profile>
+ <id>as-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../archives</module>
+ <module>../jmx</module>
+ <module>../as</module>
+ </modules>
+ </profile>
- <profile>
- <id>common-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../common</module>
- </modules>
- </profile>
+ <profile>
+ <id>common</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../common</module>
+ </modules>
+ </profile>
- <profile>
- <id>jst</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../jst</module>
- </modules>
- </profile>
+ <profile>
+ <id>common-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../common</module>
+ </modules>
+ </profile>
- <profile>
- <id>jst-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../common</module>
- <module>../jst</module>
- </modules>
- </profile>
+ <profile>
+ <id>jst</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../jst</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>jst-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../jst</module>
+ </modules>
+ </profile>
- <profile>
- <id>xulrunner</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../xulrunner</module>
- </modules>
- </profile>
- <profile>
- <id>xulrunner-bootstrap</id>
- <modules>
- <module>../xulrunner</module>
- </modules>
- </profile>
+ <profile>
+ <id>xulrunner</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../xulrunner</module>
+ </modules>
+ </profile>
- <profile>
- <id>vpe</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../vpe</module>
- </modules>
- </profile>
+ <profile>
+ <id>xulrunner-bootstrap</id>
+ <modules>
+ <module>../xulrunner</module>
+ </modules>
+ </profile>
- <profile>
- <id>vpe-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../common</module>
- <module>../jst</module>
- <module>../xulrunner</module>
- <module>../vpe</module>
- </modules>
- </profile>
+ <profile>
+ <id>vpe</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../vpe</module>
+ </modules>
+ </profile>
- <profile>
- <id>jsf</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../jsf</module>
- </modules>
- </profile>
+ <profile>
+ <id>vpe-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../jst</module>
+ <module>../xulrunner</module>
+ <module>../vpe</module>
+ </modules>
+ </profile>
- <profile>
- <id>jsf-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../common</module>
- <module>../jst</module>
- <module>../xulrunner</module>
- <module>../vpe</module>
- <module>../jsf</module>
- </modules>
- </profile>
+ <profile>
+ <id>jsf</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../jsf</module>
+ </modules>
+ </profile>
- <profile>
- <id>freemarker</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../freemarker</module>
- </modules>
- </profile>
+ <profile>
+ <id>jsf-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../jst</module>
+ <module>../xulrunner</module>
+ <module>../vpe</module>
+ <module>../jsf</module>
+ </modules>
+ </profile>
- <profile>
- <id>freemarker-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../freemarker</module>
- </modules>
- </profile>
+ <profile>
+ <id>freemarker</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../freemarker</module>
+ </modules>
+ </profile>
- <profile>
- <id>hibernatetools</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../hibernatetools</module>
- </modules>
- </profile>
+ <profile>
+ <id>freemarker-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../freemarker</module>
+ </modules>
+ </profile>
- <profile>
- <id>hibernatetools-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../freemarker</module>
- <module>../hibernatetools</module>
- </modules>
- </profile>
+ <profile>
+ <id>hibernatetools</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../hibernatetools</module>
+ </modules>
+ </profile>
- <profile>
- <id>portlet</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../portlet</module>
- </modules>
- </profile>
+ <profile>
+ <id>hibernatetools-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../freemarker</module>
+ <module>../hibernatetools</module>
+ </modules>
+ </profile>
- <profile>
- <id>portlet-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../portlet</module>
- </modules>
- </profile>
+ <profile>
+ <id>portlet</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../portlet</module>
+ </modules>
+ </profile>
- <profile>
- <id>workingset</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../portlet</module>
- </modules>
- </profile>
+ <profile>
+ <id>portlet-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../portlet</module>
+ </modules>
+ </profile>
- <profile>
- <id>workingset-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../workingset</module>
- </modules>
- </profile>
+ <profile>
+ <id>workingset</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../portlet</module>
+ </modules>
+ </profile>
- <profile>
- <id>struts</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../struts</module>
- </modules>
- </profile>
+ <profile>
+ <id>workingset-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../workingset</module>
+ </modules>
+ </profile>
- <profile>
- <id>struts-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../common</module>
- <module>../jst</module>
- <module>../xulrunner</module>
- <module>../vpe</module>
- <module>../struts</module>
- </modules>
- </profile>
+ <profile>
+ <id>struts</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../struts</module>
+ </modules>
+ </profile>
- <profile>
- <id>profiler</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../profiler</module>
- </modules>
- </profile>
+ <profile>
+ <id>struts-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../jst</module>
+ <module>../xulrunner</module>
+ <module>../vpe</module>
+ <module>../struts</module>
+ </modules>
+ </profile>
- <profile>
- <id>profiler-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../profiler</module>
- </modules>
- </profile>
+ <profile>
+ <id>profiler</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../profiler</module>
+ </modules>
+ </profile>
- <profile>
- <id>smooks</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../smooks</module>
- </modules>
- </profile>
+ <profile>
+ <id>profiler-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../profiler</module>
+ </modules>
+ </profile>
- <profile>
- <id>smooks-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../smooks</module>
- </modules>
- </profile>
+ <profile>
+ <id>smooks</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../smooks</module>
+ </modules>
+ </profile>
- <profile>
- <id>cdi</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../cdi</module>
- </modules>
- </profile>
+ <profile>
+ <id>smooks-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../smooks</module>
+ </modules>
+ </profile>
- <profile>
- <id>cdi-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../common</module>
- <module>../jst</module>
- <module>../cdi</module>
- </modules>
- </profile>
+ <profile>
+ <id>cdi</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../cdi</module>
+ </modules>
+ </profile>
- <profile>
- <id>birt</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../birt</module>
- </modules>
- </profile>
+ <profile>
+ <id>cdi-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../jst</module>
+ <module>../cdi</module>
+ </modules>
+ </profile>
- <profile>
- <id>birt-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../birt</module>
- </modules>
- </profile>
+ <profile>
+ <id>birt</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../birt</module>
+ </modules>
+ </profile>
- <profile>
- <id>bpel</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../bpel</module>
- </modules>
- </profile>
+ <profile>
+ <id>birt-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../birt</module>
+ </modules>
+ </profile>
- <profile>
- <id>bpel-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../bpel</module>
- </modules>
- </profile>
+ <profile>
+ <id>bpel</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../bpel</module>
+ </modules>
+ </profile>
- <profile>
- <id>esb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../esb</module>
- </modules>
- </profile>
+ <profile>
+ <id>bpel-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../bpel</module>
+ </modules>
+ </profile>
- <profile>
- <id>esb-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../esb</module>
- </modules>
- </profile>
+ <profile>
+ <id>esb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../esb</module>
+ </modules>
+ </profile>
- <profile>
- <id>seam</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../seam</module>
- </modules>
- </profile>
+ <profile>
+ <id>esb-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../esb</module>
+ </modules>
+ </profile>
- <profile>
- <id>seam-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../as</module>
- <module>../hibernatetools</module>
- <module>../common</module>
- <module>../jst</module>
- <module>../xulrunner</module>
- <module>../vpe</module>
- <module>../jsf</module>
- <module>../seam</module>
- </modules>
- </profile>
+ <profile>
+ <id>seam</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../seam</module>
+ </modules>
+ </profile>
- <profile>
- <id>examples</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../examples</module>
- </modules>
- </profile>
+ <profile>
+ <id>seam-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../as</module>
+ <module>../hibernatetools</module>
+ <module>../common</module>
+ <module>../jst</module>
+ <module>../xulrunner</module>
+ <module>../vpe</module>
+ <module>../jsf</module>
+ <module>../seam</module>
+ </modules>
+ </profile>
- <profile>
- <id>examples-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../examples</module>
- </modules>
- </profile>
+ <profile>
+ <id>examples</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../examples</module>
+ </modules>
+ </profile>
- <profile>
- <id>maven</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../maven</module>
- </modules>
- </profile>
+ <profile>
+ <id>examples-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../examples</module>
+ </modules>
+ </profile>
- <profile>
- <id>maven-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../maven</module>
- </modules>
- </profile>
+ <profile>
+ <id>maven</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../maven</module>
+ </modules>
+ </profile>
- <profile>
- <id>tptp</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../tptp</module>
- </modules>
- </profile>
+ <profile>
+ <id>maven-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../maven</module>
+ </modules>
+ </profile>
- <profile>
- <id>tptp-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../tptp</module>
- </modules>
- </profile>
+ <profile>
+ <id>tptp</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../tptp</module>
+ </modules>
+ </profile>
- <profile>
- <id>ws</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../ws</module>
- </modules>
- </profile>
+ <profile>
+ <id>tptp-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../tptp</module>
+ </modules>
+ </profile>
- <profile>
- <id>ws-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../ws</module>
- </modules>
- </profile>
+ <profile>
+ <id>ws</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../ws</module>
+ </modules>
+ </profile>
- <profile>
- <id>modeshape</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../modeshape</module>
- </modules>
- </profile>
+ <profile>
+ <id>ws-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../ws</module>
+ </modules>
+ </profile>
- <profile>
- <id>modeshape-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../modeshape</module>
- </modules>
- </profile>
+ <profile>
+ <id>modeshape</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../modeshape</module>
+ </modules>
+ </profile>
- <profile>
- <id>flow</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../flow</module>
- </modules>
- </profile>
+ <profile>
+ <id>modeshape-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../modeshape</module>
+ </modules>
+ </profile>
- <profile>
- <id>flow-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../flow</module>
- </modules>
- </profile>
+ <profile>
+ <id>flow</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../flow</module>
+ </modules>
+ </profile>
- <profile>
- <id>jbpm</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../jbpm</module>
- </modules>
- </profile>
+ <profile>
+ <id>flow-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../flow</module>
+ </modules>
+ </profile>
- <profile>
- <id>jbpm-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../jbpm</module>
- </modules>
- </profile>
+ <profile>
+ <id>jbpm</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../jbpm</module>
+ </modules>
+ </profile>
- <profile>
- <id>emma-coverage</id>
- <activation>
- <property>
- <name>coverage</name>
- </property>
- </activation>
- <modules>
- <module>reports/emma-coverage</module>
- </modules>
- </profile>
+ <profile>
+ <id>jbpm-bootstrap</id>
+ <modules>
+ <module>../tests</module>
+ <module>../jbpm</module>
+ </modules>
+ </profile>
- <profile>
- <id>gwt</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../gwt</module>
- </modules>
- </profile>
+ <profile>
+ <id>emma-coverage</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <modules>
+ <module>reports/emma-coverage</module>
+ </modules>
+ </profile>
- <profile>
- <id>deltacloud</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../deltacloud</module>
- </modules>
- </profile>
+ <profile>
+ <id>gwt</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../gwt</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>deltacloud</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../deltacloud</module>
+ </modules>
+ </profile>
- <profile>
- <id>drools</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>../drools</module>
- </modules>
- </profile>
+ <profile>
+ <id>drools</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>../drools</module>
+ </modules>
+ </profile>
- <profile>
- <id>runtime</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../runtime</module>
- </modules>
- </profile>
- <profile>
- <id>usage</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../usage</module>
- </modules>
- </profile>
- <profile>
- <id>site</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../site</module>
- </modules>
- </profile>
+ <profile>
+ <id>runtime</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../runtime</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>usage</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../usage</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>site</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>../site</module>
+ </modules>
+ </profile>
-</profiles>
+ </profiles>
-<modules>
+ <modules>
- <!-- this order is important! make sure you've run genpom.xml first! -->
- <!-- dgolovin's order -->
- <!--module>../tests</module>
- <module>../freemarker</module>
- <module>../jmx</module>
- <module>../archives</module>
- <module>../as</module>
- <module>../common</module>
- <module>../jst</module>
- <module>../xulrunner</module>
- <module>../vpe</module>
- <module>../jsf</module>
+ <!-- this order is important! make sure you've run genpom.xml first! -->
+ <!-- dgolovin's order -->
+ <!--module>../tests</module> <module>../freemarker</module> <module>../jmx</module>
+ <module>../archives</module> <module>../as</module> <module>../common</module>
+ <module>../jst</module> <module>../xulrunner</module> <module>../vpe</module>
+ <module>../jsf</module> <module>../hibernatetools</module> <module>../portlet</module>
+ <module>../workingset</module> <module>../struts</module> <module>../profiler</module>
+ <module>../smooks</module> <module>../cdi</module> <module>../birt</module>
+ <module>../bpel</module> <module>../esb</module> <module>../seam</module>
+ <module>../examples</module> <module>../maven</module> <module>../tptp</module>
+ <module>../ws</module> <module>../modeshape</module> <module>../flow</module>
+ <module>../jbpm</module -->
+ <!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
+ ant -q -->
+ <!-- IF YOU REMOVE A MODULE, be sure to also remove it from site/site.xml
+ and build/aggregate/site/site.xml or the build will break! -->
+ <!--module>../drools</module -->
- <module>../hibernatetools</module>
- <module>../portlet</module>
- <module>../workingset</module>
+ <!--module>../site</module -->
- <module>../struts</module>
-
- <module>../profiler</module>
- <module>../smooks</module>
- <module>../cdi</module>
- <module>../birt</module>
- <module>../bpel</module>
- <module>../esb</module>
- <module>../seam</module>
- <module>../examples</module>
- <module>../maven</module>
- <module>../tptp</module>
- <module>../ws</module>
- <module>../modeshape</module>
- <module>../flow</module>
- <module>../jbpm</module-->
- <!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
- ant -q -->
- <!-- IF YOU REMOVE A MODULE, be sure to also remove it from site/site.xml and build/aggregate/site/site.xml
- or the build will break! -->
- <!--module>../drools</module-->
-
- <!--module>../site</module-->
-
-</modules>
+ </modules>
</project>
Modified: branches/jbosstools-3.2.0.M2/build/product/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/build/product/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/build/product/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -16,7 +16,7 @@
-->
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/cdi/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/cdi/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/cdi/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -3,7 +3,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,6 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/common/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/common/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/common/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/deltacloud/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/deltacloud/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/deltacloud/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/features/org.drools.eclipse.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/features/org.drools.eclipse.feature/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/features/org.drools.eclipse.feature/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/features/org.drools.eclipse.task.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/features/org.drools.eclipse.task.feature/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/features/org.drools.eclipse.task.feature/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/features/org.guvnor.tools.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/features/org.guvnor.tools.feature/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/features/org.guvnor.tools.feature/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/plugins/org.drools.eclipse/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/plugins/org.drools.eclipse/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/plugins/org.drools.eclipse/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/plugins/org.drools.eclipse.task/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/plugins/org.drools.eclipse.task/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/plugins/org.drools.eclipse.task/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/plugins/org.eclipse.webdav/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/plugins/org.eclipse.webdav/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/plugins/org.eclipse.webdav/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/plugins/org.guvnor.tools/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/plugins/org.guvnor.tools/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/plugins/org.guvnor.tools/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -3,7 +3,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/drools/tests/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/drools/tests/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/drools/tests/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/esb/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/esb/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/esb/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/examples/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/examples/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/examples/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/flow/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/flow/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/flow/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/freemarker/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/freemarker/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/freemarker/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/gwt/features/org.jboss.tools.gwt.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/gwt/features/org.jboss.tools.gwt.feature/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/gwt/features/org.jboss.tools.gwt.feature/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.core/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/hibernatetools/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/hibernatetools/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/hibernatetools/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/jbpm/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jbpm/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jbpm/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/jmx/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jmx/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jmx/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/jsf/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,6 +1,7 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<relativePath>../test-pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
@@ -8,12 +9,12 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jsf.tests</groupId>
- <artifactId>org.jboss.tools.jsf.text.ext.test</artifactId>
+ <artifactId>org.jboss.tools.jsf.text.ext.test</artifactId>
<version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
+
<properties>
<emma.filter>org.jboss.tools.jsf.text.ext*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.text.ext,org.jboss.tools.jsf.text.ext.facelets,org.jboss.tools.jsf.text.ext.richfaces</emma.instrument.bundles>
- </properties>
+ </properties>
</project>
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../test-pom.xml</relativePath>
+ <relativePath>../../../build/parent/pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
<artifactId>jsf.generic.test</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,6 +1,7 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<relativePath>../test-pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
@@ -8,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jsf.tests</groupId>
- <artifactId>org.jboss.tools.jsf.vpe.facelets.test</artifactId>
+ <artifactId>org.jboss.tools.jsf.vpe.facelets.test</artifactId>
<version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,6 +1,7 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<relativePath>../test-pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
@@ -8,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jsf.tests</groupId>
- <artifactId>org.jboss.tools.jsf.vpe.jbpm.test</artifactId>
+ <artifactId>org.jboss.tools.jsf.vpe.jbpm.test</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,6 +1,7 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<relativePath>../test-pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
@@ -8,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jsf.tests</groupId>
- <artifactId>org.jboss.tools.jsf.vpe.jsf.test</artifactId>
+ <artifactId>org.jboss.tools.jsf.vpe.jsf.test</artifactId>
<version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -16,7 +17,7 @@
<emma.filter>org.jboss.tools.jsf.vpe.jsf*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.jsf</emma.instrument.bundles>
</properties>
-
+
<build>
<plugins>
<plugin>
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,6 +1,7 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<relativePath>../test-pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
@@ -8,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jsf.tests</groupId>
- <artifactId>org.jboss.tools.jsf.vpe.jstl.test</artifactId>
+ <artifactId>org.jboss.tools.jsf.vpe.jstl.test</artifactId>
<version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -16,5 +17,5 @@
<emma.filter>org.jboss.tools.jsf.vpe.jstl*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.jstl</emma.instrument.bundles>
</properties>
-
+
</project>
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,6 +1,7 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<relativePath>../test-pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
@@ -8,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jsf.tests</groupId>
- <artifactId>org.jboss.tools.jsf.vpe.myfaces.test</artifactId>
+ <artifactId>org.jboss.tools.jsf.vpe.myfaces.test</artifactId>
<version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,6 +1,7 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<relativePath>../test-pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
@@ -8,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jsf.tests</groupId>
- <artifactId>org.jboss.tools.jsf.vpe.richfaces.test</artifactId>
+ <artifactId>org.jboss.tools.jsf.vpe.richfaces.test</artifactId>
<version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
Modified: branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,6 +1,7 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<relativePath>../test-pom.xml</relativePath>
<groupId>org.jboss.tools.jsf.tests</groupId>
@@ -8,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jsf.tests</groupId>
- <artifactId>org.jboss.tools.jsf.vpe.seam.test</artifactId>
+ <artifactId>org.jboss.tools.jsf.vpe.seam.test</artifactId>
<version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
@@ -36,5 +37,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: branches/jbosstools-3.2.0.M2/jst/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/jst/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/jst/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/labs/features/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/labs/features/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/labs/features/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/labs/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/labs/plugins/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/labs/plugins/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/labs/tests/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/labs/tests/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/labs/tests/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/maven/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/maven/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/maven/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/modeshape/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/modeshape/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/modeshape/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -44,10 +44,6 @@
<module>modeshape</module>
<module>flow</module>
<module>jbpm</module>
- <!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
- ant -q -->
- <!-- IF YOU REMOVE A MODULE, be sure to also remove it from site/site.xml
- and build/aggregate/site/site.xml or the build will break! -->
<module>gwt</module>
<module>deltacloud</module>
<!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
Modified: branches/jbosstools-3.2.0.M2/portlet/features/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/portlet/features/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/portlet/features/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/portlet/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/portlet/plugins/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/portlet/plugins/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/portlet/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/portlet/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/portlet/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/portlet/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/portlet/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/portlet/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/portlet/tests/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/portlet/tests/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/portlet/tests/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/profiler/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/profiler/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/profiler/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/runtime/features/org.jboss.tools.runtime.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/runtime/features/org.jboss.tools.runtime.feature/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/runtime/features/org.jboss.tools.runtime.feature/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/runtime/features/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/runtime/features/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/runtime/features/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/runtime/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/runtime/plugins/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/runtime/plugins/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/runtime/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/runtime/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/runtime/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/smooks/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/smooks/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/smooks/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/struts/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/struts/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/struts/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/tests/plugins/org.jboss.tools.tests/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/tests/plugins/org.jboss.tools.tests/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/tests/plugins/org.jboss.tools.tests/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>${basedir}/../../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/tests/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/tests/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/tests/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/thirdparty/features/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/thirdparty/features/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/thirdparty/features/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -8,6 +8,7 @@
<packaging>pom</packaging>
<modules>
<module>org.apache.oro.feature</module>
+ <module>org.jdom.feature</module>
<module>javax.wsdl.feature</module>
</modules>
</project>
Modified: branches/jbosstools-3.2.0.M2/thirdparty/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/thirdparty/plugins/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/thirdparty/plugins/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -8,6 +8,7 @@
<packaging>pom</packaging>
<modules>
<module>org.apache.oro</module>
+ <module>org.jdom</module>
<module>javax.wsdl</module>
</modules>
</project>
Modified: branches/jbosstools-3.2.0.M2/tptp/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/tptp/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/tptp/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/vpe/features/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/vpe/features/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/vpe/features/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/vpe/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/vpe/plugins/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/vpe/plugins/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/vpe/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/vpe/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/vpe/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/vpe/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/vpe/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/vpe/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/vpe/tests/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/vpe/tests/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/vpe/tests/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
Modified: branches/jbosstools-3.2.0.M2/ws/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/ws/site/pom.xml 2010-08-28 08:34:57 UTC (rev 24538)
+++ branches/jbosstools-3.2.0.M2/ws/site/pom.xml 2010-08-28 14:32:23 UTC (rev 24539)
@@ -1,7 +1,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../build/parent-pom.xml</relativePath>
+
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r24538 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-08-28 04:34:57 -0400 (Sat, 28 Aug 2010)
New Revision: 24538
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/AlternativeStereotype.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/DuplicatedAlternativeStereotype.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6523 beans.xml validation
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-08-28 05:57:56 UTC (rev 24537)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-08-28 08:34:57 UTC (rev 24538)
@@ -2208,6 +2208,7 @@
}
continue;
} else {
+ // TODO we should check Decorators/Interceptors as well as Alternatives (classes/stereotypes)!
IClassBean classBean = getClassBean(type);
if(classBean==null || !classBean.isAlternative()) {
addError(illegalTypeErrorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml 2010-08-28 08:34:57 UTC (rev 24538)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans>
+ <alternatives>
+ <class>org.jboss.jsr299.tck.tests.policy.broken.not.policy.Cat</class>
+
+ <class>
+ org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.NonExistingClass
+ </class>
+
+ <stereotype>
+ <!-- Some comment -->
+ org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype.NotExistingStereotype
+ </stereotype>
+
+ <stereotype>org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype.Mock</stereotype>
+
+ <stereotype>org.jboss.jsr299.tck.tests.jbt.validation.beansxml.AlternativeStereotype</stereotype>
+
+ <class>org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.Dog</class>
+ <class>org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.Cat</class>
+ <class>
+ org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.Cat
+ <!-- Some comment -->
+ </class>
+
+ <stereotype>org.jboss.jsr299.tck.tests.jbt.validation.beansxml.DuplicatedAlternativeStereotype</stereotype>
+ <stereotype>org.jboss.jsr299.tck.tests.jbt.validation.beansxml.DuplicatedAlternativeStereotype</stereotype>
+
+ </alternatives>
+
+ <decorators>
+ <class>com.acme.NonExistantDecoratorClass</class>
+ <class>org.jboss.jsr299.tck.tests.decorators.resolution.BarDecorator</class>
+
+ <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator.TimestampLogger</class>
+
+ <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator>
+ <class>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator>
+ </decorators>
+
+ <interceptors>
+ <class>com.acme.Foo</class>
+ <class>org.jboss.jsr299.tck.tests.jbt.validation.interceptors.CatInterceptor</class>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml.Foo</class>
+
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml.FordInterceptor</class>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml.FordInterceptor</class>
+ </interceptors>
+
+</beans>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/AlternativeStereotype.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/AlternativeStereotype.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/AlternativeStereotype.java 2010-08-28 08:34:57 UTC (rev 24538)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.beansxml;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Stereotype;
+
+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;
+
+@Stereotype
+@Alternative
+@Target({ TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface AlternativeStereotype {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/AlternativeStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/DuplicatedAlternativeStereotype.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/DuplicatedAlternativeStereotype.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/DuplicatedAlternativeStereotype.java 2010-08-28 08:34:57 UTC (rev 24538)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.beansxml;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Stereotype;
+
+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;
+
+@Stereotype
+@Alternative
+@Target({ TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface DuplicatedAlternativeStereotype {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/DuplicatedAlternativeStereotype.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/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-08-28 05:57:56 UTC (rev 24537)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-08-28 08:34:57 UTC (rev 24538)
@@ -1471,7 +1471,9 @@
* and treats it as a deployment problem.
*/
public void testNoAlternativeClassWithSpecifiedName() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, 4);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, 19);
}
/**
@@ -1480,7 +1482,9 @@
* the container automatically detects the problem and treats it as a deployment problem.
*/
public void testIllegalAlternativeClassWithSpecifiedName() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, 7);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, 19);
}
/**
@@ -1490,7 +1494,9 @@
* problem and treats it as a deployment problem.
*/
public void testNoAlternativeAnnotationWithSpecifiedName() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME, 12);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME, 17);
}
/**
@@ -1499,7 +1505,9 @@
* the container automatically detects the problem and treats it as a deployment problem.
*/
public void testIllegalAlternativeAnnotationWithSpecifiedName() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION, 15);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION, 17);
}
/**
@@ -1508,7 +1516,9 @@
* treats it as a deployment problem.
*/
public void testSameAlternativeClassListedTwice() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 20, 22);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 19);
}
/**
@@ -1517,7 +1527,9 @@
* treats it as a deployment problem.
*/
public void testSameAlternativeAnnotationListedTwice() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 26, 27);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, 17);
}
/**
@@ -1526,7 +1538,9 @@
* the container automatically detects the problem and treats it as a deployment problem.
*/
public void testNonExistantDecoratorClassInBeansXmlNotOK() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, 32);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, 33);
}
/**
@@ -1535,7 +1549,9 @@
* the container automatically detects the problem and treats it as a deployment problem.
*/
public void testEnabledDecoratorNotADecorator() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, 35);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, 33);
}
/**
@@ -1544,7 +1560,9 @@
* treats it as a deployment problem.
*/
public void testDecoratorListedTwiceInBeansXmlNotOK() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_DECORATOR_CLASS, 37, 38);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_DECORATOR_CLASS, 33);
}
/**
@@ -1553,7 +1571,9 @@
* the container automatically detects the problem and treats it as a deployment problem.
*/
public void testNonExistantClassInBeansXmlNotOk() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, 42);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, 43);
}
/**
@@ -1562,7 +1582,9 @@
* the container automatically detects the problem and treats it as a deployment problem.
*/
public void testNonInterceptorClassInBeansXmlNotOk() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, 44);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, 43);
}
/**
@@ -1571,7 +1593,9 @@
* a deployment problem.
*/
public void testSameInterceptorClassListedTwiceInBeansXmlNotOk() throws Exception {
- //TODO
+ IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
+ assertMarkerIsCreated(file, CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS, 46, 47);
+ assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS, 43);
}
/**
13 years, 8 months
- 1
- 0