JBoss Tools SVN: r35169 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-29 14:17:32 -0400 (Thu, 29 Sep 2011)
New Revision: 35169
Modified:
trunk/build/pom-soa-tooling.xml
Log:
remove property coverage from aggregate-coverage and libs profiles; not sure why this was this wya before but seems to have broken collection of tests in http://hudson.qa.jboss.com/hudson/view/DevStudio/view/DevStudio_Trunk/job...
Modified: trunk/build/pom-soa-tooling.xml
===================================================================
--- trunk/build/pom-soa-tooling.xml 2011-09-29 18:17:22 UTC (rev 35168)
+++ trunk/build/pom-soa-tooling.xml 2011-09-29 18:17:32 UTC (rev 35169)
@@ -30,9 +30,6 @@
<id>libs</id>
<activation>
<activeByDefault>true</activeByDefault>
- <property>
- <name>coverage</name>
- </property>
</activation>
<modules>
<module>libs</module>
@@ -272,9 +269,6 @@
<id>aggregate-coverage</id>
<activation>
<activeByDefault>true</activeByDefault>
- <property>
- <name>coverage</name>
- </property>
</activation>
<modules>
<module>reports/emma-coverage</module>
12 years, 7 months
JBoss Tools SVN: r35168 - trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-29 14:17:22 -0400 (Thu, 29 Sep 2011)
New Revision: 35168
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/build.properties
Log:
add missing src directives (JBIDE-8838)
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/build.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/build.properties 2011-09-29 18:17:10 UTC (rev 35167)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.doc.user/build.properties 2011-09-29 18:17:22 UTC (rev 35168)
@@ -1,3 +1,6 @@
+source.. = src/
+output.. = bin/
+src.excludes = src
bin.includes = META-INF/,\
doc.zip,\
plugin.properties,\
12 years, 7 months
JBoss Tools SVN: r35167 - trunk/smooks/plugins/org.jboss.tools.smooks.runtime.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-29 14:17:10 -0400 (Thu, 29 Sep 2011)
New Revision: 35167
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties
Log:
add missing src directives (JBIDE-8838)
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties 2011-09-29 18:05:17 UTC (rev 35166)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties 2011-09-29 18:17:10 UTC (rev 35167)
@@ -1,3 +1,5 @@
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
libs/jackson-core-lgpl-1.0.1.jar,\
libs/milyn-commons-1.2.1.jar,\
@@ -12,3 +14,5 @@
about.html,\
libs/xstream-1.2.2.jar
jars.compile.order =
+src.includes = *
+src.excludes = src
12 years, 7 months
JBoss Tools SVN: r35166 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-29 14:05:17 -0400 (Thu, 29 Sep 2011)
New Revision: 35166
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java
Log:
JBIDE-9795
https://issues.jboss.org/browse/JBIDE-9795
Abstract classes should not be available as beans for injections and EL.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-09-29 17:39:26 UTC (rev 35165)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-09-29 18:05:17 UTC (rev 35166)
@@ -27,7 +27,8 @@
"/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/ObserverMethodInDecoratorBroken.java",
"/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/observers/ClassFragmentLogger.java",
"/tck/JavaSource/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Fox.java",
- "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/AbstractBean.java",
+//Abstract class is not a bean, if we need its observer, we have to implement another way for that than throug beans.
+// "/tck/JavaSource/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/AbstractBean.java",
"/tck/JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.java",
"/tck/JavaSource/org/jboss/jsr299/tck/tests/event/StringObserver.java",
"/tck/JavaSource/org/jboss/jsr299/tck/tests/event/observer/transactional/Pomeranian.java",
12 years, 7 months
JBoss Tools SVN: r35165 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core: generic and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-29 13:39:26 -0400 (Thu, 29 Sep 2011)
New Revision: 35165
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
Log:
JBIDE-9795
https://issues.jboss.org/browse/JBIDE-9795
Abstract classes should not be available as beans for injections and EL.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-09-29 17:08:40 UTC (rev 35164)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-09-29 17:39:26 UTC (rev 35165)
@@ -68,10 +68,12 @@
if(i.isAnnotationPresent(CDISeamSolderConstants.MESSAGE_LOGGER_ANNOTATION_TYPE_NAME)) {
TypeDefinition d = new TypeDefinition();
d.setType(t, workingCopy.getRootContext(), 0);
+ d.setBeanConstructor(true);
workingCopy.addMessageLogger(path, d);
} else if(i.isAnnotationPresent(CDISeamSolderConstants.MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME)) {
TypeDefinition d = new TypeDefinition();
d.setType(t, workingCopy.getRootContext(), 0);
+ d.setBeanConstructor(true);
workingCopy.addMessageBundle(path, d);
AnnotationDeclaration ad = d.getAnnotation(CDISeamSolderConstants.MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME);
if(ad.getMemberValue("projectCode") != null && ad.getMemberValue("projectCode").toString().length() > 0) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-09-29 17:08:40 UTC (rev 35164)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-09-29 17:39:26 UTC (rev 35165)
@@ -78,6 +78,7 @@
if(workingCopy.isServiceAnnotation(a.getType())) {
TypeDefinition d = new TypeDefinition();
d.setType(t, workingCopy.getRootContext(), 0);
+ d.setBeanConstructor(true);
workingCopy.addService(path, d);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-09-29 17:08:40 UTC (rev 35164)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-09-29 17:39:26 UTC (rev 35165)
@@ -87,6 +87,7 @@
if(genericTypeDef != null) {
TypeDefinition fakeGenericType = new TypeDefinition();
fakeGenericType.setType(genericTypeDef.getType(), context.getRootContext(), 0);
+ fakeGenericType.setBeanConstructor(true);
ClassBean b = new ClassBean();
b.setDefinition(fakeGenericType);
b.setParent(p);
12 years, 7 months
JBoss Tools SVN: r35164 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test: projects/CDIConfigTest/src/org/jboss/beans/test07 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-29 13:08:40 -0400 (Thu, 29 Sep 2011)
New Revision: 35164
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java
Log:
JBIDE-9777
https://issues.jboss.org/browse/JBIDE-9777
Vetoing type definition in dependent projects is improved.
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java 2011-09-29 17:08:40 UTC (rev 35164)
@@ -0,0 +1,24 @@
+package org.jboss.beans.test01;
+
+import javax.inject.Named;
+/**
+ * Test 07-1.
+ * Sources contain simple bean class MyBean1 with qualifier @Named("test07-1-a").
+ * Seam config xml in a dependent project contains declaration:
+ * <test07:MyBean1>
+ * <s:modifies/>
+ * <s:Named>test07-1-b</s:Named>
+ * </test07:MyBean1>
+ *
+ * ASSERT: Model contains 1 named bean with name "test07-1-a".
+ * ASSERT: Model contains no named bean with name "test07-1-b".
+ * ASSERT: Model of dependent project contains no named bean with name "test07-1-a".
+ * ASSERT: Model of dependent project contains 1 named bean with name "test07-1-b".
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+@Named("test07-1-a")
+public class MyBean1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml 2011-09-29 17:08:40 UTC (rev 35164)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:s="urn:java:ee"
+ xmlns:test07="urn:java:org.jboss.beans.test07"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
+
+<!-- Test 07-1 -->
+<test07:MyBean1>
+ <s:modifies/>
+ <s:Named>test07-1-b</s:Named>
+</test07:MyBean1>
+
+</beans>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/src/META-INF/seam-beans.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-09-29 17:07:07 UTC (rev 35163)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-09-29 17:08:40 UTC (rev 35164)
@@ -756,6 +756,33 @@
}
+ /**
+ * Test 07-1.
+ * Sources contain simple bean class MyBean1 with qualifier @Named("test07-1-a").
+ * Seam config xml in a dependent project contains declaration:
+ * <test07:MyBean1>
+ * <s:modifies/>
+ * <s:Named>test07-1-b</s:Named>
+ * </test07:MyBean1>
+ *
+ * ASSERT: Model contains 1 named bean with name "test07-1-a".
+ * ASSERT: Model contains no named bean with name "test07-1-b".
+ * ASSERT: Model of dependent project contains no named bean with name "test07-1-a".
+ * ASSERT: Model of dependent project contains 1 named bean with name "test07-1-b".
+ */
+ public void testModifyingBeanInDependentProject() throws CoreException, IOException {
+ Set<IBean> beans1 = cdiProject.getBeans(false, "org.jboss.beans.test07.MyBean1");
+ assertEquals(1, beans1.size());
+ IBean b = beans1.iterator().next();
+ assertEquals("test07-1-a", b.getName());
+
+ //The same in dependent project
+ beans1 = cdiDependentProject.getBeans(false, "org.jboss.beans.test07.MyBean1");
+ assertEquals(1, beans1.size());
+ b = beans1.iterator().next();
+ assertEquals("test07-1-b", b.getName());
+ }
+
protected Set<IBean> getBeansByClassName(String className) {
return cdiProject.getBeans(false, className, new String[0]);
}
12 years, 7 months
JBoss Tools SVN: r35163 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-29 13:07:07 -0400 (Thu, 29 Sep 2011)
New Revision: 35163
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/definition/TypeDefinition.java
Log:
JBIDE-9795
https://issues.jboss.org/browse/JBIDE-9795
Abstract classes should not be available as beans for injections and EL.
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 2011-09-29 16:53:18 UTC (rev 35162)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-09-29 17:07:07 UTC (rev 35163)
@@ -364,16 +364,6 @@
String injectionPointName = injectionPoint.getBeanName();
for (IBean b: beans) {
- if(b instanceof ClassBean && !(b instanceof IBuiltInBean)) {
- IType bType = b.getBeanClass();
- try {
- if(bType != null && Flags.isAbstract(bType.getFlags())) {
- continue;
- }
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
- }
Set<IParametedType> types = b.getLegalTypes();
if(containsType(types, type)) {
try {
@@ -1158,6 +1148,7 @@
void rebuildBeans() {
List<TypeDefinition> typeDefinitions = n.getAllTypeDefinitions();
+ Set<String> vetoedTypes = n.getAllVetoedTypes();
List<IBean> beans = new ArrayList<IBean>();
Set<IType> newAllTypes = new HashSet<IType>();
@@ -1193,10 +1184,16 @@
newDefinitionToClassbeans.put(typeDefinition, bean);
- if(!typeDefinition.isVetoed()) {
+ String typeName = typeDefinition.getType().getFullyQualifiedName();
+ if(!typeDefinition.isVetoed()
+ //Type is defined in another project and modified/replaced in config in this (dependent) project
+ //We should reject type definition based on type, but we have to accept
+ && !(vetoedTypes.contains(typeName) && getNature().getDefinitions().getTypeDefinition(typeName) == null && typeDefinition.getOriginalDefinition() == null)) {
if(typeDefinition.hasBeanConstructor()) {
beans.add(bean);
newClassBeans.put(typeDefinition.getType(), bean);
+ } else {
+ beans.add(bean);
}
Set<IProducer> ps = bean.getProducers();
@@ -1211,6 +1208,7 @@
if(type != null && !newClassBeans.containsKey(type)) {
TypeDefinition t = new TypeDefinition();
t.setType(type, n.getDefinitions(), TypeDefinition.FLAG_NO_ANNOTATIONS);
+ t.setBeanConstructor(true);
ClassBean bean = BuiltInBeanFactory.newClassBean(this, t);
newClassBeans.put(t.getType(), bean);
beans.add(bean);
@@ -1235,6 +1233,7 @@
decorators.clear();
interceptors.clear();
allBeans.clear();
+ injectionPointsByType.clear();
}
classBeans = newClassBeans;
@@ -1244,8 +1243,6 @@
addBean(bean);
}
- buildInjectionPoinsByType();
-
}
/**
@@ -1291,24 +1288,27 @@
}
synchronized(this) {
String name = bean.getName();
- if(name != null && name.length() > 0) {
- Set<IBean> bs = beansByName.get(name);
- if(bs == null) {
- bs = new HashSet<IBean>();
- beansByName.put(name, bs);
- }
- bs.add(bean);
- namedBeans.add(bean);
- }
IPath path = bean.getSourcePath();
Set<IBean> bs = beansByPath.get(path);
if(bs == null) {
bs = new HashSet<IBean>();
beansByPath.put(path, bs);
}
- synchronized (this) {
- bs.add(bean);
+ bs.add(bean);
+ buildInjectionPoinsByType(bean);
+ boolean isAbstract = (bean instanceof ClassBean) && !((ClassBean)bean).getDefinition().hasBeanConstructor();
+ if(isAbstract) {
+ return;
}
+ if(name != null && name.length() > 0) {
+ Set<IBean> bsn = beansByName.get(name);
+ if(bsn == null) {
+ bsn = new HashSet<IBean>();
+ beansByName.put(name, bsn);
+ }
+ bsn.add(bean);
+ namedBeans.add(bean);
+ }
if(bean.isAlternative()) {
alternatives.add(bean);
}
@@ -1329,24 +1329,19 @@
}
}
- synchronized void buildInjectionPoinsByType() {
- injectionPointsByType.clear();
-
- for (IBean b: allBeans) {
- Set<IInjectionPoint> ps = b.getInjectionPoints();
- for (IInjectionPoint p: ps) {
- IParametedType t = p.getType();
- if(t == null || t.getType() == null) continue;
- String n = t.getType().getFullyQualifiedName();
- Set<IInjectionPoint> s = injectionPointsByType.get(n);
- if(s == null) {
- s = new HashSet<IInjectionPoint>();
- injectionPointsByType.put(n, s);
- }
- s.add(p);
+ synchronized void buildInjectionPoinsByType(IBean b) {
+ Set<IInjectionPoint> ps = b.getInjectionPoints();
+ for (IInjectionPoint p: ps) {
+ IParametedType t = p.getType();
+ if(t == null || t.getType() == null) continue;
+ String n = t.getType().getFullyQualifiedName();
+ Set<IInjectionPoint> s = injectionPointsByType.get(n);
+ if(s == null) {
+ s = new HashSet<IInjectionPoint>();
+ injectionPointsByType.put(n, s);
}
+ s.add(p);
}
-
}
void rebuildXML() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-09-29 16:53:18 UTC (rev 35162)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-09-29 17:07:07 UTC (rev 35163)
@@ -44,7 +44,7 @@
protected void init(IType contextType, IRootDefinitionContext context, int flags) throws CoreException {
super.init(contextType, context, flags);
boolean allMembers = (flags & FLAG_ALL_MEMBERS) > 0;
- isAbstract = Flags.isAbstract(type.getFlags());
+ isAbstract = Flags.isAbstract(type.getFlags()) || type.isInterface();
for (IAnnotationDeclaration a: annotations) {
//provide initialization
context.getAnnotationKind(a.getType());
@@ -77,11 +77,13 @@
if(ms[i].isConstructor()) {
hasConstructor = true;
if(ms[i].getNumberOfParameters() == 0 || m.getInjectAnnotation() != null) {
- setBeanConstructor(true);
+ if(!isAbstract || isAnnotationPresent(CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME)) {
+ setBeanConstructor(true);
+ }
}
}
}
- if(!hasConstructor) {
+ if(!hasConstructor && (!isAbstract || isAnnotationPresent(CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME))) {
setBeanConstructor(true);
}
}
12 years, 7 months
JBoss Tools SVN: r35162 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-29 12:53:18 -0400 (Thu, 29 Sep 2011)
New Revision: 35162
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
Log:
JBIDE-9777
https://issues.jboss.org/browse/JBIDE-9777
Vetoing type definition in dependent projects is improved.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-09-29 16:50:53 UTC (rev 35161)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-09-29 16:53:18 UTC (rev 35162)
@@ -209,6 +209,23 @@
return result;
}
+ /**
+ * Returns set of types that were to be marked as vetoed by CDI extensions, but
+ * for which it was impossible to set isVetoed=true on the type definition object,
+ * because type is declared in another project where it is not vetoed.
+ *
+ * @return
+ */
+ public Set<String> getAllVetoedTypes() {
+ Set<String> result = new HashSet<String>();
+ result.addAll(definitions.getVetoedTypes());
+ Set<CDICoreNature> ps = getCDIProjects(true);
+ for (CDICoreNature n: ps) {
+ result.addAll(n.getDefinitions().getVetoedTypes());
+ }
+ return result;
+ }
+
public Set<BeansXMLDefinition> getAllBeanXMLDefinitions() {
Set<CDICoreNature> ps = getCDIProjects(true);
if(ps == null || ps.isEmpty()) {
12 years, 7 months
JBoss Tools SVN: r35161 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-29 12:50:53 -0400 (Thu, 29 Sep 2011)
New Revision: 35161
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
Log:
JBIDE-9777
https://issues.jboss.org/browse/JBIDE-9777
Vetoing type definition in dependent projects is improved.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-09-29 16:43:24 UTC (rev 35160)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-09-29 16:50:53 UTC (rev 35161)
@@ -42,6 +42,8 @@
private Map<String, AnnotationDefinition> annotations = new HashMap<String, AnnotationDefinition>();
private Map<String, AnnotationDefinition> usedAnnotations = new HashMap<String, AnnotationDefinition>();
+ private Set<String> vetoedTypes = new HashSet<String>();
+
private Set<String> packages = new HashSet<String>();
private Map<String, PackageDefinition> packageDefinitions = new HashMap<String, PackageDefinition>();
@@ -81,6 +83,7 @@
copy.types.addAll(types);
copy.typeDefinitions.putAll(typeDefinitions);
copy.annotations.putAll(annotations);
+ copy.vetoedTypes.addAll(vetoedTypes);
copy.packages.addAll(packages);
copy.packageDefinitions.putAll(packageDefinitions);
@@ -121,22 +124,18 @@
return javaProject;
}
- public void addType(IPath file, String typeName, AbstractTypeDefinition def) {
+ public synchronized void addType(IPath file, String typeName, AbstractTypeDefinition def) {
addType(file, typeName);
if(def != null) {
if(def instanceof AnnotationDefinition) {
AnnotationDefinition newD = (AnnotationDefinition)def;
AnnotationDefinition oldD = annotations.get(def.getQualifiedName());
- synchronized (annotations) {
- annotations.put(def.getQualifiedName(), newD);
- }
+ annotations.put(def.getQualifiedName(), newD);
if(oldD != null && oldD.getKind() != newD.getKind()) {
annotationKindChanged(typeName);
}
} else {
- synchronized (typeDefinitions) {
- typeDefinitions.put(def.getQualifiedName(), (TypeDefinition)def);
- }
+ typeDefinitions.put(def.getQualifiedName(), (TypeDefinition)def);
}
}
}
@@ -153,14 +152,14 @@
addToParents(file);
}
if(def != null) {
- synchronized (packageDefinitions) {
+ synchronized (this) {
packageDefinitions.put(def.getQualifiedName(), def);
}
}
}
public void addBeanXML(IPath path, BeansXMLDefinition def) {
- synchronized (beanXMLs) {
+ synchronized (this) {
beanXMLs.put(path, def);
}
addToParents(path);
@@ -193,23 +192,16 @@
}
}
- public void clean() {
+ public synchronized void clean() {
childPaths.clear();
resources.clear();
types.clear();
packages.clear();
- synchronized (typeDefinitions) {
- typeDefinitions.clear();
- }
- synchronized (annotations) {
- annotations.clear();
- }
- synchronized (packageDefinitions) {
- packageDefinitions.clear();
- }
- synchronized (beanXMLs) {
- beanXMLs.clear();
- }
+ typeDefinitions.clear();
+ vetoedTypes.clear();
+ annotations.clear();
+ packageDefinitions.clear();
+ beanXMLs.clear();
for (IDefinitionContextExtension e: extensions) e.clean();
dependencies.clean();
@@ -220,7 +212,7 @@
if(ts != null) for (String t: ts) {
clean(t);
}
- synchronized (beanXMLs) {
+ synchronized (this) {
beanXMLs.remove(path);
}
@@ -238,18 +230,13 @@
dependencies.clean(path);
}
- public void clean(String typeName) {
+ public synchronized void clean(String typeName) {
types.remove(typeName);
- synchronized (typeDefinitions) {
- typeDefinitions.remove(typeName);
- }
- synchronized (annotations) {
- annotations.remove(typeName);
- }
+ typeDefinitions.remove(typeName);
+ vetoedTypes.remove(typeName);
+ annotations.remove(typeName);
packages.remove(typeName);
- synchronized (packageDefinitions) {
- packageDefinitions.remove(typeName);
- }
+ packageDefinitions.remove(typeName);
for (IDefinitionContextExtension e: extensions) e.clean(typeName);
}
@@ -359,6 +346,7 @@
resources = workingCopy.resources;
childPaths = workingCopy.childPaths;
typeDefinitions = workingCopy.typeDefinitions;
+ vetoedTypes = workingCopy.vetoedTypes;
annotations = workingCopy.annotations;
packages = workingCopy.packages;
packageDefinitions = workingCopy.packageDefinitions;
@@ -405,7 +393,7 @@
AnnotationDefinition result = annotations.get(fullyQualifiedName);
//2. Validate result.
if(result != null && (!result.getType().exists())) {
- synchronized (annotations) {
+ synchronized (this) {
annotations.remove(fullyQualifiedName);
}
result = null;
@@ -426,7 +414,7 @@
if(r != null) {
result = r;
//4. Store result for the case if used project is cleaned.
- synchronized (usedAnnotations) {
+ synchronized (this) {
usedAnnotations.put(fullyQualifiedName, result);
}
break;
@@ -438,7 +426,7 @@
// The result may be out-of-date until used project is rebuilt.
result = usedAnnotations.get(fullyQualifiedName);
if(!result.getType().exists()) {
- synchronized (usedAnnotations) {
+ synchronized (this) {
usedAnnotations.remove(fullyQualifiedName);
}
result = null;
@@ -455,22 +443,18 @@
*
* @return
*/
- public List<AnnotationDefinition> getAllAnnotations() {
+ public synchronized List<AnnotationDefinition> getAllAnnotations() {
List<AnnotationDefinition> result = new ArrayList<AnnotationDefinition>();
//1. Add annotations loaded by this project.
- synchronized (annotations) {
- result.addAll(annotations.values());
- }
+ result.addAll(annotations.values());
//2. Add stored annotations loaded by used projects. They may be out-of-date.
- synchronized (usedAnnotations) {
- result.addAll(usedAnnotations.values());
- }
+ result.addAll(usedAnnotations.values());
return result;
}
public List<TypeDefinition> getTypeDefinitions() {
List<TypeDefinition> result = new ArrayList<TypeDefinition>();
- synchronized (typeDefinitions) {
+ synchronized (this) {
result.addAll(typeDefinitions.values());
}
for (IDefinitionContextExtension e: extensions) {
@@ -482,7 +466,7 @@
public Set<BeansXMLDefinition> getBeansXMLDefinitions() {
Set<BeansXMLDefinition> result = new HashSet<BeansXMLDefinition>();
- synchronized (beanXMLs) {
+ synchronized (this) {
result.addAll(beanXMLs.values());
}
return result;
@@ -505,15 +489,37 @@
public void veto(IType type) {
TypeDefinition d = typeDefinitions.get(type.getFullyQualifiedName());
- if(d != null) d.veto();
-
+ if(d != null) {
+ d.veto();
+ } else {
+ vetoedTypes.add(type.getFullyQualifiedName());
+ }
}
public void unveto(IType type) {
TypeDefinition d = typeDefinitions.get(type.getFullyQualifiedName());
- if(d != null) d.unveto();
+ if(d != null) {
+ d.unveto();
+ } else {
+ vetoedTypes.remove(type.getFullyQualifiedName());
+ }
}
+ public Set<String> getVetoedTypes() {
+ return vetoedTypes;
+ }
+
+ /**
+ * Returns true only if type was requested by this project to be vetoed, but its definition belongs to
+ * another project, where it ma bey not vetoed.
+ * @param type
+ * @return
+ */
+ public boolean isVetoedTypeFromUsedProject(IType type) {
+ TypeDefinition d = typeDefinitions.get(type.getFullyQualifiedName());
+ return d == null && vetoedTypes.contains(type.getFullyQualifiedName());
+ }
+
public void addDependency(IPath source, IPath target) {
dependencies.addDependency(source, target);
}
12 years, 7 months
JBoss Tools SVN: r35160 - in trunk/bpel: features/org.jboss.tools.bpel.source.feature and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-29 12:43:24 -0400 (Thu, 29 Sep 2011)
New Revision: 35160
Added:
trunk/bpel/features/org.jboss.tools.bpel.source.feature/pom.xml
trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/
trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/.cvsignore
trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/.project
trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/build.properties
trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/feature.properties
trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/feature.xml
trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/license.html
trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/pom.xml
Removed:
trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.cvsignore
trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.project
trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/build.properties
trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.properties
trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.xml
trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/license.html
Modified:
trunk/bpel/features/org.jboss.tools.bpel.source.feature/feature.properties
trunk/bpel/features/org.jboss.tools.bpel.source.feature/feature.xml
trunk/bpel/features/org.jboss.tools.bpel.source.feature/license.html
trunk/bpel/features/pom.xml
trunk/bpel/site/site.xml
Log:
https://issues.jboss.org/browse/JBDS-1810 fix source features and add missing features to update site
Modified: trunk/bpel/features/org.jboss.tools.bpel.source.feature/feature.properties
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.source.feature/feature.properties 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/org.jboss.tools.bpel.source.feature/feature.properties 2011-09-29 16:43:24 UTC (rev 35160)
@@ -6,7 +6,7 @@
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=JBoss BPEL Editor SDK
+description=JBoss BPEL Editor source
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
Modified: trunk/bpel/features/org.jboss.tools.bpel.source.feature/feature.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.source.feature/feature.xml 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/org.jboss.tools.bpel.source.feature/feature.xml 2011-09-29 16:43:24 UTC (rev 35160)
@@ -20,5 +20,6 @@
%license
</license>
- <includes id="org.jboss.tools.bpel.source.feature" version="0.0.0"/>
+ <plugin id="org.jboss.tools.bpel.runtimes.source" download-size="0" install-size="0" version="0.0.0"/>
+
</feature>
Modified: trunk/bpel/features/org.jboss.tools.bpel.source.feature/license.html
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.source.feature/license.html 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/org.jboss.tools.bpel.source.feature/license.html 2011-09-29 16:43:24 UTC (rev 35160)
@@ -11,4 +11,4 @@
Raleigh NC 27606 USA.
</p>
</body>
-</html>
\ No newline at end of file
+</html>
Added: trunk/bpel/features/org.jboss.tools.bpel.source.feature/pom.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.source.feature/pom.xml (rev 0)
+++ trunk/bpel/features/org.jboss.tools.bpel.source.feature/pom.xml 2011-09-29 16:43:24 UTC (rev 35160)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <groupId>org.jboss.tools.bpel</groupId>
+ <artifactId>features</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.bpel.features</groupId>
+ <artifactId>org.jboss.tools.bpel.source.feature</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
Copied: trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/.cvsignore (from rev 35159, trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.cvsignore)
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/.cvsignore (rev 0)
+++ trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/.cvsignore 2011-09-29 16:43:24 UTC (rev 35160)
@@ -0,0 +1 @@
+build.xml
Copied: trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/.project (from rev 35159, trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.project)
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/.project (rev 0)
+++ trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/.project 2011-09-29 16:43:24 UTC (rev 35160)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.bpel.test.source.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Copied: trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/build.properties (from rev 35159, trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/build.properties)
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/build.properties (rev 0)
+++ trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/build.properties 2011-09-29 16:43:24 UTC (rev 35160)
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
Copied: trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/feature.properties (from rev 35159, trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.properties)
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/feature.properties (rev 0)
+++ trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/feature.properties 2011-09-29 16:43:24 UTC (rev 35160)
@@ -0,0 +1,27 @@
+# properties file for org.jboss.tools.bpel.*.test*
+featureName=JBoss Tools - Tests - JBoss BPEL Editor source
+featureProvider=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+# "description" property - description of the feature
+description=JBoss Tools - Tests - JBoss BPEL Editor source
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
+
Copied: trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/feature.xml (from rev 35159, trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.xml)
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/feature.xml (rev 0)
+++ trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/feature.xml 2011-09-29 16:43:24 UTC (rev 35160)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.bpel.test.source.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%featureProvider"
+ image="eclipse_update_120.jpg">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
+ <import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible"/>
+ <import plugin="org.apache.ant"/>
+ <import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible"/>
+
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.ui.ide.application"/>
+
+ <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.app"/>
+ <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
+ <import plugin="org.junit" version="3.8.2" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin id="org.jboss.tools.bpel.ui.test.source" download-size="0" install-size="0" version="0.0.0"/>
+ <plugin id="org.jboss.tools.bpel.ui.bot.test.source" download-size="0" install-size="0" version="0.0.0"/>
+
+</feature>
Copied: trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/license.html (from rev 35159, trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/license.html)
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/license.html (rev 0)
+++ trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/license.html 2011-09-29 16:43:24 UTC (rev 35160)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
Added: trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/pom.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/pom.xml (rev 0)
+++ trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/pom.xml 2011-09-29 16:43:24 UTC (rev 35160)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <groupId>org.jboss.tools.bpel</groupId>
+ <artifactId>features</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.bpel.features</groupId>
+ <artifactId>org.jboss.tools.bpel.test.source.feature</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
Deleted: trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.cvsignore
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.cvsignore 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.cvsignore 2011-09-29 16:43:24 UTC (rev 35160)
@@ -1 +0,0 @@
-build.xml
Deleted: trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.project
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.project 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/.project 2011-09-29 16:43:24 UTC (rev 35160)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.bpel.tests.source.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
Deleted: trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/build.properties
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/build.properties 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/build.properties 2011-09-29 16:43:24 UTC (rev 35160)
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- license.html
Deleted: trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.properties
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.properties 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.properties 2011-09-29 16:43:24 UTC (rev 35160)
@@ -1,27 +0,0 @@
-# properties file for org.jboss.tools.bpel.*.test*
-featureName=JBoss Tools - Tests - JBoss BPEL Editor source
-featureProvider=JBoss by Red Hat
-
-# "updateSiteName" property - label for the update site
-updateSiteName=JBossTools Update Site
-
-# "description" property - description of the feature
-description=JBoss Tools - Tests - JBoss BPEL Editor SDK (includes sources and dependencies)
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# START NON-TRANSLATABLE
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
-# END NON-TRANSLATABLE
-########### end of license property ##########################################
-
Deleted: trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.xml 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/feature.xml 2011-09-29 16:43:24 UTC (rev 35160)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.bpel.tests.source.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%featureProvider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
- <import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible"/>
- <import plugin="org.apache.ant"/>
- <import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible"/>
-
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.ide.application"/>
-
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.equinox.app"/>
- <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
- <import plugin="org.junit" version="3.8.2" match="greaterOrEqual"/>
- </requires>
-
- <plugin
- id="org.jboss.tools.bpel.ui.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
Deleted: trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/license.html
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/license.html 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/org.jboss.tools.bpel.tests.source.feature/license.html 2011-09-29 16:43:24 UTC (rev 35160)
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<body>
-<p>Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
-</p>
-</body>
-</html>
Modified: trunk/bpel/features/pom.xml
===================================================================
--- trunk/bpel/features/pom.xml 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/features/pom.xml 2011-09-29 16:43:24 UTC (rev 35160)
@@ -13,7 +13,9 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.bpel.feature</module>
+ <module>org.jboss.tools.bpel.source.feature</module>
<module>org.jboss.tools.bpel.test.feature</module>
+ <module>org.jboss.tools.bpel.test.source.feature</module>
</modules>
</project>
Modified: trunk/bpel/site/site.xml
===================================================================
--- trunk/bpel/site/site.xml 2011-09-29 16:21:03 UTC (rev 35159)
+++ trunk/bpel/site/site.xml 2011-09-29 16:43:24 UTC (rev 35160)
@@ -5,11 +5,12 @@
<category-def label="JBoss Tools bpel Nightly Build Update Site" name="JBoss Tools bpel Nightly Build Update Site">
<description>JBoss Tools bpel Nightly Build Update Site: contains all features in this build.</description>
</category-def>
- <!-- OLD JBT feature has been replaced by Eclipse.org version
<feature url="features/org.jboss.tools.bpel.feature_0.0.0.jar" id="org.jboss.tools.bpel.feature" version="0.0.0">
<category name="JBoss Tools bpel Nightly Build Update Site"/>
</feature>
- -->
+ <feature url="features/org.jboss.tools.bpel.source.feature_0.0.0.jar" id="org.jboss.tools.bpel.source.feature" version="0.0.0">
+ <category name="JBoss Tools bpel Nightly Build Update Site"/>
+ </feature>
<feature url="features/org.eclipse.bpel.feature_0.0.0.jar" id="org.eclipse.bpel.feature" version="0.0.0">
<category name="JBoss Tools bpel Nightly Build Update Site"/>
</feature>
@@ -25,5 +26,8 @@
<feature url="features/org.jboss.tools.bpel.test.feature_0.0.0.jar" id="org.jboss.tools.bpel.test.feature" version="0.0.0">
<category name="JBoss Tools bpel Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.jboss.tools.bpel.test.source.feature_0.0.0.jar" id="org.jboss.tools.bpel.test.source.feature" version="0.0.0">
+ <category name="JBoss Tools bpel Nightly Build Update Site"/>
+ </feature>
</site>
12 years, 7 months