JBoss Tools SVN: r43139 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-08-21 19:07:21 -0400 (Tue, 21 Aug 2012)
New Revision: 43139
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/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
Log:
JBIDE-12417
https://issues.jboss.org/browse/JBIDE-12417
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 2012-08-21 23:02:53 UTC (rev 43138)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2012-08-21 23:07:21 UTC (rev 43139)
@@ -287,69 +287,43 @@
}
public Collection<ITypeDeclaration> getRestrictedTypeDeclarations(Collection<IParametedType> alltypes) {
+ AnnotationDeclaration typed = getDefinition().getTypedAnnotation();
+ if(typed == null) {
+ return new ArrayList<ITypeDeclaration>(0);
+ }
Map<String, IParametedType> map = new HashMap<String, IParametedType>();
for (IParametedType t: alltypes) {
map.put(t.getType().getFullyQualifiedName(), t);
}
Collection<ITypeDeclaration> result = new ArrayList<ITypeDeclaration>();
- AnnotationDeclaration typed = getDefinition().getTypedAnnotation();
- if(typed != null) {
- int s = typed.getStartPosition();
- int l = typed.getLength();
- try {
- String txt = null;
- if(s >= 0 && typed.getResource() instanceof IFile) {
- AbstractTypeDefinition td = getDefinition().getTypeDefinition();
- if(getDefinition().getOriginalDefinition() != null) {
- ITextSourceReference r = getDefinition().getOriginalDefinition();
- String content = FileUtil.readStream((IFile)r.getResource());
- if(content != null && content.length() > s + l) {
- txt = content.substring(s);
- }
- } else if(td != null) {
- String content = td.getContent();
- if(content != null && content.length() > s + l) {
- txt = content.substring(s, s + l);
- }
- }
+ int s = typed.getStartPosition();
+ int l = typed.getLength();
+ try {
+ String txt = null;
+ if(s >= 0 && typed.getResource() instanceof IFile) {
+ AbstractTypeDefinition td = getDefinition().getTypeDefinition();
+ if(getDefinition().getOriginalDefinition() != null) {
+ ITextSourceReference r = getDefinition().getOriginalDefinition();
+ String content = FileUtil.readStream((IFile)r.getResource());
+ if(content != null && content.length() > s + l) {
+ txt = content.substring(s);
+ }
+ } else if(td != null) {
+ String content = td.getContent();
+ if(content != null && content.length() > s + l) {
+ txt = content.substring(s, s + l);
+ }
}
-
- Object value = typed.getMemberValue(null);
- if(value == null) return result;
- IMember member = (IMember)definition.getMember();
- IType declaringType = member instanceof IType ? (IType)member : member.getDeclaringType();
- if(value instanceof Object[]) {
- Object[] os = (Object[])value;
- for (int i = 0; i < os.length; i++) {
- String rawTypeName = os[i].toString();
- String typeName = rawTypeName;
- if(!typeName.endsWith(";")) typeName = "Q" + typeName + ";";
- ParametedType p = getCDIProject().getNature().getTypeFactory().getParametedType(declaringType, typeName);
- if(p != null) {
- int offset = 0;
- int length = 0;
- if(txt != null) {
- int q = txt.indexOf(rawTypeName);
- if(q >= 0) {
- offset = s + q;
- length = rawTypeName.length();
- }
- }
- IParametedType other = p.getType() == null ? null : map.get(p.getType().getFullyQualifiedName());
- if(other != null) {
- String s1 = p.getSignature();
- String s2 = other.getSignature();
- if(!s1.equals(s2) && Signature.getArrayCount(s1) == Signature.getArrayCount(s2)) {
- p.setSignature(s2);
- }
- result.add(new TypeDeclaration((ParametedType)other, typed.getResource(), offset, length));
- } else {
- result.add(new TypeDeclaration(p, typed.getResource(), offset, length));
- }
- }
- }
- } else if(value != null) {
- String rawTypeName = value.toString();
+ }
+
+ Object value = typed.getMemberValue(null);
+ if(value == null) return result;
+ IMember member = (IMember)definition.getMember();
+ IType declaringType = member instanceof IType ? (IType)member : member.getDeclaringType();
+ if(value instanceof Object[]) {
+ Object[] os = (Object[])value;
+ for (int i = 0; i < os.length; i++) {
+ String rawTypeName = os[i].toString();
String typeName = rawTypeName;
if(!typeName.endsWith(";")) typeName = "Q" + typeName + ";";
ParametedType p = getCDIProject().getNature().getTypeFactory().getParametedType(declaringType, typeName);
@@ -376,9 +350,36 @@
}
}
}
- } catch (CoreException e) {
- CDICorePlugin.getDefault().logError(e);
+ } else if(value != null) {
+ String rawTypeName = value.toString();
+ String typeName = rawTypeName;
+ if(!typeName.endsWith(";")) typeName = "Q" + typeName + ";";
+ ParametedType p = getCDIProject().getNature().getTypeFactory().getParametedType(declaringType, typeName);
+ if(p != null) {
+ int offset = 0;
+ int length = 0;
+ if(txt != null) {
+ int q = txt.indexOf(rawTypeName);
+ if(q >= 0) {
+ offset = s + q;
+ length = rawTypeName.length();
+ }
+ }
+ IParametedType other = p.getType() == null ? null : map.get(p.getType().getFullyQualifiedName());
+ if(other != null) {
+ String s1 = p.getSignature();
+ String s2 = other.getSignature();
+ if(!s1.equals(s2) && Signature.getArrayCount(s1) == Signature.getArrayCount(s2)) {
+ p.setSignature(s2);
+ }
+ result.add(new TypeDeclaration((ParametedType)other, typed.getResource(), offset, length));
+ } else {
+ result.add(new TypeDeclaration(p, typed.getResource(), offset, length));
+ }
+ }
}
+ } catch (CoreException e) {
+ CDICorePlugin.getDefault().logError(e);
}
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 2012-08-21 23:02:53 UTC (rev 43138)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2012-08-21 23:07:21 UTC (rev 43139)
@@ -99,6 +99,7 @@
private Set<IBean> declaredBeans = new HashSet<IBean>();
private Map<IPath, Set<IBean>> beansByPath = new HashMap<IPath, Set<IBean>>();
private Map<String, Set<IBean>> beansByName = new HashMap<String, Set<IBean>>();
+ private List<Set<IBean>> beansByTypes = new ArrayList<Set<IBean>>();
private Set<IBean> namedBeans = new HashSet<IBean>();
private Map<IType, IClassBean> classBeans = new HashMap<IType, IClassBean>();
private Set<IBean> alternatives = new HashSet<IBean>();
@@ -113,7 +114,9 @@
BeansXMLData allBeansXMLData = new BeansXMLData();
BeansXMLData projectBeansXMLData = new BeansXMLData();
- public CDIProject() {}
+ public CDIProject() {
+ for (int i = 0; i < BEANS_BY_TYPE_SIZE; i++) beansByTypes.add(new HashSet<IBean>());
+ }
public CDIProject getModifiedCopy(IFile file, Collection<IBean> beans) {
CDIProject p = null;
@@ -291,7 +294,7 @@
}
}
}
- if(result.size() < 1 || !attemptToResolveAmbiguousness) {
+ if(result.isEmpty() || !attemptToResolveAmbiguousness) {
return result;
}
@@ -369,11 +372,7 @@
Set<IQualifierDeclaration> qs = new HashSet<IQualifierDeclaration>();
if(qualifiers != null) for (IQualifierDeclaration d: qualifiers) qs.add(d);
- Set<IBean> beans = new HashSet<IBean>();
- synchronized(this) {
- beans.addAll(allBeans);
- }
- for (IBean b: beans) {
+ for (IBean b: getBeansByLegalType(type)) {
if(containsType(b.getLegalTypes(), type)) {
try {
Collection<IQualifierDeclaration> qsb = b.getQualifierDeclarations(true);
@@ -389,6 +388,22 @@
return getResolvedBeans(result, attemptToResolveAmbiguousDependency);
}
+ static int BEANS_BY_TYPE_SIZE = 167;
+ static int OBJECT_INDEX = Math.abs("java.lang.Object".hashCode()) % BEANS_BY_TYPE_SIZE;
+
+ static int toTypeIndex(IType type) {
+ return Math.abs(type.getFullyQualifiedName().hashCode()) % BEANS_BY_TYPE_SIZE;
+ }
+
+ private IBean[] getBeansByLegalType(IParametedType type) {
+ if(type.getType() == null) return new IBean[0];
+ int index = toTypeIndex(type.getType());
+ Collection<IBean> bs = index == OBJECT_INDEX ? allBeans : beansByTypes.get(index);
+ synchronized (this) {
+ return bs.toArray(new IBean[bs.size()]);
+ }
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IBeanManager#getBeans(boolean, org.jboss.tools.cdi.core.IInjectionPoint)
@@ -404,6 +419,14 @@
}
IType jType = type.getType();
+ boolean isObjectType = jType != null && "java.lang.Object".equals(jType.getFullyQualifiedName());
+
+ if(isObjectType && injectionPoint.getAnnotation(CDIConstants.ANY_QUALIFIER_TYPE_NAME) != null) {
+ synchronized(this) {
+ result.addAll(allBeans);
+ }
+ return getResolvedBeans(result, attemptToResolveAmbiguousDependency);
+ }
if(jType != null && CDIConstants.EVENT_TYPE_NAME.equals(jType.getFullyQualifiedName())) {
List<? extends IParametedType> ps = type.getParameters();
@@ -437,16 +460,12 @@
}
}
- Set<IBean> beans = new HashSet<IBean>();
- synchronized(this) {
- beans.addAll(allBeans);
- }
boolean delegateInjectionPoint = injectionPoint.isDelegate();
String injectionPointName = injectionPoint.getBeanName();
-
- for (IBean b: beans) {
- if(containsType(b.getLegalTypes(), type)) {
+
+ for (IBean b: getBeansByLegalType(type)) {
+ if(isObjectType || containsType(b.getLegalTypes(), type)) {
try {
if(delegateInjectionPoint && b == injectionPoint.getClassBean()) {
continue;
@@ -559,7 +578,7 @@
for (IParametedType t: types) {
IType jType1 = t.getType();
if(jType1 == null || !jType.getFullyQualifiedName().equals(jType1.getFullyQualifiedName())) continue;
- if(!((ParametedType)t).getArrayPrefix().equals(((ParametedType)type).getArrayPrefix())) continue;
+ if(((ParametedType)t).getArrayIndex() != ((ParametedType)type).getArrayIndex()) continue;
if(((ParametedType)t).isAssignableTo((ParametedType)type, false)) {
return true;
}
@@ -574,7 +593,7 @@
}
}
- TreeSet<String> injectionKeys = new TreeSet<String>();
+ Set<String> injectionKeys = new HashSet<String>();
for (IQualifierDeclaration d: injectionQualifiers) {
injectionKeys.add(getAnnotationDeclarationKey(d));
}
@@ -586,7 +605,7 @@
injectionKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
}
- TreeSet<String> beanKeys = new TreeSet<String>();
+ Set<String> beanKeys = new HashSet<String>();
if(beanQualifiers.isEmpty()) {
beanKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
} else for (IQualifierDeclaration d: beanQualifiers) {
@@ -612,7 +631,7 @@
public static boolean areMatchingQualifiers(Collection<IQualifierDeclaration> beanQualifiers, IType... injectionQualifiers) throws CoreException {
if(!beanQualifiers.isEmpty() || injectionQualifiers.length != 0) {
- TreeSet<String> injectionKeys = new TreeSet<String>();
+ Set<String> injectionKeys = new HashSet<String>();
for (IType d: injectionQualifiers) {
injectionKeys.add(d.getFullyQualifiedName().replace('$', '.'));
}
@@ -622,7 +641,7 @@
injectionKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
}
- TreeSet<String> beanKeys = new TreeSet<String>();
+ Set<String> beanKeys = new HashSet<String>();
if(beanQualifiers.isEmpty()) {
beanKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
} else {
@@ -1357,6 +1376,8 @@
allBeans.clear();
declaredBeans.clear();
injectionPointsByType.clear();
+
+ for (int i = 0; i < BEANS_BY_TYPE_SIZE; i++) beansByTypes.get(i).clear();
}
classBeans = newClassBeans;
@@ -1452,6 +1473,14 @@
if(bean.getDeclaringProject() == this) {
declaredBeans.add(bean);
}
+ for (IParametedType t: bean.getLegalTypes()) {
+ if(t.getType() != null && t.getType().exists()) {
+ int index = toTypeIndex(t.getType());
+ if(index != OBJECT_INDEX) {
+ beansByTypes.get(index).add(bean);
+ }
+ }
+ }
}
}
@@ -1534,11 +1563,8 @@
IParametedType beanType, IType... qualifiers) {
Collection<IBean> result = new HashSet<IBean>();
IParametedType type = beanType;
- Collection<IBean> beans = new ArrayList<IBean>();
- synchronized(this) {
- beans.addAll(allBeans);
- }
- for (IBean b: beans) {
+
+ for (IBean b: getBeansByLegalType(type)) {
if(containsType(b.getLegalTypes(), type)) {
try {
Collection<IQualifierDeclaration> qsb = b.getQualifierDeclarations(true);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2012-08-21 23:02:53 UTC (rev 43138)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2012-08-21 23:07:21 UTC (rev 43139)
@@ -583,10 +583,8 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IClassBean#getAllMethods()
*/
- public Set<IBeanMethod> getAllMethods() {
- Set<IBeanMethod> result = new HashSet<IBeanMethod>();
- result.addAll(methods);
- return result;
+ public Collection<IBeanMethod> getAllMethods() {
+ return new ArrayList<IBeanMethod>(methods);
}
/*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2012-08-21 23:02:53 UTC (rev 43138)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2012-08-21 23:07:21 UTC (rev 43139)
@@ -144,20 +144,19 @@
if(!ds.isEmpty()) {
return ds.iterator().next().getScope();
}
- Collection<IScope> defaults = new HashSet<IScope>();
+ IScope defaultScope = null;
for (IStereotypeDeclaration d: getStereotypeDeclarations()) {
IStereotype s = d.getStereotype();
IScope sc = s.getScope();
if(sc != null) {
- defaults.add(sc);
+ if(defaultScope == null) {
+ defaultScope = sc;
+ } else if(defaultScope != sc) {
+ return null;
+ }
}
}
- if(defaults.size() == 1) {
- return defaults.iterator().next();
- } else if(defaults.size() > 1) {
- return null;
- }
- return getCDIProject().getScope(CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME);
+ return defaultScope != null ? defaultScope : getCDIProject().getScope(CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME);
}
public IAnnotationDeclaration getProducesAnnotation() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2012-08-21 23:02:53 UTC (rev 43138)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2012-08-21 23:07:21 UTC (rev 43139)
@@ -15,7 +15,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
@@ -61,7 +60,7 @@
}
public Collection<ITypeDeclaration> getAllTypeDeclarations() {
- Collection<ITypeDeclaration> result = new HashSet<ITypeDeclaration>();
+ Collection<ITypeDeclaration> result = new ArrayList<ITypeDeclaration>(1);
if(typeDeclaration != null && typeDeclaration.getStartPosition() > 0) {
result.add(typeDeclaration);
}
@@ -212,20 +211,19 @@
if(!ds.isEmpty()) {
return ds.iterator().next().getScope();
}
- Set<IScope> defaults = new HashSet<IScope>();
+ IScope defaultScope = null;
for (IStereotypeDeclaration d: getStereotypeDeclarations()) {
IStereotype s = d.getStereotype();
IScope sc = s.getScope();
if(sc != null) {
- defaults.add(sc);
+ if(defaultScope == null) {
+ defaultScope = sc;
+ } else if(defaultScope != sc) {
+ return null;
+ }
}
}
- if(defaults.size() == 1) {
- return defaults.iterator().next();
- } else if(defaults.size() > 1) {
- return null;
- }
- return getCDIProject().getScope(CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME);
+ return defaultScope != null ? defaultScope : getCDIProject().getScope(CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME);
}
public IAnnotationDeclaration getProducesAnnotation() {
12 years, 4 months
JBoss Tools SVN: r43138 - in trunk/common/tests: org.jboss.tools.common.model.test and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-08-21 19:02:53 -0400 (Tue, 21 Aug 2012)
New Revision: 43138
Modified:
trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml
trunk/common/tests/org.jboss.tools.common.model.test/pom.xml
trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml
trunk/common/tests/org.jboss.tools.common.mylyn.test/pom.xml
trunk/common/tests/org.jboss.tools.common.test/pom.xml
trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml
trunk/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF
trunk/common/tests/org.jboss.tools.common.validation.test/pom.xml
trunk/common/tests/org.jboss.tools.common.verification.test/pom.xml
trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml
Log:
some tests are marked as core tests, it should save some time
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml 2012-08-21 23:02:53 UTC (rev 43138)
@@ -1,16 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>tests</artifactId>
<version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.common.tests</groupId>
- <artifactId>org.jboss.tools.common.el.core.test</artifactId>
-
+ <artifactId>org.jboss.tools.common.el.core.test</artifactId>
+
<packaging>eclipse-test-plugin</packaging>
<properties>
<emma.instrument.bundles>org.jboss.tools.common.resref.core,org.jboss.tools.common.el.core</emma.instrument.bundles>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/common/tests/org.jboss.tools.common.model.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.test/pom.xml 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.model.test/pom.xml 2012-08-21 23:02:53 UTC (rev 43138)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.common</groupId>
@@ -8,9 +9,7 @@
</parent>
<groupId>org.jboss.tools.common.tests</groupId>
<artifactId>org.jboss.tools.common.model.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
-
<properties>
<emma.instrument.bundles>org.jboss.tools.common,org.jboss.tools.common.model</emma.instrument.bundles>
</properties>
Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml 2012-08-21 23:02:53 UTC (rev 43138)
@@ -8,9 +8,7 @@
</parent>
<groupId>org.jboss.tools.common.tests</groupId>
<artifactId>org.jboss.tools.common.model.ui.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
-
<properties>
<emma.instrument.bundles>org.jboss.tools.common.model,org.jboss.tools.common.model.ui,org.jboss.tools.common.text.ext,org.jboss.tools.common.text.xml</emma.instrument.bundles>
</properties>
Modified: trunk/common/tests/org.jboss.tools.common.mylyn.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.mylyn.test/pom.xml 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.mylyn.test/pom.xml 2012-08-21 23:02:53 UTC (rev 43138)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.common</groupId>
@@ -9,11 +10,9 @@
<groupId>org.jboss.tools.common.tests</groupId>
<artifactId>org.jboss.tools.common.mylyn.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
-
<properties>
<emma.instrument.bundles>org.jboss.tools.common.mylyn</emma.instrument.bundles>
</properties>
-
<build>
<plugins>
<plugin>
Modified: trunk/common/tests/org.jboss.tools.common.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.test/pom.xml 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.test/pom.xml 2012-08-21 23:02:53 UTC (rev 43138)
@@ -1,16 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>tests</artifactId>
<version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.common.tests</groupId>
- <artifactId>org.jboss.tools.common.test</artifactId>
-
+ <artifactId>org.jboss.tools.common.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<properties>
<emma.instrument.bundles>org.jboss.tools.common</emma.instrument.bundles>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml 2012-08-21 23:02:53 UTC (rev 43138)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.common</groupId>
@@ -9,7 +10,6 @@
<groupId>org.jboss.tools.common.tests</groupId>
<artifactId>org.jboss.tools.common.ui.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
-
<properties>
<emma.instrument.bundles>org.jboss.tools.common.ui,org.jboss.tools.common,org.jboss.tools.common.validation,org.jboss.tools.common.el.core,org.jboss.tools.common.resref.core</emma.instrument.bundles>
</properties>
Modified: trunk/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF 2012-08-21 23:02:53 UTC (rev 43138)
@@ -16,3 +16,4 @@
org.jboss.tools.common.base.test,
org.eclipse.ui
Export-Package: org.jboss.tools.common.validation.test
+Eclipse-BundleShape: dir
Modified: trunk/common/tests/org.jboss.tools.common.validation.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/pom.xml 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/pom.xml 2012-08-21 23:02:53 UTC (rev 43138)
@@ -18,14 +18,12 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
<configuration>
- <product>org.jboss.tools.tests.product</product>
- <explodedBundles>
- <bundle>org.jboss.tools.common.validation.test</bundle>
- </explodedBundles>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
</configuration>
</plugin>
</plugins>
</build>
-
</project>
Modified: trunk/common/tests/org.jboss.tools.common.verification.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.verification.test/pom.xml 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.verification.test/pom.xml 2012-08-21 23:02:53 UTC (rev 43138)
@@ -1,16 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>tests</artifactId>
<version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.common.tests</groupId>
- <artifactId>org.jboss.tools.common.verification.test</artifactId>
-
+ <artifactId>org.jboss.tools.common.verification.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<properties>
<emma.instrument.bundles>org.jboss.tools.common,org.jboss.tools.common.model,org.jboss.tools.common.verification</emma.instrument.bundles>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml 2012-08-21 22:26:40 UTC (rev 43137)
+++ trunk/common/tests/org.jboss.tools.common.verification.ui.test/pom.xml 2012-08-21 23:02:53 UTC (rev 43138)
@@ -1,17 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>tests</artifactId>
<version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.common.tests</groupId>
- <artifactId>org.jboss.tools.common.verification.ui.test</artifactId>
-
+ <artifactId>org.jboss.tools.common.verification.ui.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<properties>
<coverage.filter>org.jboss.tools.common.verification.ui*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.common,org.jboss.tools.common.model,org.jboss.tools.common.verification,org.jboss.tools.common.verification.ui</emma.instrument.bundles>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
12 years, 4 months
JBoss Tools SVN: r43137 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-08-21 18:26:40 -0400 (Tue, 21 Aug 2012)
New Revision: 43137
Removed:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java
Log:
https://issues.jboss.org/browse/JBIDE-12437 Identical classes in Seam test module make Jacoco fail to generate a report
Deleted: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java 2012-08-21 19:52:40 UTC (rev 43136)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java 2012-08-21 22:26:40 UTC (rev 43137)
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.ui.test.wizard;
-
-
-/**
- * @author eskimo
- *
- */
-public class Seam12XOperationsTestSuite121EAP extends Seam12XOperationsTestSuite121EAPBase {
-}
Deleted: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java 2012-08-21 19:52:40 UTC (rev 43136)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java 2012-08-21 22:26:40 UTC (rev 43137)
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.ui.test.wizard;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- *
- * @author eskimo
- */
-public class Seam20XOperationsTestSuite201GA extends Seam20XOperationsTestSuite201GABase {
-}
Deleted: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.java 2012-08-21 19:52:40 UTC (rev 43136)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.java 2012-08-21 22:26:40 UTC (rev 43137)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.ui.test.wizard;
-
-/**
- * @author eskimo
- *
- */
-public class Seam20XOperationsTestSuite202SP1 extends
- Seam20XOperationsTestSuite201GA {
-
-}
Deleted: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.java 2012-08-21 19:52:40 UTC (rev 43136)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.java 2012-08-21 22:26:40 UTC (rev 43137)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.ui.test.wizard;
-
-/**
- * @author eskimo
- *
- */
-public class Seam20XOperationsTestSuite203CR1 extends
- Seam20XOperationsTestSuite201GA {
-
-}
Deleted: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.java 2012-08-21 19:52:40 UTC (rev 43136)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.java 2012-08-21 22:26:40 UTC (rev 43137)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.ui.test.wizard;
-
-/**
- * @author eskimo
- *
- */
-public class Seam20XOperationsTestSuite211GA extends
- Seam20XOperationsTestSuite201GA {
-
-}
Deleted: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java 2012-08-21 19:52:40 UTC (rev 43136)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java 2012-08-21 22:26:40 UTC (rev 43137)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.ui.test.wizard;
-
-/**
- * @author eskimo
- *
- */
-public class Seam20XOperationsTestSuiteFP extends
- Seam20XOperationsTestSuite201GA {
-
-}
12 years, 4 months
JBoss Tools SVN: r43136 - trunk/esb/tests/org.jboss.tools.esb.project.core.test.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-08-21 15:52:40 -0400 (Tue, 21 Aug 2012)
New Revision: 43136
Modified:
trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
Log:
Updated org.jboss.tools.esb.project.core.test/pom.xml to reference SOA-P 5.3, not 5.0.1
Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2012-08-21 18:29:15 UTC (rev 43135)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2012-08-21 19:52:40 UTC (rev 43136)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirementsDirectory}/jboss-soa-p.4.3.0/jboss-as -Djbosstools.test.jboss.home.5.0=${requirementsDirectory}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.1=${requirementsDirectory}/jboss-5.1.0.GA -Djbosstools.test.soap.home.4.3=${requirementsDirectory}/jboss-soa-p.4.3.0/ -Djbosstools.test.soap.home.5.0=${requirementsDirectory}/jboss-soa-p.5.0.0</systemProperties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirementsDirectory}/jboss-soa-p.4.3.0/jboss-as -Djbosstools.test.jboss.home.5.0=${requirementsDirectory}/jboss-soa-p-5/jboss-as -Djbosstools.test.jboss.home.5.1=${requirementsDirectory}/jboss-5.1.0.GA -Djbosstools.test.soap.home.4.3=${requirementsDirectory}/jboss-soa-p.4.3.0/ -Djbosstools.test.soap.home.5.0=${requirementsDirectory}/jboss-soa-p-5</systemProperties>
<coverage.filter>org.jboss.tools.esb.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.esb.project.core</emma.instrument.bundles>
</properties>
@@ -55,8 +55,8 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>http://download.devel.redhat.com/released/JBossSOAP/5.0.1/soa-5.0.1.GA-si...</url>
- <md5>b9088f7884c7464419623c596dafe25f</md5>
+ <url>http://jawa05.englab.brq.redhat.com/candidate/soa-5.3.0.ER5/soa-p-5.3.0.E...</url>
+ <md5>1c2e329498396762b8dad2c1621308bf</md5>
<unpack>true</unpack>
</configuration>
</execution>
12 years, 4 months
JBoss Tools SVN: r43135 - trunk/tests/tests/org.jboss.tools.tests.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-08-21 14:29:15 -0400 (Tue, 21 Aug 2012)
New Revision: 43135
Modified:
trunk/tests/tests/org.jboss.tools.tests.test/pom.xml
Log:
o.j.t.tests.test plugin does not require Eclipse Workbench, so it switched to core mode without UI
Modified: trunk/tests/tests/org.jboss.tools.tests.test/pom.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.test/pom.xml 2012-08-21 18:20:48 UTC (rev 43134)
+++ trunk/tests/tests/org.jboss.tools.tests.test/pom.xml 2012-08-21 18:29:15 UTC (rev 43135)
@@ -10,4 +10,17 @@
<groupId>org.jboss.tools.tests.tests</groupId>
<artifactId>org.jboss.tools.tests.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
12 years, 4 months
JBoss Tools SVN: r43134 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-08-21 14:20:48 -0400 (Tue, 21 Aug 2012)
New Revision: 43134
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
fixed error related to missing workbench window in core eclipse tests. Now it uses ImportOperation without context set to current workbench shell. Context is required to let import operation request for user assistance, which is irrelevant for tests execution. org.jboss.tools.test now can be used in ani core test to import projects into workspace.
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2012-08-21 14:27:29 UTC (rev 43133)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2012-08-21 18:20:48 UTC (rev 43134)
@@ -218,7 +218,7 @@
if (member != null) {
try {
member.getProject().delete(true, true, null);
- } catch (Exception e) {
+ } catch (CoreException e) {
// Ignore any exceptions here (mostly because ResourceException rising is possible here)
// But we cannot break tearDown() procedures in test cases which widely use this method
// So, just print an exception stacktrace to see it in console log
@@ -316,8 +316,6 @@
// import files just to project folder ( without old structure )
importOp.setCreateContainerStructure(false);
- importOp.setContext(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell());
// run import
importOp.run(null);
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
12 years, 4 months
JBoss Tools SVN: r43133 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2012-08-21 10:27:29 -0400 (Tue, 21 Aug 2012)
New Revision: 43133
Modified:
trunk/build/parent/pom.xml
Log:
* osx profile is activated by the <os><family>mac</family></os> property, not by java vendor.
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-08-21 13:52:39 UTC (rev 43132)
+++ trunk/build/parent/pom.xml 2012-08-21 14:27:29 UTC (rev 43133)
@@ -607,10 +607,9 @@
<profile>
<id>osx</id>
<activation>
- <property>
- <name>java.vendor.url</name>
- <value>http://www.apple.com/</value>
- </property>
+ <os>
+ <family>mac</family>
+ </os>
</activation>
<properties>
<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
12 years, 4 months
JBoss Tools SVN: r43132 - in trunk: runtime/tests/org.jboss.tools.runtime.test and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-08-21 09:52:39 -0400 (Tue, 21 Aug 2012)
New Revision: 43132
Modified:
trunk/build/parent/pom.xml
trunk/runtime-soa/tests/org.jboss.tools.runtime.soa.test/pom.xml
trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
Log:
JBIDE-12420: Propagated skipPrivateRequirements property (esb missing)
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-08-21 13:15:00 UTC (rev 43131)
+++ trunk/build/parent/pom.xml 2012-08-21 13:52:39 UTC (rev 43132)
@@ -180,7 +180,7 @@
<useUIThread>true</useUIThread>
<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
<!-- tycho.testArgLine repeated to keep jacoco configuration for jacoco-maven-plugin -->
- <argLine>${tycho.testArgLine} ${memoryOptions1} ${memoryOptions2} ${platformSystemProperties} ${systemProperties} -Dusage_reporting_enabled=false</argLine>
+ <argLine>${tycho.testArgLine} ${memoryOptions1} ${memoryOptions2} ${platformSystemProperties} ${systemProperties} -Dusage_reporting_enabled=false -Dorg.jboss.tools.tests.skipPrivateRequirements=${skipPrivateRequirements}</argLine>
<!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho -->
<!-- set useUIThread=true for regular ui tests -->
<!-- set useUIThread=false for swtbot tests -->
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2012-08-21 13:15:00 UTC (rev 43131)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2012-08-21 13:52:39 UTC (rev 43132)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirementsDirectory}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirementsDirectory}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirementsDirectory}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirementsDirectory}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirementsDirectory}/jboss-eap-4.3 -Dskip.runtime.scanner=true -Djbosstools.test.jboss.home.7.0=${requirementsDirectory}/jboss-as-7.0.0.Final</systemProperties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirementsDirectory}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirementsDirectory}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirementsDirectory}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirementsDirectory}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirementsDirectory}/jboss-eap-4.3 -Dskip.runtime.scanner=true -Djbosstools.test.jboss.home.7.0=${requirementsDirectory}/jboss-as-7.0.0.Final -Dorg.jboss.tools.tests.skipPrivateRequirements=${skipPrivateRequirements}</systemProperties>
</properties>
<build>
<plugins>
@@ -96,6 +96,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03/zip/jboss-eap-...</url>
<md5>18dc28785c8b156b36e2d92db699064a</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -109,6 +110,7 @@
<md5>79b37541804f49844ea7322c0ff599c1</md5>
<unpack>true</unpack>
<outputDirectory>${requirementsDirectory}/jboss-eap-4.3/seam</outputDirectory>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -121,6 +123,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03_FP01/zip/jboss...</url>
<md5>38fe2a2a55edc5239ba680eff3b29533</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -133,6 +136,7 @@
<url>http://download.jboss.org/jbosstools/test-runtimes/jbds-seamfp-patch.zip</url>
<md5>c3af3b56add0acccb72db88de477f3c7</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
</executions>
Modified: trunk/runtime-soa/tests/org.jboss.tools.runtime.soa.test/pom.xml
===================================================================
--- trunk/runtime-soa/tests/org.jboss.tools.runtime.soa.test/pom.xml 2012-08-21 13:15:00 UTC (rev 43131)
+++ trunk/runtime-soa/tests/org.jboss.tools.runtime.soa.test/pom.xml 2012-08-21 13:52:39 UTC (rev 43132)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirementsDirectory}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirementsDirectory}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirementsDirectory}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirementsDirectory}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirementsDirectory}/jboss-eap-4.3 -Dskip.runtime.scanner=true -Djbosstools.test.jboss.home.7.0=${requirementsDirectory}/jboss-as-7.0.0.Final</systemProperties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirementsDirectory}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirementsDirectory}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirementsDirectory}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirementsDirectory}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirementsDirectory}/jboss-eap-4.3 -Dskip.runtime.scanner=true -Djbosstools.test.jboss.home.7.0=${requirementsDirectory}/jboss-as-7.0.0.Final -Dorg.jboss.tools.tests.skipPrivateRequirements=${skipPrivateRequirements}</systemProperties>
</properties>
<build>
@@ -97,6 +97,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03/zip/jboss-eap-...</url>
<md5>18dc28785c8b156b36e2d92db699064a</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -110,6 +111,7 @@
<md5>79b37541804f49844ea7322c0ff599c1</md5>
<unpack>true</unpack>
<outputDirectory>${requirementsDirectory}/jboss-eap-4.3/seam</outputDirectory>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -122,6 +124,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03_FP01/zip/jboss...</url>
<md5>38fe2a2a55edc5239ba680eff3b29533</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -134,6 +137,7 @@
<url>http://download.jboss.org/jbosstools/test-runtimes/jbds-seamfp-patch.zip</url>
<md5>c3af3b56add0acccb72db88de477f3c7</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
</executions>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2012-08-21 13:15:00 UTC (rev 43131)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2012-08-21 13:52:39 UTC (rev 43132)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirementsDirectory}/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${requirementsDirectory}/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${requirementsDirectory}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${requirementsDirectory}/jboss-seam-2.1.1.GA</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirementsDirectory}/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${requirementsDirectory}/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${requirementsDirectory}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${requirementsDirectory}/jboss-seam-2.1.1.GA -Dorg.jboss.tools.tests.skipPrivateRequirements=${skipPrivateRequirements}</systemProperties>
<coverage.filter>org.jboss.tools.seam*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
@@ -33,6 +33,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03/zip/jboss-eap-...</url>
<md5>18dc28785c8b156b36e2d92db699064a</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -46,6 +47,7 @@
<md5>79b37541804f49844ea7322c0ff599c1</md5>
<unpack>true</unpack>
<outputDirectory>${requirementsDirectory}/jboss-eap-4.3/seam</outputDirectory>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -58,6 +60,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03_FP01/zip/jboss...</url>
<md5>38fe2a2a55edc5239ba680eff3b29533</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -70,6 +73,7 @@
<url>http://download.jboss.org/jbosstools/test-runtimes/jbds-seamfp-patch.zip</url>
<md5>c3af3b56add0acccb72db88de477f3c7</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2012-08-21 13:15:00 UTC (rev 43131)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2012-08-21 13:52:39 UTC (rev 43132)
@@ -33,6 +33,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03/zip/jboss-eap-...</url>
<md5>18dc28785c8b156b36e2d92db699064a</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -46,6 +47,7 @@
<md5>79b37541804f49844ea7322c0ff599c1</md5>
<unpack>true</unpack>
<outputDirectory>${requirementsDirectory}/jboss-eap-4.3/seam</outputDirectory>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
</executions>
@@ -54,6 +56,7 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skip>${skipPrivateRequirements}</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.core.test</bundle>
<bundle>org.jboss.tools.seam.core</bundle>
Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2012-08-21 13:15:00 UTC (rev 43131)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2012-08-21 13:52:39 UTC (rev 43132)
@@ -33,6 +33,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03/zip/jboss-eap-...</url>
<md5>18dc28785c8b156b36e2d92db699064a</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -46,6 +47,7 @@
<md5>79b37541804f49844ea7322c0ff599c1</md5>
<unpack>true</unpack>
<outputDirectory>${requirementsDirectory}/jboss-eap-4.3/seam</outputDirectory>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
</executions>
@@ -54,6 +56,7 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skip>${skipPrivateRequirements}</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
Modified: trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2012-08-21 13:15:00 UTC (rev 43131)
+++ trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2012-08-21 13:52:39 UTC (rev 43132)
@@ -33,6 +33,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03/zip/jboss-eap-...</url>
<md5>18dc28785c8b156b36e2d92db699064a</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -46,6 +47,7 @@
<md5>79b37541804f49844ea7322c0ff599c1</md5>
<unpack>true</unpack>
<outputDirectory>${requirementsDirectory}/jboss-eap-4.3/seam</outputDirectory>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -58,6 +60,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03_FP01/zip/jboss...</url>
<md5>38fe2a2a55edc5239ba680eff3b29533</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -70,6 +73,7 @@
<url>http://download.jboss.org/jbosstools/test-runtimes/jbds-seamfp-patch.zip</url>
<md5>c3af3b56add0acccb72db88de477f3c7</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
</executions>
@@ -79,6 +83,7 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skip>${skipPrivateRequirements}</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.core.test</bundle>
<bundle>org.jboss.tools.seam.core</bundle>
Modified: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2012-08-21 13:15:00 UTC (rev 43131)
+++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2012-08-21 13:52:39 UTC (rev 43132)
@@ -33,6 +33,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03/zip/jboss-eap-...</url>
<md5>18dc28785c8b156b36e2d92db699064a</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -46,6 +47,7 @@
<md5>79b37541804f49844ea7322c0ff599c1</md5>
<unpack>true</unpack>
<outputDirectory>${requirementsDirectory}/jboss-eap-4.3/seam</outputDirectory>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -58,6 +60,7 @@
<url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03_FP01/zip/jboss...</url>
<md5>38fe2a2a55edc5239ba680eff3b29533</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
<execution>
@@ -70,6 +73,7 @@
<url>http://download.jboss.org/jbosstools/test-runtimes/jbds-seamfp-patch.zip</url>
<md5>c3af3b56add0acccb72db88de477f3c7</md5>
<unpack>true</unpack>
+ <skip>${skipPrivateRequirements}</skip>
</configuration>
</execution>
</executions>
@@ -78,6 +82,7 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <skip>${skipPrivateRequirements}</skip>
<explodedBundles>
<bundle>org.jboss.tools.seam.ui.test</bundle>
<bundle>org.jboss.tools.seam.core.test</bundle>
12 years, 4 months
JBoss Tools SVN: r43131 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-08-21 09:15:00 -0400 (Tue, 21 Aug 2012)
New Revision: 43131
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java
Log:
https://issues.jboss.org/browse/JBIDE-12451
Fix NPE for projects with orm.xml
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java 2012-08-21 12:57:24 UTC (rev 43130)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java 2012-08-21 13:15:00 UTC (rev 43131)
@@ -25,6 +25,7 @@
import org.eclipse.jpt.jpa.core.JpaProject;
import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
import org.eclipse.jpt.jpa.core.internal.AbstractJpaProject;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
@@ -73,11 +74,14 @@
}
public BasicHibernateProperties getBasicHibernateProperties(){
- Persistence persistence = getRootContextNode().getPersistenceXml().getPersistence();
- if (persistence.getPersistenceUnitsSize() > 0){
- PersistenceUnit persistenceUnit = persistence.getPersistenceUnit(0);
- if (persistenceUnit instanceof HibernatePersistenceUnit) {
- return ((HibernatePersistenceUnit) persistenceUnit).getHibernatePersistenceUnitProperties();
+ if (getRootContextNode() != null){
+ PersistenceXml persistenceXml = getRootContextNode().getPersistenceXml();
+ Persistence persistence = persistenceXml.getPersistence();
+ if (persistence.getPersistenceUnitsSize() > 0){
+ PersistenceUnit persistenceUnit = persistence.getPersistenceUnit(0);
+ if (persistenceUnit instanceof HibernatePersistenceUnit) {
+ return ((HibernatePersistenceUnit) persistenceUnit).getHibernatePersistenceUnitProperties();
+ }
}
}
return null;
12 years, 4 months
JBoss Tools SVN: r43130 - trunk/maven/tests/org.jboss.tools.maven.profiles.test.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-08-21 08:57:24 -0400 (Tue, 21 Aug 2012)
New Revision: 43130
Modified:
trunk/maven/tests/org.jboss.tools.maven.profiles.test/
Log:
Updated ignore list
Property changes on: trunk/maven/tests/org.jboss.tools.maven.profiles.test
___________________________________________________________________
Added: svn:ignore
+ target
12 years, 4 months