JBoss Tools SVN: r35028 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: resources/tck/tests/jbt/resolution/parameters and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-23 20:08:19 -0400 (Fri, 23 Sep 2011)
New Revision: 35028
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/A.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/B.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Bean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/BigItem.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Factory.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Item.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Q.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java
Log:
JBIDE-9763
https://issues.jboss.org/browse/JBIDE-9763
Tests added.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/A.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/A.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/A.java 2011-09-24 00:08:19 UTC (rev 35028)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.parameters;
+
+public class A {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/A.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/B.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/B.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/B.java 2011-09-24 00:08:19 UTC (rev 35028)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.parameters;
+
+public class B extends A {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/B.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Bean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Bean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Bean.java 2011-09-24 00:08:19 UTC (rev 35028)
@@ -0,0 +1,58 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.parameters;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.inject.Inject;
+
+public class Bean {
+
+ @Inject
+ @Q("set1")
+ Set<String> s1;
+
+ @Inject
+ @Q("set2")
+ Set<? extends Set<String>> s2;
+
+ //resolved to Factory.getMap1();
+ @Inject
+ @Q("map")
+ Map<String, Set<String>> m1;
+
+ //resolved to Factory.getMap2();
+ @Inject
+ @Q("map2")
+ Map<Integer, Set<Integer>> m2;
+
+ //resolved to Factory.getMap3();
+ @Inject
+ @Q("map3")
+ Map<Set<Integer>, Map<Long,Integer>> m3;
+
+ //not resolved to Factory.getMap3();
+ @Inject
+ @Q("map3")
+ Map<Set<Integer>, Map<Long,Short>> m3a;
+
+ //resolved to Factory.getMap3();
+ @Inject
+ @Q("map3")
+ Map<? extends Set<Integer>, Map<Long,Integer>> m3b;
+
+ //resolved to Factory.getMap4();
+ @Inject
+ @Q("map4")
+ Map<Set<A>, Map<String,A>> m4;
+
+ //resolved to Factory.getMap4();
+ @Inject
+ @Q("map4")
+ Map<Set<B>, Map<Set<A>,B>> m4a;
+
+ //not resolved to Factory.getMap4();
+ @Inject
+ @Q("map4")
+ Map<Set<B>, Map<String,A>> m4b;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Bean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/BigItem.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/BigItem.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/BigItem.java 2011-09-24 00:08:19 UTC (rev 35028)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.parameters;
+
+public class BigItem extends Item {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/BigItem.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Factory.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Factory.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Factory.java 2011-09-24 00:08:19 UTC (rev 35028)
@@ -0,0 +1,48 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.parameters;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.enterprise.inject.Produces;
+
+public class Factory {
+
+ @Produces
+ @Q("set1")
+ <X> HashSet<X> getSet() {
+ return null;
+ }
+
+ @Produces
+ @Q("set2")
+ <X> Set<HashSet<X>> getSetOfSet() {
+ return null;
+ }
+
+ @Produces
+ @Q("map")
+ <X,Y> HashMap<X,Y> getMap() {
+ return null;
+ }
+
+ @Produces
+ @Q("map2")
+ <X> HashMap<X,Set<X>> getMap2() {
+ return null;
+ }
+
+ @Produces
+ @Q("map3")
+ <X,Y> HashMap<Set<X>,Map<Y,X>> getMap3() {
+ return null;
+ }
+
+ @Produces
+ @Q("map4")
+ <X extends A,Y> HashMap<Set<X>,Map<Y,X>> getMap4() {
+ return null;
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Factory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Item.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Item.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Item.java 2011-09-24 00:08:19 UTC (rev 35028)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.parameters;
+
+public class Item {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Item.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Q.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Q.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Q.java 2011-09-24 00:08:19 UTC (rev 35028)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.parameters;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Q {
+ String value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/parameters/Q.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2011-09-23 23:53:14 UTC (rev 35027)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2011-09-24 00:08:19 UTC (rev 35028)
@@ -124,4 +124,70 @@
assertEquals("Wrong number of the beans", 1, beans.size());
assertContainsBeanTypes(beans.iterator().next(), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object");
}
+
+ public void testAssignabilityOfSophisticatedCases() {
+ String cls = "JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/parameters/Bean.java";
+
+ //@Inject Set<String> s1;
+ //@Produces <X> HashSet<X> getSet()
+ IInjectionPointField injection = getInjectionPointField(cls, "s1");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+
+ //@Inject Set<? extends Set<String>> s2;
+ //@Produces <X> Set<HashSet<X>> getSetOfSet()
+ injection = getInjectionPointField(cls, "s2");
+ beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+
+ //@Inject Map<String, Set<String>> m1;
+ //@Produces <X,Y> HashMap<X,Y> getMap()
+ injection = getInjectionPointField(cls, "m1");
+ beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+
+ //@Inject Map<Integer, Set<Integer>> m2;
+ //@Produces <X> HashMap<X,Set<X>> getMap2()
+ injection = getInjectionPointField(cls, "m2");
+ beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+
+ //@Inject Map<Set<Integer>, Map<Long,Integer>> m3;
+ //@Produces <X,Y> HashMap<Set<X>,Map<Y,X>> getMap3()
+ injection = getInjectionPointField(cls, "m3");
+ beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+
+ //@Inject Map<Set<Integer>, Map<Long,Short>> m3a;
+ //@Produces <X,Y> HashMap<Set<X>,Map<Y,X>> getMap3()
+ //not resolved
+ injection = getInjectionPointField(cls, "m3a");
+ beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 0, beans.size());
+
+ //@Inject Map<? extends Set<Integer>, Map<Long,Integer>> m3b;
+ //@Produces <X,Y> HashMap<Set<X>,Map<Y,X>> getMap3()
+ injection = getInjectionPointField(cls, "m3b");
+ beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+
+ //@Inject Map<Set<A>, Map<String,A>> m4;
+ //@Produces <X extends A,Y> HashMap<Set<X>,Map<Y,X>> getMap4()
+ injection = getInjectionPointField(cls, "m4");
+ beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+
+ //@Inject Map<Set<B>, Map<Set<A>,B>> m4a;
+ //@Produces <X extends A,Y> HashMap<Set<X>,Map<Y,X>> getMap4()
+ injection = getInjectionPointField(cls, "m4a");
+ beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 1, beans.size());
+
+ //@Inject Map<Set<B>, Map<String,A>> m4b;
+ //@Produces <X extends A,Y> HashMap<Set<X>,Map<Y,X>> getMap4()
+ //not resolved
+ injection = getInjectionPointField(cls, "m4b");
+ beans = cdiProject.getBeans(true, injection);
+ assertEquals("Wrong number of the beans", 0, beans.size());
+ }
}
\ No newline at end of file
14 years, 6 months
JBoss Tools SVN: r35027 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-23 19:53:14 -0400 (Fri, 23 Sep 2011)
New Revision: 35027
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
Log:
JBIDE-9763
https://issues.jboss.org/browse/JBIDE-9763
During comparing of parameters, resolved variables are cached to detect contradictions in assignments.
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2011-09-23 23:30:43 UTC (rev 35026)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2011-09-23 23:53:14 UTC (rev 35027)
@@ -330,6 +330,10 @@
}
public boolean isAssignableTo(ParametedType other, boolean checkInheritance) {
+ return isAssignableTo(other, checkInheritance, new HashMap<String, IType>());
+ }
+
+ boolean isAssignableTo(ParametedType other, boolean checkInheritance, Map<String,IType> resolvedVars) {
if(equals(other)) return true;
if("*".equals(other.getSignature())) {
return true;
@@ -337,19 +341,28 @@
if(this.type == null) {
return (isVariable && other.isVariable && other.type == null);
}
- if(other.isVariable && other.type == null) return true;
+ if(other.isVariable && other.type == null) {
+ if(type != null) {
+ if(resolvedVars.get(other.getSignature()) != null) {
+ return resolvedVars.get(other.getSignature()) == type;
+ } else {
+ resolvedVars.put(other.getSignature(), type);
+ }
+ }
+ return true;
+ }
if(this.type.equals(other.type)) {
- if(areTypeParametersAssignableTo(other)) return true;
+ if(areTypeParametersAssignableTo(other, resolvedVars)) return true;
}
if(checkInheritance) {
for (IParametedType t: getInheritedTypes()) {
- if(((ParametedType)t).isAssignableTo(other, false)) return true;
+ if(((ParametedType)t).isAssignableTo(other, false, resolvedVars)) return true;
}
}
return false;
}
- boolean areTypeParametersAssignableTo(ParametedType other) {
+ boolean areTypeParametersAssignableTo(ParametedType other, Map<String,IType> resolvedVars) {
if(other.parameterTypes.isEmpty()) return true;
if(this.parameterTypes.size() != other.parameterTypes.size()) return false;
for (int i = 0; i < parameterTypes.size(); i++) {
@@ -358,20 +371,20 @@
if(p1.isLower() || (p1.isUpper() && !p1.isVariable)) return false;
if(p1.isVariable()) {
if(p2.isVariable()) {
- if(p2.isAssignableTo(p1, true)) continue;
+ if(p2.isAssignableTo(p1, true, resolvedVars)) continue;
} else if(p2.isLower()) {
- if(p2.isAssignableTo(p1, true)) continue;
+ if(p2.isAssignableTo(p1, true, resolvedVars)) continue;
} else if(p2.isUpper()) {
- if(p2.isAssignableTo(p1, true)) continue;
- if(p1.isAssignableTo(p2, true)) continue;
+ if(p2.isAssignableTo(p1, true, resolvedVars)) continue;
+ if(p1.isAssignableTo(p2, true, resolvedVars)) continue;
} else {
- if(p2.isAssignableTo(p1, true)) continue;
+ if(p2.isAssignableTo(p1, true, resolvedVars)) continue;
}
} else {
if(p2.isLower()) {
- if(p2.isAssignableTo(p1, true)) continue;
+ if(p2.isAssignableTo(p1, true, resolvedVars)) continue;
} else {
- if(p1.isAssignableTo(p2, true)) continue;
+ if(p1.isAssignableTo(p2, true, resolvedVars)) continue;
}
}
14 years, 6 months
JBoss Tools SVN: r35026 - trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-23 19:30:43 -0400 (Fri, 23 Sep 2011)
New Revision: 35026
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml
Log:
fixed feature id for org.jboss.ide.eclipse.as.server.rse.integration.feature
Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2011-09-23 23:29:09 UTC (rev 35025)
+++ trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2011-09-23 23:30:43 UTC (rev 35026)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.jboss.ide.eclipse.as.server.rse.integration"
+ id="org.jboss.ide.eclipse.as.server.rse.integration.feature"
label="%featureName"
version="2.3.0.qualifier">
14 years, 6 months
JBoss Tools SVN: r35025 - trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-23 19:29:09 -0400 (Fri, 23 Sep 2011)
New Revision: 35025
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml
Log:
fixed feature id for org.jboss.ide.eclipse.as.serverAdapter.wtp.feature
Modified: trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2011-09-23 23:26:58 UTC (rev 35024)
+++ trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2011-09-23 23:29:09 UTC (rev 35025)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.jboss.ide.eclipse.as.serverAdapter.wtp"
+ id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature"
label="%featureName"
version="2.3.0.qualifier">
14 years, 6 months
JBoss Tools SVN: r35024 - trunk/jmx/features/org.jboss.tools.jmx.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-23 19:26:58 -0400 (Fri, 23 Sep 2011)
New Revision: 35024
Modified:
trunk/jmx/features/org.jboss.tools.jmx.test.feature/build.properties
Log:
fix for feature build error
root files directive removed
Modified: trunk/jmx/features/org.jboss.tools.jmx.test.feature/build.properties
===================================================================
--- trunk/jmx/features/org.jboss.tools.jmx.test.feature/build.properties 2011-09-23 23:08:24 UTC (rev 35023)
+++ trunk/jmx/features/org.jboss.tools.jmx.test.feature/build.properties 2011-09-23 23:26:58 UTC (rev 35024)
@@ -4,4 +4,3 @@
generate.plugin(a)org.jboss.tools.jmx.core.test.source=org.jboss.tools.jmx.core.test
generate.plugin(a)org.jboss.tools.jmx.ui.test.source=org.jboss.tools.jmx.ui.test
generate.plugin(a)org.jboss.tools.jmx.ui.test.interactive.source=org.jboss.tools.jmx.ui.test.interactive
-root=rootfiles
\ No newline at end of file
14 years, 6 months
JBoss Tools SVN: r35023 - in trunk: birt/plugins/org.jboss.tools.birt.core/META-INF and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-23 19:08:24 -0400 (Fri, 23 Sep 2011)
New Revision: 35023
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
trunk/birt/plugins/org.jboss.tools.birt.core/META-INF/MANIFEST.MF
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF
trunk/jmx/plugins/org.jboss.tools.jmx.core/META-INF/MANIFEST.MF
trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF
trunk/workingset/plugins/org.jboss.tools.workingset.core/META-INF/MANIFEST.MF
trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-9765 Fix optional dependecies in MANIFEST.MF with ";x-installation:=greedy" to support using Tycho 0.13
fixed
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2011-09-23 23:06:53 UTC (rev 35022)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2011-09-23 23:08:24 UTC (rev 35023)
@@ -12,7 +12,7 @@
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.variables;bundle-version="3.2.500",
- org.jboss.tools.usage;resolution:=optional
+ org.jboss.tools.usage;resolution:=optional;x-installation:=greedy
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: archivescore.jar,
archivescore-eclipse.jar,
Modified: trunk/birt/plugins/org.jboss.tools.birt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.core/META-INF/MANIFEST.MF 2011-09-23 23:06:53 UTC (rev 35022)
+++ trunk/birt/plugins/org.jboss.tools.birt.core/META-INF/MANIFEST.MF 2011-09-23 23:08:24 UTC (rev 35023)
@@ -19,6 +19,6 @@
org.eclipse.emf.common,
org.eclipse.emf.ecore,
org.eclipse.ui.ide,
- org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional
+ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF
===================================================================
--- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF 2011-09-23 23:06:53 UTC (rev 35022)
+++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF 2011-09-23 23:08:24 UTC (rev 35023)
@@ -19,7 +19,7 @@
org.eclipse.debug.ui,
org.eclipse.jdt.core,
org.eclipse.jdt.ui,
- org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional
+ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: freemarker-ide.jar,
freemarker-2.3.18.jar
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/META-INF/MANIFEST.MF 2011-09-23 23:06:53 UTC (rev 35022)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/META-INF/MANIFEST.MF 2011-09-23 23:08:24 UTC (rev 35023)
@@ -6,7 +6,7 @@
Bundle-Activator: org.jboss.tools.jmx.core.JMXActivator
Bundle-Vendor: %BundleProvider
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional
+ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
Export-Package: org.jboss.tools.jmx.core,
org.jboss.tools.jmx.core.providers;
x-friends:="org.jboss.tools.jmx.core,
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF 2011-09-23 23:06:53 UTC (rev 35022)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF 2011-09-23 23:08:24 UTC (rev 35023)
@@ -26,7 +26,7 @@
org.jboss.ide.eclipse.as.core;visibility:=reexport,
org.eclipse.core.commands,
org.eclipse.core.expressions,
- org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional
+ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.portlet.core,
org.jboss.tools.portlet.core.internal,
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2011-09-23 23:06:53 UTC (rev 35022)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2011-09-23 23:08:24 UTC (rev 35023)
@@ -10,7 +10,7 @@
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.junit4,
org.eclipse.emf.edit,
- org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional
+ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.tools.smooks,
Modified: trunk/workingset/plugins/org.jboss.tools.workingset.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/workingset/plugins/org.jboss.tools.workingset.core/META-INF/MANIFEST.MF 2011-09-23 23:06:53 UTC (rev 35022)
+++ trunk/workingset/plugins/org.jboss.tools.workingset.core/META-INF/MANIFEST.MF 2011-09-23 23:08:24 UTC (rev 35023)
@@ -8,7 +8,7 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources;bundle-version="3.5.0",
- org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional
+ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.workingset.core,
Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2011-09-23 23:06:53 UTC (rev 35022)
+++ trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2011-09-23 23:08:24 UTC (rev 35023)
@@ -10,5 +10,5 @@
Bundle-Vendor: mozilla.org
Eclipse-BuddyPolicy: registered
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional
+Require-Bundle: org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
14 years, 6 months
JBoss Tools SVN: r35022 - trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-23 19:06:53 -0400 (Fri, 23 Sep 2011)
New Revision: 35022
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF
Log:
references for as,archives,jmx and wst.server.ui plugin cannot be optional.
removed optional directive to fix continuous build.
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2011-09-23 23:04:09 UTC (rev 35021)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2011-09-23 23:06:53 UTC (rev 35022)
@@ -25,10 +25,10 @@
org.eclipse.jst.common.frameworks,
org.jboss.ide.eclipse.as.wtp.core,
org.eclipse.wst.web,
- org.jboss.ide.eclipse.as.core;resolution:=optional,
- org.jboss.ide.eclipse.archives.webtools;resolution:=optional,
- org.jboss.tools.jmx.core;resolution:=optional,
- org.eclipse.wst.server.ui;resolution:=optional,
+ org.jboss.ide.eclipse.as.core,
+ org.jboss.ide.eclipse.archives.webtools,
+ org.jboss.tools.jmx.core,
+ org.eclipse.wst.server.ui,
org.eclipse.ui.navigator
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.bpel.runtimes,
14 years, 6 months
JBoss Tools SVN: r35021 - trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-23 19:04:09 -0400 (Fri, 23 Sep 2011)
New Revision: 35021
Modified:
trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF
Log:
Marked usage as required (none optional). Dependency cannot be optional, if classes from dependency are directly referenced in plugin. Usage reporting plug-in cannot be optional dependency or build will fail.
Modified: trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF 2011-09-23 22:56:22 UTC (rev 35020)
+++ trunk/gwt/plugins/org.jboss.tools.gwt.core/META-INF/MANIFEST.MF 2011-09-23 23:04:09 UTC (rev 35021)
@@ -21,7 +21,7 @@
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.301,2.0.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.300,2.0.0)",
- org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional
+ org.jboss.tools.usage;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.jboss.tools.gwt.core,
org.jboss.tools.gwt.core.util
14 years, 6 months
JBoss Tools SVN: r35020 - trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-23 18:56:22 -0400 (Fri, 23 Sep 2011)
New Revision: 35020
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
Log:
removed import for ToolingCompatibilityTest, which is missing
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2011-09-23 22:52:33 UTC (rev 35019)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2011-09-23 22:56:22 UTC (rev 35020)
@@ -4,7 +4,6 @@
import org.jboss.tools.bpel.ui.bot.test.ActivityModelingTest;
import org.jboss.tools.bpel.ui.bot.test.AssignActivityTest;
-import org.jboss.tools.bpel.ui.bot.test.ToolingCompatibilityTest;
import org.jboss.tools.bpel.ui.bot.test.FaultModelingTest;
import org.jboss.tools.bpel.ui.bot.test.OdeDeployTest;
import org.jboss.tools.bpel.ui.bot.test.SimpleModelingTest;
14 years, 6 months
JBoss Tools SVN: r35019 - trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-23 18:52:33 -0400 (Fri, 23 Sep 2011)
New Revision: 35019
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksCSV2Java2XML.java
Log:
removed @Override annotation for interface method implementation
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksCSV2Java2XML.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksCSV2Java2XML.java 2011-09-23 21:30:26 UTC (rev 35018)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/testcase/SmooksCSV2Java2XML.java 2011-09-23 22:52:33 UTC (rev 35019)
@@ -25,8 +25,7 @@
public class SmooksCSV2Java2XML extends SWTTestExt {
class MyFileFilter implements FileFilter {
- @Override
- public boolean accept(File pathname) {
+ public boolean accept(File pathname) {
return true;
}
}
14 years, 6 months