JBoss Tools SVN: r22386 - in branches/jbosstools-3.1.x/portlet/plugins: org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-27 14:21:19 -0400 (Thu, 27 May 2010)
New Revision: 22386
Modified:
branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java
branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java
Log:
https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds richfaces fragments to web.xml
Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
===================================================================
--- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2010-05-27 18:15:06 UTC (rev 22385)
+++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2010-05-27 18:21:19 UTC (rev 22386)
@@ -117,7 +117,7 @@
public void setAddRichfacesCapabilities(boolean addRichfacesCapabilities) {
boolean oldValue = this.addRichfacesCapabilities;
this.addRichfacesCapabilities = addRichfacesCapabilities;
- notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, addRichfacesCapabilities);
+ notifyListeners(IPortletConstants.RICHFACES_CAPABILITIES, oldValue, addRichfacesCapabilities);
updatePreferences();
}
public String getRichfacesType() {
@@ -126,7 +126,7 @@
public void setRichfacesType(String richfacesType) {
String oldValue = this.richfacesType;
this.richfacesType = richfacesType;
- notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richfacesType);
+ notifyListeners(IPortletConstants.RICHFACES_LIBRARIES_TYPE, oldValue, richfacesType);
updatePreferences();
}
public String getRichfacesRuntime() {
@@ -135,7 +135,7 @@
public void setRichfacesRuntime(String richfacesRuntime) {
String oldValue = this.richfacesRuntime;
this.richfacesRuntime = richfacesRuntime;
- notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richfacesRuntime);
+ notifyListeners(IPortletConstants.RICHFACES_RUNTIME, oldValue, richfacesRuntime);
updatePreferences();
}
}
Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java
===================================================================
--- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java 2010-05-27 18:15:06 UTC (rev 22385)
+++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java 2010-05-27 18:21:19 UTC (rev 22386)
@@ -92,6 +92,7 @@
addRichFacesLibraries.setSelection(richFacesLibrariesSelected);
enableRichfacesLibraries();
richFacesLibraryCombo.select(0);
+ config.setRichfacesType(richFacesLibraryCombo.getText());
}
private void configureRichfacesCombo() {
Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java
===================================================================
--- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java 2010-05-27 18:15:06 UTC (rev 22385)
+++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java 2010-05-27 18:21:19 UTC (rev 22386)
@@ -35,7 +35,7 @@
@Override
protected List<String> getRichfacesTypes() {
List<String> types = new ArrayList<String>();
- types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE);
+ //types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE);
types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_RICHFACES);
return types;
}
13 years, 11 months
JBoss Tools SVN: r22385 - in trunk/portlet/plugins: org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-27 14:15:06 -0400 (Thu, 27 May 2010)
New Revision: 22385
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java
trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java
Log:
https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds richfaces fragments to web.xml
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2010-05-27 18:08:45 UTC (rev 22384)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2010-05-27 18:15:06 UTC (rev 22385)
@@ -117,7 +117,7 @@
public void setAddRichfacesCapabilities(boolean addRichfacesCapabilities) {
boolean oldValue = this.addRichfacesCapabilities;
this.addRichfacesCapabilities = addRichfacesCapabilities;
- notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, addRichfacesCapabilities);
+ notifyListeners(IPortletConstants.RICHFACES_CAPABILITIES, oldValue, addRichfacesCapabilities);
updatePreferences();
}
public String getRichfacesType() {
@@ -126,7 +126,7 @@
public void setRichfacesType(String richfacesType) {
String oldValue = this.richfacesType;
this.richfacesType = richfacesType;
- notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richfacesType);
+ notifyListeners(IPortletConstants.RICHFACES_LIBRARIES_TYPE, oldValue, richfacesType);
updatePreferences();
}
public String getRichfacesRuntime() {
@@ -135,7 +135,7 @@
public void setRichfacesRuntime(String richfacesRuntime) {
String oldValue = this.richfacesRuntime;
this.richfacesRuntime = richfacesRuntime;
- notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richfacesRuntime);
+ notifyListeners(IPortletConstants.RICHFACES_RUNTIME, oldValue, richfacesRuntime);
updatePreferences();
}
}
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java 2010-05-27 18:08:45 UTC (rev 22384)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java 2010-05-27 18:15:06 UTC (rev 22385)
@@ -92,6 +92,7 @@
addRichFacesLibraries.setSelection(richFacesLibrariesSelected);
enableRichfacesLibraries();
richFacesLibraryCombo.select(0);
+ config.setRichfacesType(richFacesLibraryCombo.getText());
}
private void configureRichfacesCombo() {
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java 2010-05-27 18:08:45 UTC (rev 22384)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java 2010-05-27 18:15:06 UTC (rev 22385)
@@ -35,7 +35,7 @@
@Override
protected List<String> getRichfacesTypes() {
List<String> types = new ArrayList<String>();
- types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE);
+ //types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE);
types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_RICHFACES);
return types;
}
13 years, 11 months
JBoss Tools SVN: r22384 - in trunk/bpel/plugins: org.eclipse.bpel.common.ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-05-27 14:08:45 -0400 (Thu, 27 May 2010)
New Revision: 22384
Modified:
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java
trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-6006
undo a couple little mistakes from previous commits (21557)
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-05-27 17:25:55 UTC (rev 22383)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-05-27 18:08:45 UTC (rev 22384)
@@ -194,7 +194,7 @@
for (IFile file : allFiles) {
- if (file.getFileExtension().equalsIgnoreCase("wsdl")) { //$NON-NLS-1$
+ if ("wsdl".equalsIgnoreCase(file.getFileExtension())) { //$NON-NLS-1$
// load it
Definition currentDef = loadWSDL(file, resourceSet);
// stuff it in wsdlFiles
Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml 2010-05-27 17:25:55 UTC (rev 22383)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml 2010-05-27 18:08:45 UTC (rev 22384)
@@ -44,4 +44,15 @@
name="org.eclipse.bpel.common.ui.lineNumInObject">
</attribute>
</extension>
+ <extension
+ point="org.eclipse.core.runtime.contentTypes">
+ <content-type
+ base-type="org.eclipse.core.runtime.xml"
+ default-charset="UTF-8"
+ file-extensions="bpel,bpel2"
+ id="org.eclipse.bpel.common.ui.bpel.content-type"
+ name="BPEL Process"
+ priority="normal"/>
+ </extension>
+
</plugin>
13 years, 11 months
JBoss Tools SVN: r22383 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-27 13:25:55 -0400 (Thu, 27 May 2010)
New Revision: 22383
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingDecoratorBroken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingInterceptorBroken.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule: interceptor or decorator is annotated @Specializes (Non-Portable behavior)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2010-05-27 17:22:32 UTC (rev 22382)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2010-05-27 17:25:55 UTC (rev 22383)
@@ -36,5 +36,7 @@
defaultPreferences.put(CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, CDIPreferences.WARNING);
+ defaultPreferences.put(CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferences.WARNING);
+ defaultPreferences.put(CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferences.WARNING);
}
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-27 17:22:32 UTC (rev 22382)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-27 17:25:55 UTC (rev 22383)
@@ -351,6 +351,19 @@
}
private void validateSpecializingBean(IBean bean) {
+ /*
+ * 4.3.1. Direct and indirect specialization
+ * - decorator or interceptor is annotated @Specializes (Non-Portable behavior)
+ */
+ IAnnotationDeclaration specializesDeclaration = bean.getSpecializesAnnotationDeclaration();
+ if(specializesDeclaration!=null) {
+ if(bean instanceof IDecorator) {
+ addError(CDIValidationMessages.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, specializesDeclaration, bean.getResource());
+ } else if(bean instanceof IInterceptor) {
+ addError(CDIValidationMessages.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, specializesDeclaration, bean.getResource());
+ }
+ }
+
IBean specializingBean = bean.getSpecializedBean();
if(specializingBean==null) {
return;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt 2010-05-27 17:22:32 UTC (rev 22382)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt 2010-05-27 17:25:55 UTC (rev 22383)
@@ -117,10 +117,6 @@
- injection point other than injected field declares a @Named annotation that
does not specify the value member
-
-
-
-
4.3.1. Direct and indirect specialization
- X specializes Y but does not have some bean type of Y
- X specializes Y and Y has a name and X declares a name explicitly, using @Named
@@ -129,9 +125,6 @@
-
-
-
5.2.2. Legal injection point types
- injection point type is a type variable
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-05-27 17:22:32 UTC (rev 22382)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-05-27 17:25:55 UTC (rev 22383)
@@ -127,8 +127,8 @@
{CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label},
{CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label},
{CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label},
-// {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label},
-// {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label},
+ {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label},
+ {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label},
},
CDICorePlugin.PLUGIN_ID
);
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingDecoratorBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingDecoratorBroken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingDecoratorBroken.java 2010-05-27 17:25:55 UTC (rev 22383)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.specialization;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Specializes;
+import javax.inject.Inject;
+
+@Decorator
+@Specializes
+public class SpecializingDecoratorBroken extends Farmer {
+
+ @Inject @Delegate @Any Object logger;
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingDecoratorBroken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingInterceptorBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingInterceptorBroken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingInterceptorBroken.java 2010-05-27 17:25:55 UTC (rev 22383)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.specialization;
+
+import javax.enterprise.inject.Specializes;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@Specializes
+public class SpecializingInterceptorBroken extends Farmer {
+
+ @AroundInvoke
+ public Object alwaysReturnThis(InvocationContext ctx) throws Exception {
+ return ctx.proceed();
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/SpecializingInterceptorBroken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-27 17:22:32 UTC (rev 22382)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-27 17:25:55 UTC (rev 22383)
@@ -864,6 +864,28 @@
}
/**
+ * 4.3.1. Direct and indirect specialization
+ * - interceptor is annotated @Specializes (Non-Portable behavior)
+ *
+ * @throws Exception
+ */
+ public void testSpecializingInterceptor() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/specialization/SpecializingInterceptorBroken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_ANNOTATED_SPECIALIZES, 9);
+ }
+
+ /**
+ * 4.3.1. Direct and indirect specialization
+ * - decorator is annotated @Specializes (Non-Portable behavior)
+ *
+ * @throws Exception
+ */
+ public void testSpecializingDecorator() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/specialization/SpecializingDecoratorBroken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_ANNOTATED_SPECIALIZES, 10);
+ }
+
+ /**
* 10.4.2. Declaring an observer method
* - method has more than one parameter annotated @Observes
*
13 years, 11 months
JBoss Tools SVN: r22382 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-27 13:22:32 -0400 (Thu, 27 May 2010)
New Revision: 22382
Modified:
trunk/build/publish.sh
Log:
wrap everything with an if-exists-then-do
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-05-27 17:10:37 UTC (rev 22381)
+++ trunk/build/publish.sh 2010-05-27 17:22:32 UTC (rev 22382)
@@ -7,15 +7,24 @@
# define target zip filename for inclusion in uberbuilder's bucky aggregator
SNAPNAME=${JOB_NAME}-Update-SNAPSHOT.zip
-# copy into workspace for archiving
rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
-rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME}/${ZIPNAME}
-rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${JOB_NAME}/
+if [[ -f ${WORKSPACE}/*/site/target/site.zip ]]; then
+ # copy into workspace for archiving
+ rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME}/${ZIPNAME}
+ # copy into workspace for access by bucky aggregator
+ rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME}
+fi
-# copy into workspace for access by bucky aggregator
-rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME}
+# if zips exist produced & renamed by ant script, copy them too
+if [[ -f ${WORKSPACE}/*/*/site/target/*Update*.zip ]]; then
+ rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${JOB_NAME}/
+fi
# publish to download.jboss.org
if [[ $DESTINATION == "" ]]; then DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools"; fi
-rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/nightly/3.2.helios/
-rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/
+if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then
+ rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/nightly/3.2.helios/
+fi
+if [[ -d ${WORKSPACE}/site/${SNAPNAME} ]]; then
+ rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/
+fi
\ No newline at end of file
13 years, 11 months
JBoss Tools SVN: r22381 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-27 13:10:37 -0400 (Thu, 27 May 2010)
New Revision: 22381
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule: X bean specializes Y bean and Y has a name and X declares a name explicitly, using @Named
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-27 16:41:38 UTC (rev 22380)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-27 17:10:37 UTC (rev 22381)
@@ -334,6 +334,8 @@
if (bean instanceof IClassBean) {
validateClassBean((IClassBean) bean);
}
+
+ validateSpecializingBean(bean);
}
private void validateClassBean(IClassBean bean) {
@@ -346,14 +348,18 @@
}
validateMixedClassBean(bean);
validateConstructors(bean);
- validateSpecializingBean(bean);
}
- private void validateSpecializingBean(IClassBean bean) {
+ private void validateSpecializingBean(IBean bean) {
IBean specializingBean = bean.getSpecializedBean();
if(specializingBean==null) {
return;
}
+ String beanClassName = bean.getBeanClass().getElementName();
+ String beanName = bean instanceof IBeanMethod?beanClassName + "." + ((IBeanMethod)bean).getSourceMember().getElementName() + "()":beanClassName;
+ String specializingBeanClassName = specializingBean.getBeanClass().getElementName();
+ String specializingBeanName = specializingBean instanceof IBeanMethod?specializingBeanClassName + "." + ((IBeanMethod)specializingBean).getSourceMember().getElementName() + "()":specializingBeanClassName;
+
/*
* 4.3.1. Direct and indirect specialization
* - X specializes Y but does not have some bean type of Y
@@ -370,10 +376,22 @@
}
if(!found) {
addError(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN,
- new String[]{bean.getBeanClass().getElementName(), specializingBean.getBeanClass().getElementName(), specializingType.getType().getElementName()},
+ new String[]{beanName, specializingBeanName, specializingType.getType().getElementName()},
bean.getSpecializesAnnotationDeclaration(), bean.getResource());
}
}
+ /*
+ * 4.3.1. Direct and indirect specialization
+ * - X specializes Y and Y has a name and X declares a name explicitly, using @Named
+ */
+ if(specializingBean.getName()!=null) {
+ IAnnotationDeclaration nameDeclaration = bean.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ if(nameDeclaration!=null) {
+ addError(CDIValidationMessages.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN,
+ new String[]{beanName, specializingBeanName},
+ nameDeclaration, bean.getResource());
+ }
+ }
}
private void validateConstructors(IClassBean bean) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-05-27 16:41:38 UTC (rev 22380)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-05-27 17:10:37 UTC (rev 22381)
@@ -126,7 +126,7 @@
{CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label},
{CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label},
{CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label},
-// {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label},
+ {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label},
// {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label},
// {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label},
},
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-27 16:41:38 UTC (rev 22380)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-27 17:10:37 UTC (rev 22381)
@@ -853,6 +853,17 @@
}
/**
+ * 4.3.1. Direct and indirect specialization
+ * - X specializes Y and Y has a name and X declares a name explicitly, using @Named
+ *
+ * @throws Exception
+ */
+ public void testSpecializingAndSpecializedBeanHasName() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/HighSchool_Broken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, MessageFormat.format(CDIValidationMessages.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, "HighSchool_Broken.getStarPupil()", "School.getStarPupil()"), 25);
+ }
+
+ /**
* 10.4.2. Declaring an observer method
* - method has more than one parameter annotated @Observes
*
13 years, 11 months
JBoss Tools SVN: r22380 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-27 12:41:38 -0400 (Thu, 27 May 2010)
New Revision: 22380
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Farmer.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Landowner.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/MissingTypeBeanBroken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Simple.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule: - X specializes Y but does not have some bean type of Y
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-27 16:05:29 UTC (rev 22379)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-27 16:41:38 UTC (rev 22380)
@@ -346,8 +346,36 @@
}
validateMixedClassBean(bean);
validateConstructors(bean);
+ validateSpecializingBean(bean);
}
+ private void validateSpecializingBean(IClassBean bean) {
+ IBean specializingBean = bean.getSpecializedBean();
+ if(specializingBean==null) {
+ return;
+ }
+ /*
+ * 4.3.1. Direct and indirect specialization
+ * - X specializes Y but does not have some bean type of Y
+ */
+ Set<IParametedType> beanTypes = bean.getLegalTypes();
+ Set<IParametedType> specializingBeanTypes = specializingBean.getLegalTypes();
+ for (IParametedType specializingType : specializingBeanTypes) {
+ boolean found = false;
+ for (IParametedType type : beanTypes) {
+ if(specializingType.getType().getFullyQualifiedName().equals(type.getType().getFullyQualifiedName())) {
+ found = true;
+ break;
+ }
+ }
+ if(!found) {
+ addError(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN,
+ new String[]{bean.getBeanClass().getElementName(), specializingBean.getBeanClass().getElementName(), specializingType.getType().getElementName()},
+ bean.getSpecializesAnnotationDeclaration(), bean.getResource());
+ }
+ }
+ }
+
private void validateConstructors(IClassBean bean) {
Set<IBeanMethod> constructors = bean.getBeanConstructors();
if(constructors.size()>1) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-05-27 16:05:29 UTC (rev 22379)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-05-27 16:41:38 UTC (rev 22380)
@@ -76,8 +76,8 @@
ILLEGAL_SPECIALIZING_SESSION_BEAN=Session bean class annotated @Specializes does not directly extend the bean class of another session bean
ILLEGAL_SPECIALIZING_PRODUCER_STATIC=Producer method annotated @Specializes is static
ILLEGAL_SPECIALIZING_PRODUCER_OVERRIDE=Producer method annotated @Specializes does not directly override another producer method
-MISSING_TYPE_IN_SPECIALIZING_BEAN=Bean X specializes Y but does not have some bean type of Y
-CONFLICTING_NAME_IN_SPECIALIZING_BEAN=Bean X specializes Y and Y has a name and X declares a name explicitly, using @Named
+MISSING_TYPE_IN_SPECIALIZING_BEAN=Bean {0} specializes {1} but does not have {2} bean type of {1}
+CONFLICTING_NAME_IN_SPECIALIZING_BEAN=Bean {0} specializes {1} and {1} has a name and {0} declares a name explicitly, using @Named
INTERCEPTOR_ANNOTATED_SPECIALIZES=Interceptor is annotated @Specializes
DECORATOR_ANNOTATED_SPECIALIZES=Decorator is annotated @Specializes
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-05-27 16:05:29 UTC (rev 22379)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-05-27 16:41:38 UTC (rev 22380)
@@ -125,7 +125,7 @@
{CDIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label},
{CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label},
{CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label},
-// {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label},
+ {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label},
// {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label},
// {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label},
// {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label},
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Farmer.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Farmer.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Farmer.java 2010-05-27 16:41:38 UTC (rev 22380)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.specialization;
+
+import javax.inject.Named;
+
+@Landowner
+@Named
+class Farmer implements Simple {
+
+ public String getClassName() {
+ return Farmer.class.getName();
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Farmer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Landowner.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Landowner.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Landowner.java 2010-05-27 16:41:38 UTC (rev 22380)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.specialization;
+
+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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+@interface Landowner {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Landowner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/MissingTypeBeanBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/MissingTypeBeanBroken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/MissingTypeBeanBroken.java 2010-05-27 16:41:38 UTC (rev 22380)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.specialization;
+
+import javax.enterprise.inject.Specializes;
+import javax.enterprise.inject.Typed;
+
+@Specializes
+(a)Typed(MissingTypeBeanBroken.class)
+public class MissingTypeBeanBroken extends Farmer {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/MissingTypeBeanBroken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Simple.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Simple.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Simple.java 2010-05-27 16:41:38 UTC (rev 22380)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.specialization;
+
+public interface Simple {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/specialization/Simple.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-27 16:05:29 UTC (rev 22379)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-27 16:41:38 UTC (rev 22380)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
+import java.text.MessageFormat;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
@@ -838,6 +840,19 @@
}
/**
+ * 4.3.1. Direct and indirect specialization
+ * - X specializes Y but does not have some bean type of Y
+ *
+ * @throws Exception
+ */
+ public void testBeanDoesNotHaveSomeTypeOfSpecializedBean() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/specialization/MissingTypeBeanBroken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, MessageFormat.format(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Farmer"), 6);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, MessageFormat.format(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Simple"), 6);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, MessageFormat.format(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Object"), 6);
+ }
+
+ /**
* 10.4.2. Declaring an observer method
* - method has more than one parameter annotated @Observes
*
13 years, 11 months
JBoss Tools SVN: r22379 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-27 12:05:29 -0400 (Thu, 27 May 2010)
New Revision: 22379
Modified:
trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF
Log:
drop range from manifest
Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF 2010-05-27 15:57:11 UTC (rev 22378)
+++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF 2010-05-27 16:05:29 UTC (rev 22379)
@@ -6,12 +6,12 @@
Bundle-Activator: org.jboss.tools.drools.ui.bot.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.jboss.tools.jst.ui.bot.test;bundle-version="1.0.0",
+ org.jboss.tools.jst.ui.bot.test,
org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
org.junit4;bundle-version="4.5.0",
- org.jboss.tools.ui.bot.ext;bundle-version="1.0.0",
+ org.jboss.tools.ui.bot.ext,
org.drools.eclipse;bundle-version="5.1.0",
org.eclipse.swtbot.eclipse.gef.finder;bundle-version="0.1.0",
org.apache.log4j;bundle-version="1.2.13"
13 years, 11 months
JBoss Tools SVN: r22378 - trunk/seam/tests/org.jboss.tools.seam.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-27 11:57:11 -0400 (Thu, 27 May 2010)
New Revision: 22378
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml
Log:
fix pom/manifest versions
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-05-27 15:47:46 UTC (rev 22377)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-05-27 15:57:11 UTC (rev 22378)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.seam.ui.bot.test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>
13 years, 11 months
JBoss Tools SVN: r22377 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-27 11:47:46 -0400 (Thu, 27 May 2010)
New Revision: 22377
Modified:
trunk/build/build.xml
Log:
lowercase the prefix on update site zips so they're consistent w/ the other ones
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-05-27 15:47:31 UTC (rev 22376)
+++ trunk/build/build.xml 2010-05-27 15:47:46 UTC (rev 22377)
@@ -949,7 +949,7 @@
<equals arg1="@{COMPONENT}" arg2="site" />
<then>
<var name="destinationZip"
- value="${WORKINGDIR}/(a){COMPONENT}/site/target/JBossTools-ALL-Update-SNAPSHOT.zip"
+ value="${WORKINGDIR}/(a){COMPONENT}/site/target/jbosstools-ALL-Update-SNAPSHOT.zip"
/>
</then>
<else>
@@ -964,7 +964,7 @@
</else>
</if>
<var name="destinationZip"
- value="${WORKINGDIR}/(a){COMPONENT}/site/target/JBossTools-${COMPONENT.name}-Update-SNAPSHOT.zip"
+ value="${WORKINGDIR}/(a){COMPONENT}/site/target/jbosstools-${COMPONENT.name}-Update-SNAPSHOT.zip"
/>
</else>
</if>
@@ -979,7 +979,7 @@
<for param="updateZip">
<path>
- <fileset dir="${WORKINGDIR}/@{COMPONENT}" includes="**/JBossTools*Update*.zip" />
+ <fileset dir="${WORKINGDIR}/@{COMPONENT}" includes="**/jbosstools*Update*.zip" />
</path>
<sequential>
<propertyregex property="updateZip"
@@ -1095,7 +1095,7 @@
<equals arg1="${update.site.path}" arg2="site" />
<then>
<var name="destinationZip"
- value="${WORKINGDIR}/${update.site.path}/target/JBossTools-ALL-Update-SNAPSHOT.zip"
+ value="${WORKINGDIR}/${update.site.path}/target/jbosstools-ALL-Update-SNAPSHOT.zip"
/>
</then>
<else>
@@ -1110,7 +1110,7 @@
</else>
</if>
<var name="destinationZip"
- value="${WORKINGDIR}/${update.site.path}/target/JBossTools-${COMPONENT.name}-Update-SNAPSHOT.zip"
+ value="${WORKINGDIR}/${update.site.path}/target/jbosstools-${COMPONENT.name}-Update-SNAPSHOT.zip"
/>
</else>
</if>
13 years, 11 months