JBoss Tools SVN: r24628 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-01 16:52:20 -0400 (Wed, 01 Sep 2010)
New Revision: 24628
Modified:
trunk/build/aggregate/site/pom.xml
Log:
rename build jobs per dgolovin's needs
Modified: trunk/build/aggregate/site/pom.xml
===================================================================
--- trunk/build/aggregate/site/pom.xml 2010-09-01 20:11:01 UTC (rev 24627)
+++ trunk/build/aggregate/site/pom.xml 2010-09-01 20:52:20 UTC (rev 24628)
@@ -16,12 +16,11 @@
<properties>
<!-- add more inputRepo# here, then reference below; need variables so
that these can be referred to in Ant script later -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</inputRepo1>
- <inputRepo2>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</inputRepo2>
- <inputRepo3>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</inputRepo3>
- <inputRepo4>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</inputRepo4>
- <inputRepo5>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</inputRepo5>
- <inputRepos>1,2,3,4,5</inputRepos>
+ <inputRepo1>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</inputRepo1>
+ <inputRepo2>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</inputRepo3>
+ <inputRepo3>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</inputRepo4>
+ <inputRepo4>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</inputRepo5>
+ <inputRepos>1,2,3,4</inputRepos>
</properties>
<build>
@@ -41,7 +40,6 @@
<property name="inputRepo2" value="${inputRepo2}" />
<property name="inputRepo3" value="${inputRepo3}" />
<property name="inputRepo4" value="${inputRepo4}" />
- <property name="inputRepo5" value="${inputRepo5}" />
<property name="inputRepos" value="${inputRepos}" />
<!-- called AFTER generating update site + zip to add in extra content -->
@@ -115,14 +113,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <repository>
- <id>inputRepo5</id>
- <url>${inputRepo5}/all/repo/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
</repositories>
<profiles>
15 years, 7 months
JBoss Tools SVN: r24627 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-01 16:11:01 -0400 (Wed, 01 Sep 2010)
New Revision: 24627
Modified:
trunk/build/publish.sh
Log:
https://jira.jboss.org/browse/JBIDE-6969 add note re: using 12-digit timestamp instead of hudson-generated build ID and build number
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-09-01 20:05:22 UTC (rev 24626)
+++ trunk/build/publish.sh 2010-09-01 20:11:01 UTC (rev 24627)
@@ -2,6 +2,9 @@
# Hudson script used to publish Tycho-built p2 update sites
# NOTE: sources MUST be checked out into ${WORKSPACE}/sources
+# to use timestamp when naming dirs instead of ${BUILD_ID}-H${BUILD_NUMBER}, use:
+# BUILD_ID=2010-08-31_19-16-10; timestamp=$(echo $BUILD_ID | tr -d "_-"); timestamp=${timestamp:0:12}; echo $timestamp; # 201008311916
+
# where to create the stuff to publish
STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}
15 years, 7 months
JBoss Tools SVN: r24626 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-01 16:05:22 -0400 (Wed, 01 Sep 2010)
New Revision: 24626
Modified:
trunk/build/publish.sh
Log:
https://jira.jboss.org/browse/JBIDE-6969 aggr builds should now be in nightly/{trunk,jbosstools-3.2.0.x}/${timestamp-hudsonID}/, whereas everything else should be in 3.2.helios/ until I come up with a better dir name like "UPSTREAM" or "COMPONENTS"
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-09-01 19:12:32 UTC (rev 24625)
+++ trunk/build/publish.sh 2010-09-01 20:05:22 UTC (rev 24626)
@@ -8,7 +8,6 @@
# releases get named differently than snapshots
if [[ ${RELEASE} == "Yes" ]]; then
ZIPSUFFIX="${BUILD_ID}-H${BUILD_NUMBER}"
- STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}-${ZIPSUFFIX}
else
ZIPSUFFIX="SNAPSHOT"
fi
@@ -161,10 +160,23 @@
if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then
# publish build dir (including update sites/zips/logs/metadata
if [[ -d ${STAGINGDIR} ]]; then
- date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/; # create a new unique dir
- if [[ ${RELEASE} == "Yes" ]]; then
- date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/${JOB_NAME} # replace existing snapshot dir
+
+ # if an aggregate build, put output elsewhere on disk
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
+ if [[ $1 == "trunk" ]]; then
+ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/
+ else
+ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOB_NAME/.aggregate}/${BUILD_ID}-H${BUILD_NUMBER}/
+ fi
+ else
+ # if a release build, create a named dir
+ if [[ ${RELEASE} == "Yes" ]]; then
+ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/3.2.helios/${JOB_NAME}-${ZIPSUFFIX}/
+ fi
fi
+
+ # and create/replace a snapshot dir w/ static URL
+ date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/
fi
# extra publish step for aggregate update sites ONLY
@@ -182,4 +194,3 @@
if [[ -d ${WORKSPACE}/m2-repo/org/jboss/tools ]]; then
rm -rf ${WORKSPACE}/m2-repo/org/jboss/tools
fi
-
15 years, 7 months
JBoss Tools SVN: r24625 - workspace/mareshkau/xulrunner-1.9.1.2.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-01 15:12:32 -0400 (Wed, 01 Sep 2010)
New Revision: 24625
Added:
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx/
Removed:
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86/
Log:
https://jira.jboss.org/browse/JBIDE-6967
Copied: workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx (from rev 24624, workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86)
15 years, 7 months
JBoss Tools SVN: r24624 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-01 15:11:02 -0400 (Wed, 01 Sep 2010)
New Revision: 24624
Modified:
trunk/build/publish.sh
Log:
JBIDE-6968 fix publishing of snapshot dir (should only have one copy of update zip per component
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-09-01 19:10:51 UTC (rev 24623)
+++ trunk/build/publish.sh 2010-09-01 19:11:02 UTC (rev 24624)
@@ -163,7 +163,7 @@
if [[ -d ${STAGINGDIR} ]]; then
date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/; # create a new unique dir
if [[ ${RELEASE} == "Yes" ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/3.2.helios/${JOB_NAME}/ # update existing snapshot dir
+ date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/${JOB_NAME} # replace existing snapshot dir
fi
fi
15 years, 7 months
JBoss Tools SVN: r24623 - branches/jbosstools-3.2.0.M2/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-01 15:10:51 -0400 (Wed, 01 Sep 2010)
New Revision: 24623
Modified:
branches/jbosstools-3.2.0.M2/build/publish.sh
Log:
JBIDE-6968 fix publishing of snapshot dir (should only have one copy of update zip per component
Modified: branches/jbosstools-3.2.0.M2/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.0.M2/build/publish.sh 2010-09-01 19:10:45 UTC (rev 24622)
+++ branches/jbosstools-3.2.0.M2/build/publish.sh 2010-09-01 19:10:51 UTC (rev 24623)
@@ -163,7 +163,7 @@
if [[ -d ${STAGINGDIR} ]]; then
date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/; # create a new unique dir
if [[ ${RELEASE} == "Yes" ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/3.2.helios/${JOB_NAME}/ # update existing snapshot dir
+ date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/${JOB_NAME} # replace existing snapshot dir
fi
fi
15 years, 7 months
JBoss Tools SVN: r24622 - workspace/mareshkau/xulrunner-1.9.1.2.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-01 15:10:45 -0400 (Wed, 01 Sep 2010)
New Revision: 24622
Added:
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.carbon.macosx/
Removed:
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.carbon.macosx.x86/
Log:
https://jira.jboss.org/browse/JBIDE-6967
Copied: workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.carbon.macosx (from rev 24621, workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.carbon.macosx.x86)
15 years, 7 months
JBoss Tools SVN: r24621 - in workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-01 15:08:36 -0400 (Wed, 01 Sep 2010)
New Revision: 24621
Modified:
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86/.project
workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/browse/JBIDE-6967
Modified: workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86/.project
===================================================================
--- workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86/.project 2010-09-01 18:23:17 UTC (rev 24620)
+++ workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86/.project 2010-09-01 19:08:36 UTC (rev 24621)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.mozilla.xulrunner.cocoa.macosx.x86</name>
+ <name>org.mozilla.xulrunner.cocoa.macosx</name>
<comment></comment>
<projects>
</projects>
Modified: workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86/META-INF/MANIFEST.MF
===================================================================
--- workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86/META-INF/MANIFEST.MF 2010-09-01 18:23:17 UTC (rev 24620)
+++ workspace/mareshkau/xulrunner-1.9.1.2/org.mozilla.xulrunner.cocoa.macosx.x86/META-INF/MANIFEST.MF 2010-09-01 19:08:36 UTC (rev 24621)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mozilla Xulrunner
-Bundle-SymbolicName: org.mozilla.xulrunner.cocoa.macosx.x86;singleton:=true
+Bundle-SymbolicName: org.mozilla.xulrunner.cocoa.macosx;singleton:=true
Bundle-Version: 1.9.1.2
Bundle-Vendor: mozilla.org
Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=x86) )
15 years, 7 months
JBoss Tools SVN: r24620 - 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-09-01 14:23:17 -0400 (Wed, 01 Sep 2010)
New Revision: 24620
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/observers/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/observers/ClassFragmentLogger.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.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/messages.properties
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6955 Erroroneous error about CDI observer method on session bean
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-09-01 18:21:45 UTC (rev 24619)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-09-01 18:23:17 UTC (rev 24620)
@@ -425,6 +425,9 @@
public static IMethod getBusinessMethodDeclaration(ISessionBean bean, IBeanMethod method) {
try {
if (!Flags.isStatic(method.getMethod().getFlags())) {
+ if(bean.getAnnotation(CDIConstants.SINGLETON_ANNOTATION_TYPE_NAME)!=null) {
+ return method.getMethod();
+ }
Set<IParametedType> types = bean.getLegalTypes();
for (IParametedType type : types) {
IType sourceType = type.getType();
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-09-01 18:21:45 UTC (rev 24619)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-09-01 18:23:17 UTC (rev 24620)
@@ -42,6 +42,7 @@
import org.eclipse.jdt.core.ITypeParameter;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
@@ -872,13 +873,14 @@
* @param annotatedParams
* @param errorKey
*/
- private void validateSessionBeanMethod(IClassBean bean, IBeanMethod method, Set<ITextSourceReference> annotatedParams, String errorMessageKey, String preferencesKey) {
+ private void validateSessionBeanMethod(IClassBean bean, IBeanMethod method, Set<ITextSourceReference> annotatedParams, String errorMessage, String preferencesKey) {
if (bean instanceof ISessionBean && annotatedParams != null) {
IMethod iMethod = CDIUtil.getBusinessMethodDeclaration((SessionBean)bean, method);
if(iMethod==null) {
saveAllSuperTypesAsLinkedResources(bean);
for (ITextSourceReference declaration : annotatedParams) {
- addError(errorMessageKey, preferencesKey, declaration, bean.getResource());
+ String bindedErrorMessage = NLS.bind(errorMessage, new String[]{method.getMethod().getElementName(), bean.getBeanClass().getElementName()});
+ addError(bindedErrorMessage, preferencesKey, declaration, bean.getResource());
}
} else {
getValidationContext().addLinkedCoreResource(bean.getSourcePath().toOSString(), iMethod.getResource().getFullPath(), false);
@@ -1066,7 +1068,8 @@
if(classBean instanceof ISessionBean) {
IMethod method = CDIUtil.getBusinessMethodDeclaration((SessionBean)classBean, producerMethod);
if(method==null) {
- addError(CDIValidationMessages.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, CDIPreferences.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, producer.getProducesAnnotation(), producer.getResource());
+ String bindedErrorMessage = NLS.bind(CDIValidationMessages.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, new String[]{producerMethod.getMethod().getElementName(), producer.getBeanClass().getElementName()});
+ addError(bindedErrorMessage, CDIPreferences.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, producer.getProducesAnnotation(), producer.getResource());
saveAllSuperTypesAsLinkedResources(classBean);
} else {
getValidationContext().addLinkedCoreResource(classBean.getSourcePath().toOSString(), method.getResource().getFullPath(), false);
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-09-01 18:21:45 UTC (rev 24619)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-09-01 18:23:17 UTC (rev 24620)
@@ -52,10 +52,10 @@
PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_OBSERVES=Producer method has a parameter annotated @Observes [JSR-299 �3.3.2]
OBSERVER_ANNOTATED_INJECT=Observer method cannot be annotated @Inject [JSR-299 �10.4.2]
OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED=Observer method has a parameter annotated @Disposes [JSR-299 �10.4.2]
-ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN=Non-static method of a session bean class is annotated @Produces, and the method is not a business method of the session bean [JSR-299 �3.3.2]
+ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN=Non-static method {0}() of a session bean class {1} is annotated @Produces, and the method is not a business method of the session bean [JSR-299 �3.3.2]
MULTIPLE_DISPOSING_PARAMETERS=Method has more than one parameter annotated @Disposes [JSR-299 �3.3.6]
DISPOSER_ANNOTATED_INJECT=Disposer method cannot be annotated @Inject [JSR-299 �3.3.6]
-ILLEGAL_DISPOSER_IN_SESSION_BEAN=Non-static method of a session bean class has a parameter annotated @Disposes, and the method is not a business method of the session bean [JSR-299 �3.3.6]
+ILLEGAL_DISPOSER_IN_SESSION_BEAN=Non-static method {0}() of a session bean class {1} has a parameter annotated @Disposes, and the method is not a business method of the session bean [JSR-299 �3.3.6]
NO_PRODUCER_MATCHING_DISPOSER=There is no producer method declared by the (same) bean class that is assignable to the disposed parameter of a disposer method [JSR-299 �3.3.7]
MULTIPLE_DISPOSERS_FOR_PRODUCER=There are multiple disposer methods for a single producer method [JSR-299 �3.3.7]
ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN=Non-static field of a session bean class is annotated @Produces [JSR-299 �3.4.2]
@@ -65,7 +65,7 @@
GENERIC_METHOD_ANNOTATED_INJECT=Generic method of a bean cannot be annotated @Inject [JSR-299 �3.9.1]
STATIC_METHOD_ANNOTATED_INJECT=Static method of a bean cannot be annotated @Inject [JSR-299 �3.9.1]
MULTIPLE_OBSERVING_PARAMETERS=Method has more than one parameter annotated @Observes [JSR-299 �10.4.2]
-ILLEGAL_OBSERVER_IN_SESSION_BEAN=Non-static method of a session bean class has a parameter annotated @Observes, and the method is not a business method of the EJB [JSR-299 �10.4.2]
+ILLEGAL_OBSERVER_IN_SESSION_BEAN=Non-static method {0}() of a session bean class {1} has a parameter annotated @Observes, and the method is not a business method of the EJB [JSR-299 �10.4.2]
ILLEGAL_CONDITIONAL_OBSERVER=Beans with scope @Dependent may not have conditional observer methods [JSR-299 �10.4.3]
BOTH_INTERCEPTOR_AND_DECORATOR=The bean class of a managed bean cannot be annotated with both the @Interceptor and @Decorator stereotypes [JSR-299 �3.1]
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/observers/ClassFragmentLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/observers/ClassFragmentLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/observers/ClassFragmentLogger.java 2010-09-01 18:23:17 UTC (rev 24620)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.observers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ejb.Lock;
+import javax.ejb.LockType;
+import javax.ejb.Singleton;
+import javax.enterprise.event.Observes;
+
+@Singleton
+public class ClassFragmentLogger {
+
+ private final List<Object> log;
+
+ public ClassFragmentLogger() {
+ this.log = new ArrayList<Object>();
+ }
+
+ @Lock(LockType.WRITE)
+ public void addEntry(@Observes Object codeFragment) {
+ this.log.add(codeFragment);
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/observers/ClassFragmentLogger.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/validation/DefenitionErrorsValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2010-09-01 18:21:45 UTC (rev 24619)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2010-09-01 18:23:17 UTC (rev 24620)
@@ -14,6 +14,7 @@
import java.text.MessageFormat;
import org.eclipse.core.resources.IFile;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
/**
@@ -502,7 +503,8 @@
*/
public void testProducerMethodOnSessionBeanMustBeBusinessMethod() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducer.java");
- assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, 25);
+ String bindedErrorMessage = NLS.bind(CDIValidationMessages.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, new String[]{"createFoo", "FooProducer"});
+ assertMarkerIsCreated(file, bindedErrorMessage, 25);
}
/**
@@ -601,9 +603,11 @@
*/
public void testDisposalMethodNotBusinessOrStatic() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/AppleTree.java");
- assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_DISPOSER_IN_SESSION_BEAN, 31);
+ String bindedErrorMessage = NLS.bind(CDIValidationMessages.ILLEGAL_DISPOSER_IN_SESSION_BEAN, new String[]{"recycle", "AppleTree"});
+ assertMarkerIsCreated(file, bindedErrorMessage, 31);
file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java");
- assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_DISPOSER_IN_SESSION_BEAN, 73);
+ bindedErrorMessage = NLS.bind(CDIValidationMessages.ILLEGAL_DISPOSER_IN_SESSION_BEAN, new String[]{"disposeLitter", "Fox"});
+ assertMarkerIsNotCreated(file, bindedErrorMessage, 73);
}
/**
@@ -1332,11 +1336,25 @@
*/
public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java");
- assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_OBSERVER_IN_SESSION_BEAN, 25);
+ String bindedErrorMessage = NLS.bind(CDIValidationMessages.ILLEGAL_OBSERVER_IN_SESSION_BEAN, new String[]{"observeSomeEvent", "TibetanTerrier_Broken"});
+ assertMarkerIsCreated(file, bindedErrorMessage, 25);
}
/**
* 10.4.2. Declaring an observer method
+ * - non-static method of a session bean class has a parameter annotated @Observes, and the method is not a business method of the EJB
+ * See https://jira.jboss.org/browse/JBIDE-6955
+ *
+ * @throws Exception
+ */
+ public void testObserverMethodOnSingletonBeanIsBusinessMethodOk() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/observers/ClassFragmentLogger.java");
+ String bindedErrorMessage = NLS.bind(CDIValidationMessages.ILLEGAL_OBSERVER_IN_SESSION_BEAN, new String[]{"addEntry", "ClassFragmentLogger"});
+ assertMarkerIsNotCreated(file, bindedErrorMessage, 21);
+ }
+
+ /**
+ * 10.4.2. Declaring an observer method
* - interceptor has a method with a parameter annotated @Observes
*
* @throws Exception
15 years, 7 months
JBoss Tools SVN: r24619 - branches/jbosstools-3.2.0.M2/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-01 14:21:45 -0400 (Wed, 01 Sep 2010)
New Revision: 24619
Modified:
branches/jbosstools-3.2.0.M2/build/publish.sh
Log:
ensure that metadata file is being created for aggregate builds; suppress checksum errors
Modified: branches/jbosstools-3.2.0.M2/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.0.M2/build/publish.sh 2010-09-01 18:21:29 UTC (rev 24618)
+++ branches/jbosstools-3.2.0.M2/build/publish.sh 2010-09-01 18:21:45 UTC (rev 24619)
@@ -41,23 +41,23 @@
z=$siteZip
fi
+# note the job name, build number, SVN rev, and build ID of the latest snapshot zip
+mkdir -p ${STAGINGDIR}/logs
+METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
+if [[ ${SVN_REVISION} ]]; then
+ METAFILE="${BUILD_ID}-H${BUILD_NUMBER}-r${SVN_REVISION}.txt"
+ echo "SVN_REVISION = ${SVN_REVISION}" > ${STAGINGDIR}/logs/${METAFILE}
+else
+ echo -n "" > ${STAGINGDIR}/logs/${METAFILE}
+fi
+echo "JOB_NAME = ${JOB_NAME}" >> ${STAGINGDIR}/logs/${METAFILE}
+echo "BUILD_NUMBER = ${BUILD_NUMBER}" >> ${STAGINGDIR}/logs/${METAFILE}
+echo "BUILD_ID = ${BUILD_ID}" >> ${STAGINGDIR}/logs/${METAFILE}
+echo "WORKSPACE = ${WORKSPACE}" >> ${STAGINGDIR}/logs/${METAFILE}
+echo "HUDSON_SLAVE = $(uname -a)" >> ${STAGINGDIR}/logs/${METAFILE}
+
+#echo "$z ..."
if [[ $z != "" ]] && [[ -f $z ]] ; then
- #echo "$z ..."
- # note the job name, build number, SVN rev, and build ID of the latest snapshot zip
- mkdir -p ${STAGINGDIR}/logs
- METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
- if [[ ${SVN_REVISION} ]]; then
- METAFILE="${BUILD_ID}-H${BUILD_NUMBER}-r${SVN_REVISION}.txt"
- echo "SVN_REVISION = ${SVN_REVISION}" > ${STAGINGDIR}/logs/${METAFILE}
- else
- echo -n "" > ${STAGINGDIR}/logs/${METAFILE}
- fi
- echo "JOB_NAME = ${JOB_NAME}" >> ${STAGINGDIR}/logs/${METAFILE}
- echo "BUILD_NUMBER = ${BUILD_NUMBER}" >> ${STAGINGDIR}/logs/${METAFILE}
- echo "BUILD_ID = ${BUILD_ID}" >> ${STAGINGDIR}/logs/${METAFILE}
- echo "WORKSPACE = ${WORKSPACE}" >> ${STAGINGDIR}/logs/${METAFILE}
- echo "HUDSON_SLAVE = $(uname -a)" >> ${STAGINGDIR}/logs/${METAFILE}
-
# unzip into workspace for publishing as unpacked site
mkdir -p ${STAGINGDIR}/all/repo
unzip -u -o -q -d ${STAGINGDIR}/all/repo $z
@@ -136,9 +136,10 @@
bl=${STAGINGDIR}/logs/BUILDLOG.txt
wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl}
fl=${STAGINGDIR}/logs/FAIL_LOG.txt
-sed -ne "/<<< FAI/,+9 p" ${bl} | sed -e "/AILURE/,+9 s/\(.\+AILURE.\+\)/\n----------\n\n\1/g" > ${fl}
-sed -ne "/ FAI/ p" ${bl} | sed -e "/AILURE \[/ s/\(.\+AILURE \[.\+\)/\n----------\n\n\1/g" >> ${fl}
-sed -ne "/ SKI/ p" ${bl} | sed -e "/KIPPED \[/ s/\(.\+KIPPED \[.\+\)/\n----------\n\n\1/g" >> ${fl}
+# ignore warning lines and checksum failures
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/<<< FAI/,+9 p" | sed -e "/AILURE/,+9 s/\(.\+AILURE.\+\)/\n----------\n\n\1/g" > ${fl}
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/ FAI/ p" | sed -e "/AILURE \[/ s/\(.\+AILURE \[.\+\)/\n----------\n\n\1/g" >> ${fl}
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/ SKI/ p" | sed -e "/KIPPED \[/ s/\(.\+KIPPED \[.\+\)/\n----------\n\n\1/g" >> ${fl}
fc=$(sed -ne "/FAI\|LURE/ p" ${fl} | wc -l)
if [[ $fc != "0" ]]; then
echo "" >> ${fl}; echo -n "FAI" >> ${fl}; echo -n "LURES FOUND: "$fc >> ${fl};
@@ -148,8 +149,9 @@
echo "" >> ${fl}; echo -n "SKI" >> ${fl}; echo -n "PS FOUND: "$fc >> ${fl};
fi
el=${STAGINGDIR}/logs/ERRORLOG.txt
-sed -ne "/<<< ERR/,+9 p" ${bl} | sed -e "/RROR/,+9 s/\(.\+RROR.\+\)/\n----------\n\n\1/g" > ${el}
-sed -ne "/\[ERR/,+2 p" ${bl} | sed -e "/ROR\] Fai/,+2 s/\(.\+ROR\] Fai.\+\)/\n----------\n\n\1/g" >> ${el}
+# ignore warning lines and checksum failures
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/<<< ERR/,+9 p" | sed -e "/RROR/,+9 s/\(.\+RROR.\+\)/\n----------\n\n\1/g" > ${el}
+sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/\[ERR/,+2 p" | sed -e "/ROR\] Fai/,+2 s/\(.\+ROR\] Fai.\+\)/\n----------\n\n\1/g" >> ${el}
ec=$(sed -ne "/ERR\|RROR/ p" ${el} | wc -l)
if [[ $ec != "0" ]]; then
echo "" >> ${el}; echo -n "ERR" >> ${el}; echo "ORS FOUND: "$ec >> ${el};
15 years, 7 months