JBoss Tools SVN: r22345 - in trunk: drools and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-26 17:40:51 -0400 (Wed, 26 May 2010)
New Revision: 22345
Modified:
trunk/build/build.xml
trunk/drools/build.xml
Log:
drools custom build can't find build/build.xml when using shared checkout location in Hudson
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-05-26 20:51:10 UTC (rev 22344)
+++ trunk/build/build.xml 2010-05-26 21:40:51 UTC (rev 22345)
@@ -660,6 +660,7 @@
<ant antfile="${WORKINGDIR}/(a){COMPONENT}/build.xml">
<property name="COMPONENT" value="@{COMPONENT}" />
<property name="basedir" value="${WORKINGDIR}/@{COMPONENT}" />
+ <property name="build.xml" value="${ant.file}"/>
</ant>
</then>
</if>
Modified: trunk/drools/build.xml
===================================================================
--- trunk/drools/build.xml 2010-05-26 20:51:10 UTC (rev 22344)
+++ trunk/drools/build.xml 2010-05-26 21:40:51 UTC (rev 22345)
@@ -24,12 +24,16 @@
<mkdir dir="${COMMON_TOOLS}" />
<echo level="info">COMMON_TOOLS = ${COMMON_TOOLS}</echo>
- <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources">
+ <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml">
<available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" />
</condition>
- <condition property="build.xml" value="${basedir}/../build/build.xml" else="${basedir}/../build.xml">
+ <condition property="build.xml" value="${basedir}/../build/build.xml">
<available file="${basedir}/../build/build.xml" type="file" />
</condition>
+ <condition property="build.xml" value="${basedir}/../build.xml">
+ <available file="${basedir}/../build.xml" type="file" />
+ </condition>
+ <!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
<target name="custom.build"
description="fetch latest drools from their Hudson build + selectively unpack it"
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22344 - trunk/download.jboss.org/jbosstools/requirements/helios.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-26 16:51:10 -0400 (Wed, 26 May 2010)
New Revision: 22344
Modified:
trunk/download.jboss.org/jbosstools/requirements/helios/README.txt
Log:
fix instructions for releng.bb zip creation
Modified: trunk/download.jboss.org/jbosstools/requirements/helios/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2010-05-26 20:28:35 UTC (rev 22343)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2010-05-26 20:51:10 UTC (rev 22344)
@@ -54,10 +54,9 @@
Basebuilder from latest tag (http://wiki.eclipse.org/Platform-releng-basebuilder#Current_build_tag_for...)
cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse -q co -d
-org.eclipse.releng.basebuilder_R36_RC1 -r R36_RC1
+org.eclipse.releng.basebuilder -r R36_RC1
org.eclipse.releng.basebuilder
- cd org.eclipse.releng.basebuilder_R36_RC1; zip -r9
-../org.eclipse.releng.basebuilder_R36_RC1.zip ./*
+ zip -r9 org.eclipse.releng.basebuilder_R36_RC1.zip org.eclipse.releng.basebuilder
m2eclipse-0.10.0.20100209-0800.zip
run m2eclipse/build.xml
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22343 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-26 16:28:35 -0400 (Wed, 26 May 2010)
New Revision: 22343
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/errorList.txt
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
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-26 20:21:57 UTC (rev 22342)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-26 20:28:35 UTC (rev 22343)
@@ -866,14 +866,19 @@
}
}
+ IInjectionPointMethod injectionMethod = (IInjectionPointMethod)injection;
+ IAnnotationDeclaration declaration = injection.getInjectAnnotation();
/*
- *
+ * 3.9.1. Declaring an initializer method
+ * - generic method of a bean is annotated @Inject
*/
- IInjectionPointMethod injectionMethod = (IInjectionPointMethod)injection;
- IAnnotationDeclaration declaration = injection.getInjectAnnotation();
if(CDIUtil.isMethodGeneric(injectionMethod)) {
addError(CDIValidationMessages.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResource());
}
+ /*
+ * 3.9. Initializer methods
+ * - initializer method may not be static
+ */
if(CDIUtil.isMethodStatic(injectionMethod)) {
addError(CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT, CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResource());
}
@@ -881,8 +886,7 @@
}
/**
- * Validates class bean which may be both a session and decorator (or
- * interceptor).
+ * Validates class bean which may be both a session and decorator (or interceptor).
*
* @param bean
*/
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-26 20:21:57 UTC (rev 22342)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt 2010-05-26 20:28:35 UTC (rev 22343)
@@ -109,9 +109,6 @@
3.8.1. Declaring an injected field
- injected field is annotated @Produces
-
-
-
3.9.1. Declaring an initializer method
- generic method of a bean is annotated @Inject (initializer method is a non-abstract,
non-static, non-generic method of a bean class)
@@ -120,6 +117,10 @@
- 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
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-26 20:21:57 UTC (rev 22342)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-26 20:28:35 UTC (rev 22343)
@@ -793,6 +793,17 @@
}
/**
+ * 3.9. Initializer methods
+ * - initializer method may not be static
+ *
+ * @throws Exception
+ */
+ public void testStaticInitializerMethod() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT, 11);
+ }
+
+ /**
* 3.9.1. Declaring an initializer method
* - an initializer method has a parameter annotated @Disposes
*
@@ -805,17 +816,6 @@
}
/**
- * 3.9. Initializer methods
- * - initializer method may not be static
- *
- * @throws Exception
- */
- public void testStaticInitializerMethod() throws Exception {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT, 11);
- }
-
- /**
* 3.9.1. Declaring an initializer method
* - generic method of a bean is annotated @Inject
*
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22342 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-26 16:21:57 -0400 (Wed, 26 May 2010)
New Revision: 22342
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.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/core/IInjectionPoint.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.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/CDIValidationMessages.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/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
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: 3.9.1. Declaring an initializer method - generic method of a bean is annotated @Inject (initializer method is a non-abstract, non-static, non-generic method of a bean class)
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-05-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -460,6 +460,51 @@
return params;
}
+ /**
+ * Returns true if the method is generic
+ *
+ * @param method
+ * @return
+ */
+ public static boolean isMethodGeneric(IBeanMethod method) {
+ try {
+ return method.getMethod().getTypeParameters().length>0;
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ return false;
+ }
+
+ /**
+ * Returns true if the method is static
+ *
+ * @param method
+ * @return
+ */
+ public static boolean isMethodStatic(IBeanMethod method) {
+ try {
+ return Flags.isStatic(method.getMethod().getFlags());
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ return false;
+ }
+
+ /**
+ * Returns true if the method is abstract
+ *
+ * @param method
+ * @return
+ */
+ public static boolean isMethodAbstract(IBeanMethod method) {
+ try {
+ return Flags.isAbstract(method.getMethod().getFlags());
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ return false;
+ }
+
private static IType getSuperClass(IType type) throws JavaModelException {
String superclassName = type.getSuperclassName();
if(superclassName!=null) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2010-05-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -51,4 +51,11 @@
* parameter of injection point method. May be null.
*/
IAnnotationDeclaration getDelegateAnnotation();
+
+ /**
+ * Returns the @Inject annotation declaration
+ *
+ * @return the @Inject annotation declaration.
+ */
+ IAnnotationDeclaration getInjectAnnotation();
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java 2010-05-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2009 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2010-05-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2009 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2010-05-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2009 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
+import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPointField;
@@ -22,12 +23,27 @@
public InjectionPointField() {}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation()
+ */
public IAnnotationDeclaration getDelegateAnnotation() {
return getDefinition().getDelegateAnnotation();
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#isDelegate()
+ */
public boolean isDelegate() {
return getDelegateAnnotation() != null;
}
-}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#getInjectAnnotation()
+ */
+ public IAnnotationDeclaration getInjectAnnotation() {
+ return definition.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
+ }
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java 2010-05-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -33,4 +33,12 @@
protected Parameter newParameter() {
return new InjectionPointParameter();
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#getInjectAnnotation()
+ */
+ public IAnnotationDeclaration getInjectAnnotation() {
+ return inject;
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2010-05-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2009 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -51,4 +51,11 @@
return isAnnotationPresent(CDIConstants.DELEGATE_STEREOTYPE_TYPE_NAME);
}
-}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IInjectionPoint#getInjectAnnotation()
+ */
+ public IAnnotationDeclaration getInjectAnnotation() {
+ return beanMethod.inject;
+ }
+}
\ 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-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -48,7 +48,7 @@
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IDecorator;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IParametedType;
@@ -592,14 +592,14 @@
ITypeDeclaration typeDeclaration = null;
if (!typeDeclarations.isEmpty()) {
/*
- * 3.3. Producer methods - producer method return type contains
- * a wildcard type parameter
+ * 3.3. Producer methods
+ * - producer method return type contains a wildcard type parameter
*
- * 2.2.1 Legal bean types - a parameterized type that contains a
- * wildcard type parameter is not a legal bean type.
+ * 2.2.1 Legal bean types
+ * - a parameterized type that contains a wildcard type parameter is not a legal bean type.
*
- * 3.4. Producer fields - producer field type contains a
- * wildcard type parameter
+ * 3.4. Producer fields
+ * - producer field type contains a wildcard type parameter
*/
typeDeclaration = typeDeclarations.iterator().next();
String[] paramTypes = Signature.getTypeArguments(typeDeclaration.getSignature());
@@ -615,14 +615,13 @@
}
}
- /**
- * 3.3. Producer methods - producer method with a parameterized
- * return type with a type variable declares any scope other
- * than @Dependent
+ /*
+ * 3.3. Producer methods
+ * - producer method with a parameterized return type with a type variable declares any scope other than @Dependent
*
- * 3.4. Producer fields - producer field with a parameterized
- * type with a type variable declares any scope other than @Dependent
- */
+ * 3.4. Producer fields
+ * - producer field with a parameterized type with a type variable declares any scope other than @Dependent
+ */
if (paramTypes.length > 0) {
IAnnotationDeclaration scopeOrStereotypeDeclaration = CDIUtil.getDifferentScopeDeclarationThanDepentend(producer);
if (scopeOrStereotypeDeclaration != null) {
@@ -635,8 +634,8 @@
}
/*
- * 3.3.2. Declaring a producer method - producer method is annotated
- * @Inject
+ * 3.3.2. Declaring a producer method
+ * - producer method is annotated @Inject
*/
IAnnotationDeclaration inject = producer.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME);
if (inject != null) {
@@ -647,9 +646,8 @@
if (producer instanceof IProducerField) {
/*
- * 3.5.1. Declaring a resource - producer field declaration
- * specifies an EL name (together with one of @Resource,
- * @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef)
+ * 3.5.1. Declaring a resource
+ * - producer field declaration specifies an EL name (together with one of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef)
*/
IProducerField producerField = (IProducerField) producer;
if (producerField.getName() != null) {
@@ -666,7 +664,8 @@
}
}
/*
- * 3.4. Producer fields - producer field type is a type variable
+ * 3.4. Producer fields
+ * - producer field type is a type variable
*/
if (typeVariables.length > 0) {
String typeSign = producerField.getField().getTypeSignature();
@@ -694,22 +693,22 @@
disposalDeclarations.add(producerMethod.getAnnotation(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME));
for (IParameter param : params) {
/*
- * 3.3.6. Declaring a disposer method - a disposer method is
- * annotated @Produces.
+ * 3.3.6. Declaring a disposer method
+ * - a disposer method is annotated @Produces.
*
- * 3.3.2. Declaring a producer method - a has a parameter
- * annotated @Disposes
+ * 3.3.2. Declaring a producer method
+ * - a has a parameter annotated @Disposes
*/
ITextSourceReference declaration = param.getAnnotationPosition(CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME);
if (declaration != null) {
disposalDeclarations.add(declaration);
}
/*
- * 3.3.2. Declaring a producer method - a has a parameter
- * annotated @Observers
+ * 3.3.2. Declaring a producer method
+ * - a has a parameter annotated @Observers
*
- * 10.4.2. Declaring an observer method - an observer method
- * is annotated @Produces
+ * 10.4.2. Declaring an observer method
+ * - an observer method is annotated @Produces
*/
declaration = param.getAnnotationPosition(CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME);
if (declaration != null) {
@@ -730,11 +729,11 @@
}
/*
- * 3.3. Producer methods - producer method return type is a type
- * variable
+ * 3.3. Producer methods
+ * - producer method return type is a type variable
*
- * 2.2.1 - Legal bean types - a type variable is not a legal
- * bean type
+ * 2.2.1 - Legal bean types
+ * - a type variable is not a legal bean type
*/
String typeSign = producerMethod.getMethod().getReturnType();
String typeString = Signature.toString(typeSign);
@@ -847,7 +846,7 @@
}
}
- } else if (!(injection instanceof IInjectionPointField)) {
+ } else if (injection instanceof IInjectionPointMethod) {
IAnnotationDeclaration named = injection.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
if (named != null) {
try {
@@ -860,13 +859,24 @@
}
}
if (!valueExists) {
- addError(CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY_NAME, CDIPreferences.PARAM_INJECTION_DECLARES_EMPTY_NAME, named,
- injection.getResource());
+ addError(CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY_NAME, CDIPreferences.PARAM_INJECTION_DECLARES_EMPTY_NAME, named, injection.getResource());
}
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
}
+
+ /*
+ *
+ */
+ IInjectionPointMethod injectionMethod = (IInjectionPointMethod)injection;
+ IAnnotationDeclaration declaration = injection.getInjectAnnotation();
+ if(CDIUtil.isMethodGeneric(injectionMethod)) {
+ addError(CDIValidationMessages.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResource());
+ }
+ if(CDIUtil.isMethodStatic(injectionMethod)) {
+ addError(CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT, CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResource());
+ }
}
}
@@ -883,8 +893,8 @@
if (sessionDeclaration != null) {
/*
- * 3.2. Session beans - bean class of a session bean is annotated
- * @Decorator
+ * 3.2. Session beans
+ * - bean class of a session bean is annotated @Decorator
*/
if (decoratorDeclaration != null) {
addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR, CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR,
@@ -893,8 +903,8 @@
decoratorDeclaration, bean.getResource());
}
/*
- * 3.2. Session beans - bean class of a session bean is annotated
- * @Interceptor
+ * 3.2. Session beans
+ * - bean class of a session bean is annotated @Interceptor
*/
if (interceptorDeclaration != null) {
addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR, CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR,
@@ -911,8 +921,8 @@
IType type = bean.getBeanClass();
try {
/*
- * 3.2. Session beans - session bean with a parameterized bean
- * class declares any scope other than @Dependent
+ * 3.2. Session beans
+ * - session bean with a parameterized bean class declares any scope other than @Dependent
*/
String[] typeVariables = type.getTypeParameterSignatures();
if (typeVariables.length > 0) {
@@ -921,9 +931,8 @@
} else {
if (bean.isStateless()) {
/*
- * 3.2. Session beans - session bean specifies an
- * illegal scope (a stateless session bean must belong
- * to the @Dependent pseudo-scope)
+ * 3.2. Session beans
+ * - session bean specifies an illegal scope (a stateless session bean must belong to the @Dependent pseudo-scope)
*/
if (declaration != null) {
addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SESSION_BEAN, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN,
@@ -931,10 +940,8 @@
}
} else if (bean.isSingleton()) {
/*
- * 3.2. Session beans - session bean specifies an
- * illegal scope (a singleton bean must belong to either
- * the @ApplicationScoped scope or to the @Dependent
- * pseudo-scope)
+ * 3.2. Session beans
+ * - session bean specifies an illegal scope (a singleton bean must belong to either the @ApplicationScoped scope or to the @Dependent pseudo-scope)
*/
if (declaration != null) {
declaration = CDIUtil.getDifferentScopeDeclarationThanApplicationScoped(bean);
@@ -950,9 +957,8 @@
}
}
/*
- * 3.2.4. Specializing a session bean - session bean class annotated
- * @Specializes does not directly extend the bean class of another
- * session bean
+ * 3.2.4. Specializing a session bean
+ * - session bean class annotated @Specializes does not directly extend the bean class of another session bean
*/
IAnnotationDeclaration specializesDeclaration = bean.getSpecializesAnnotationDeclaration();
if (specializesDeclaration != null) {
@@ -963,8 +969,7 @@
addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration,
bean.getResource());
} else if (!CDIUtil.isSessionBean(sBean)) {
- // The specializing bean directly extends a non-session bean
- // class
+ // The specializing bean directly extends a non-session bean class
addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration,
bean.getResource());
}
@@ -973,7 +978,8 @@
private void validateManagedBean(IClassBean bean) {
/*
- * 3.1. Managed beans - the bean class of a managed bean is annotated with both the @Interceptor and @Decorator stereotypes
+ * 3.1. Managed beans
+ * - the bean class of a managed bean is annotated with both the @Interceptor and @Decorator stereotypes
*/
IAnnotationDeclaration decorator = bean.getAnnotation(CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME);
IAnnotationDeclaration interceptor = bean.getAnnotation(CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME);
@@ -987,7 +993,8 @@
IType type = bean.getBeanClass();
try {
/*
- * 3.1. Managed beans - managed bean with a public field declares any scope other than @Dependent
+ * 3.1. Managed beans
+ * - managed bean with a public field declares any scope other than @Dependent
*/
IField[] fields = type.getFields();
for (IField field : fields) {
@@ -998,7 +1005,8 @@
}
}
/*
- * 3.1. Managed beans - managed bean with a parameterized bean class declares any scope other than @Dependent
+ * 3.1. Managed beans
+ * - managed bean with a parameterized bean class declares any scope other than @Dependent
*/
String[] typeVariables = type.getTypeParameterSignatures();
if (typeVariables.length > 0) {
@@ -1010,7 +1018,8 @@
}
}
/*
- * 3.1.4. Specializing a managed bean - managed bean class annotated @Specializes does not directly extend the bean class of another managed bean
+ * 3.1.4. Specializing a managed bean
+ * - managed bean class annotated @Specializes does not directly extend the bean class of another managed bean
*/
IAnnotationDeclaration specializesDeclaration = bean.getSpecializesAnnotationDeclaration();
if (specializesDeclaration != null) {
@@ -1052,7 +1061,8 @@
private void validateInterceptor(IInterceptor interceptor) {
/*
- * 2.5.3. Beans with no EL name - interceptor has a name (Non-Portable behavior)
+ * 2.5.3. Beans with no EL name
+ * - interceptor has a name (Non-Portable behavior)
*/
if (interceptor.getName() != null) {
ITextSourceReference declaration = interceptor.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
@@ -1066,7 +1076,8 @@
}
/*
- * 2.6.1. Declaring an alternative - interceptor is an alternative (Non-Portable behavior)
+ * 2.6.1. Declaring an alternative
+ * - interceptor is an alternative (Non-Portable behavior)
*/
if (interceptor.isAlternative()) {
ITextSourceReference declaration = interceptor.getAlternativeDeclaration();
@@ -1091,7 +1102,8 @@
private void validateDecorator(IDecorator decorator) {
/*
- * 2.5.3. Beans with no EL name - decorator has a name (Non-Portable behavior)
+ * 2.5.3. Beans with no EL name
+ * - decorator has a name (Non-Portable behavior)
*/
if (decorator.getName() != null) {
ITextSourceReference declaration = decorator.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
@@ -1105,7 +1117,8 @@
}
/*
- * 2.6.1. Declaring an alternative - decorator is an alternative (Non-Portable behavior)
+ * 2.6.1. Declaring an alternative
+ * - decorator is an alternative (Non-Portable behavior)
*/
if (decorator.isAlternative()) {
ITextSourceReference declaration = decorator.getAlternativeDeclaration();
@@ -1129,8 +1142,8 @@
}
/*
- * 2.2.2. Restricting the bean types of a bean - bean class or producer method or field specifies a @Typed annotation,
- * and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean
+ * 2.2.2. Restricting the bean types of a bean
+ * - bean class or producer method or field specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean
*/
private void validateTyped(IBean bean) {
Set<ITypeDeclaration> typedDeclarations = bean.getRestrictedTypeDeclaratios();
@@ -1166,10 +1179,7 @@
}
// 2.4.4. Default scope
- // - bean does not explicitly declare a scope when there is no default
- // scope
- // (there are two different stereotypes declared by the bean that
- // declare different default scopes)
+ // - bean does not explicitly declare a scope when there is no default scope (there are two different stereotypes declared by the bean that declare different default scopes)
//
// Such bean definitions are invalid because they declares two
// stereotypes that have different default scopes and the bean does not
@@ -1192,8 +1202,8 @@
}
/*
- * 2.4.1. Built-in scope types - interceptor or decorator has any scope
- * other than @Dependent (Non-Portable behavior)
+ * 2.4.1. Built-in scope types
+ * - interceptor or decorator has any scope other than @Dependent (Non-Portable behavior)
*/
boolean interceptor = bean instanceof IInterceptor;
boolean decorator = bean instanceof IDecorator;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-05-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -68,6 +68,7 @@
public static String CONSTRUCTOR_PARAMETER_ANNOTATED_OBSERVES;
public static String CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES;
public static String GENERIC_METHOD_ANNOTATED_INJECT;
+ public static String STATIC_METHOD_ANNOTATED_INJECT;
public static String MULTIPLE_OBSERVING_PARAMETERS;
public static String ILLEGAL_OBSERVER_IN_SESSION_BEAN;
public static String ILLEGAL_CONDITIONAL_OBSERVER;
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-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-05-26 20:21:57 UTC (rev 22342)
@@ -47,6 +47,7 @@
CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES=Bean constructor has a parameter annotated @Disposes
CONSTRUCTOR_PARAMETER_ANNOTATED_OBSERVES=Bean constructor has a parameter annotated @Observes
GENERIC_METHOD_ANNOTATED_INJECT=Generic method of a bean is annotated @Inject
+STATIC_METHOD_ANNOTATED_INJECT=Static method of a bean is annotated @Inject
MULTIPLE_OBSERVING_PARAMETERS=Method has more than one parameter annotated @Observes
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
ILLEGAL_CONDITIONAL_OBSERVER=Bean with scope @Dependent has an observer method declared receive=IF_EXISTS
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-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -89,7 +89,7 @@
{CDIPreferences.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean_label},
{CDIPreferences.MULTIPLE_INJECTION_CONSTRUCTORS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label},
{CDIPreferences.CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyAnnotated_label},
-// {CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label},
+ {CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label},
{CDIPreferences.MULTIPLE_OBSERVING_PARAMETERS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_multipleObservingParameters_label},
{CDIPreferences.ILLEGAL_OBSERVER_IN_SESSION_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label},
// {CDIPreferences.ILLEGAL_CONDITIONAL_OBSERVER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label},
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2010-05-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2010-05-26 20:21:57 UTC (rev 22342)
@@ -70,7 +70,7 @@
CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean_label=Illegal producer field in Session Bean:
CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label=Multiple injection constructors:
CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyAnnotated_label=Constructor parameter illegally annotated:
-CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label=Generic method is annotated @Inject:
+CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label=Generic or static method is annotated @Inject:
CDIValidatorConfigurationBlock_pb_multipleObservingParameters_label=Multiple observing parameterts:
CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label=Illegal observer in Session Bean:
CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label=Illegal conditional observer:
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.inject;
+
+import javax.inject.Inject;
+
+public class GenericInitializerMethodBroken {
+
+ @Inject
+ public <U> void genericFoo(U arg) {
+ }
+
+ @Inject
+ public static void staticFoo(String arg) {
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.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-26 19:59:50 UTC (rev 22341)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-26 20:21:57 UTC (rev 22342)
@@ -805,6 +805,28 @@
}
/**
+ * 3.9. Initializer methods
+ * - initializer method may not be static
+ *
+ * @throws Exception
+ */
+ public void testStaticInitializerMethod() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT, 11);
+ }
+
+ /**
+ * 3.9.1. Declaring an initializer method
+ * - generic method of a bean is annotated @Inject
+ *
+ * @throws Exception
+ */
+ public void testGenericInitializerMethod() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.GENERIC_METHOD_ANNOTATED_INJECT, 7);
+ }
+
+ /**
* 3.11. The qualifier @Named at injection points
* - injection point other than injected field declares a @Named annotation that does not specify the value member
*
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22341 - in branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples: src/org/jboss/tools/project/examples/filetransfer and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-26 15:59:50 -0400 (Wed, 26 May 2010)
New Revision: 22341
Modified:
branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java
branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectFix.java
Log:
https://jira.jboss.org/browse/JBIDE-6341 23 compile errors in org.jboss.tools.project.examples
Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
===================================================================
--- branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2010-05-26 19:55:40 UTC (rev 22340)
+++ branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2010-05-26 19:59:50 UTC (rev 22341)
@@ -29,7 +29,8 @@
org.eclipse.equinox.p2.ui,
org.eclipse.equinox.p2.ui.sdk,
org.eclipse.equinox.p2.metadata,
- org.jboss.tools.portlet.core
+ org.jboss.tools.portlet.core,
+ org.eclipse.equinox.p2.operations
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.jboss.tools.project.examples,
Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java
===================================================================
--- branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java 2010-05-26 19:55:40 UTC (rev 22340)
+++ branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java 2010-05-26 19:59:50 UTC (rev 22341)
@@ -41,8 +41,9 @@
import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory;
import org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
-import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI;
-import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI.AuthenticationInfo;
+import org.eclipse.equinox.p2.core.IProvisioningAgent;
+import org.eclipse.equinox.p2.core.UIServices;
+import org.eclipse.equinox.p2.core.UIServices.AuthenticationInfo;
import org.eclipse.equinox.security.storage.ISecurePreferences;
import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
import org.eclipse.equinox.security.storage.StorageException;
@@ -425,9 +426,8 @@
// ignore
}
}
- ServiceTracker adminUITracker = new ServiceTracker(ProjectExamplesActivator.getBundleContext(), IServiceUI.class.getName(), null);
- adminUITracker.open();
- IServiceUI adminUIService = (IServiceUI) adminUITracker.getService();
+ IProvisioningAgent agent = (IProvisioningAgent) ServiceHelper.getService(ProjectExamplesActivator.getBundleContext(), IProvisioningAgent.SERVICE_NAME);
+ UIServices adminUIService = (UIServices) agent.getService(UIServices.SERVICE_NAME);
AuthenticationInfo loginDetails = null;
if (adminUIService != null)
loginDetails = adminUIService.getUsernamePassword(hostLocation.toString());
Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectFix.java
===================================================================
--- branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectFix.java 2010-05-26 19:55:40 UTC (rev 22340)
+++ branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectFix.java 2010-05-26 19:59:50 UTC (rev 22341)
@@ -4,12 +4,14 @@
import java.util.Map;
import org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator;
-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.p2.ui.IProvHelpContextIds;
-import org.eclipse.equinox.internal.provisional.p2.ui.QueryableMetadataRepositoryManager;
-import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.InstallWizard;
-import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.ProvisioningWizardDialog;
-import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.internal.p2.ui.IProvHelpContextIds;
+import org.eclipse.equinox.internal.p2.ui.ProvUIActivator;
+import org.eclipse.equinox.internal.p2.ui.QueryableMetadataRepositoryManager;
+import org.eclipse.equinox.internal.p2.ui.dialogs.InstallWizard;
+import org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningWizardDialog;
+import org.eclipse.equinox.p2.ui.Policy;
+import org.eclipse.equinox.p2.ui.ProvisioningUI;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Shell;
@@ -100,20 +102,14 @@
}
}
if (PLUGIN_TYPE.equals(type)) {
- try {
- final String profileId = ProvSDKUIActivator.getSelfProfileId();
- final QueryableMetadataRepositoryManager manager = new QueryableMetadataRepositoryManager(Policy.getDefault().getQueryContext(), false);
- InstallWizard wizard = new InstallWizard(Policy.getDefault(), profileId, null, null, manager);
- WizardDialog dialog = new ProvisioningWizardDialog(getShell(), wizard);
- dialog.create();
- PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.INSTALL_WIZARD);
- dialog.open();
- } catch (ProvisionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- ProjectExamplesActivator.log(e);
- }
-
+
+ ProvisioningUI ui = ProvisioningUI.getDefaultUI();
+ InstallWizard wizard = new InstallWizard(ui, null, null, null);
+ WizardDialog dialog = new ProvisioningWizardDialog(getShell(), wizard);
+ dialog.create();
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),IProvHelpContextIds.INSTALL_WIZARD);
+ dialog.open();
+
}
}
private Shell getShell() {
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22340 - in trunk/requirements: generic and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-05-26 15:55:40 -0400 (Wed, 26 May 2010)
New Revision: 22340
Added:
trunk/requirements/.classpath
trunk/requirements/.project
trunk/requirements/bin/
trunk/requirements/build.xml
trunk/requirements/buildRequirements.xml
trunk/requirements/generic/
trunk/requirements/generic/build.xml
trunk/requirements/jbossas/
trunk/requirements/jbossas/build.properties
trunk/requirements/jbossas/buildRequirement.xml
trunk/requirements/jbossas/return.properties
trunk/requirements/lib/
trunk/requirements/lib/ant-contrib.jar
Modified:
trunk/requirements/
Log:
https://jira.jboss.org/browse/JBDS-1202 problems running tests
Share project "requirements" into "https://svn.jboss.org/repos/jbosstools"
Property changes on: trunk/requirements
___________________________________________________________________
Name: svn:ignore
+ download
Added: trunk/requirements/.classpath
===================================================================
--- trunk/requirements/.classpath (rev 0)
+++ trunk/requirements/.classpath 2010-05-26 19:55:40 UTC (rev 22340)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/requirements/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/requirements/.project
===================================================================
--- trunk/requirements/.project (rev 0)
+++ trunk/requirements/.project 2010-05-26 19:55:40 UTC (rev 22340)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>requirements</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/requirements/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/requirements/build.xml
===================================================================
--- trunk/requirements/build.xml (rev 0)
+++ trunk/requirements/build.xml 2010-05-26 19:55:40 UTC (rev 22340)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ======================================================================
+ May 21, 2010 4:44:14 PM
+
+ project
+ description
+
+ eskimo
+ ====================================================================== -->
+<project name="project" default="default">
+ <description>
+ description
+ </description>
+
+ <!-- =================================
+ target: default
+ ================================= -->
+ <import file="buildRequirements.xml" />
+ <property name="requirement.root" value="${basedir}" />
+ <property name="requirement.build.root" value="${basedir}/download" />
+ <target name="default" description="description">
+ <echo>requirements=${requirements}</echo>
+ <echo>unzipto=${basedir}/target/requirements</echo>
+ <buildRequirements requirements="${requirements}" unzipto="${basedir}/target" />
+ </target>
+
+</project>
Property changes on: trunk/requirements/build.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/requirements/buildRequirements.xml
===================================================================
--- trunk/requirements/buildRequirements.xml (rev 0)
+++ trunk/requirements/buildRequirements.xml 2010-05-26 19:55:40 UTC (rev 22340)
@@ -0,0 +1,182 @@
+<project>
+
+ <!-- just in case we're calling this standalone -->
+ <property name="build.root" value="${basedir}" />
+
+ <taskdef classpath="${basedir}/lib/ant-contrib.jar" resource="net/sf/antcontrib/antlib.xml" />
+
+ <macrodef name="buildRequirements">
+ <attribute name="requirements" />
+ <attribute name="unzipto" />
+
+ <sequential>
+ <for list="@{requirements}" param="requirement">
+ <sequential>
+ <if>
+ <not>
+ <available file="${requirement.root}/(a){requirement}/return.properties" />
+ </not>
+ <then>
+ <echo>${requirement.root}/(a){requirement}/return.properties is not available</echo>
+ <unpackRequirement requirement="@{requirement}" unpackto="@{unzipto}" />
+ </then>
+ </if>
+ <if>
+ <available file="${requirement.root}/(a){requirement}/return.properties" />
+ <then>
+ <echo>load properties from ${requirement.root}/(a){requirement}/return.properties</echo>
+ <loadproperties srcFile="${requirement.root}/(a){requirement}/return.properties" />
+ </then>
+ </if>
+ </sequential>
+ </for>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="unpackRequirements">
+ <attribute name="requirements" />
+ <attribute name="unzipto" />
+ <sequential>
+ <for list="@{requirements}" param="requirement">
+ <sequential>
+ <if>
+ <available file="${requirement.root}/(a){requirement}/buildRequirement.xml" />
+ <then>
+ <ant dir="${requirement.root}/@{requirement}"
+ antfile="buildRequirement.xml"
+ target="build.requirement"
+ inheritAll="true"
+ >
+ <property name="unzip.dest" value="@{unzipto}" />
+ <property name="requirement.name" value="@{requirement}" />
+ </ant>
+ </then>
+ <else>
+ <ant dir="${requirement.root}/@{requirement}"
+ antfile="${requirement.root}/generic/build.xml"
+ target="build.requirement"
+ inheritAll="true"
+ >
+ <property name="unzip.dest" value="@{unzipto}" />
+ <property name="requirement" value="@{requirement}" />
+ </ant>
+ </else>
+ </if>
+ <echo>load properties from ${requirement.root}/(a){requirement}/return.properties</echo>
+ <loadproperties srcFile="${requirement.root}/(a){requirement}/return.properties" />
+ </sequential>
+ </for>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="downloadRequirement">
+ <attribute name="requirement" />
+ <sequential>
+ <if>
+ <available file="${requirement.root}/(a){requirement}/buildRequirement.xml" />
+ <then>
+ <var name="requirement.build.xml" value="buildRequirement.xml" />
+ </then>
+ <else>
+ <var name="requirement.build.xml" value="${requirement.root}/generic/build.xml" />
+ </else>
+ </if>
+ <ant dir="${requirement.root}/@{requirement}"
+ antfile="${requirement.build.xml}"
+ target="download.requirement"
+ inheritAll="true"
+ >
+ <property name="requirement.name" value="@{requirement}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="unpackRequirement">
+ <attribute name="requirement" />
+ <attribute name="unpackto" />
+ <sequential>
+ <if>
+ <available file="${requirement.root}/(a){requirement}/buildRequirement.xml" />
+ <then>
+ <var name="requirement.build.xml" value="buildRequirement.xml" />
+ </then>
+ <else>
+ <var name="requirement.build.xml" value="${requirement.root}/generic/build.xml" />
+ </else>
+ </if>
+ <ant dir="${requirement.root}/@{requirement}"
+ antfile="${requirement.build.xml}"
+ target="build.requirement"
+ inheritAll="true"
+ >
+ <property name="unzip.dest" value="@{unpackto}" />
+ <property name="requirement.name" value="@{requirement}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="downloadRequirements">
+ <attribute name="requirements" />
+ <sequential>
+ <for list="@{requirements}" param="requirement">
+ <sequential>
+ <downloadRequirement requirement="@{requirement}" />
+ </sequential>
+ </for>
+ </sequential>
+ </macrodef>
+
+ <!--target name="downloadRequirements">
+ <sequential>
+ <for list="${requirements}" param="requirement">
+ <sequential>
+ <echo>${requirement.root}/(a){requirement}/return.properties is not available</echo>
+ <ant dir="${requirement.root}/@{requirement}"
+ antfile="buildRequirement.xml"
+ target="download.requirement"
+ inheritAll="true">
+ </ant>
+ </sequential>
+ </for>
+ </sequential>
+ </target-->
+
+ <target name="getBaseRequirements">
+ <property file="build.requires" />
+ <buildRequirements requirements="${build.requires}" unzipto="${build.output.directory}" />
+ </target>
+
+ <target name="cleanRequirements">
+ <!-- https://jira.jboss.org/jira/browse/JBQA-3313 Use static, shared space outside workspace, instead of working directly in the workspace -->
+ <if>
+ <available file="/home/hudson/static_build_env/jbds" type="dir" />
+ <then>
+ <var name="requirement.build.root" unset="true" />
+ <property name="requirement.build.root" value="/home/hudson/static_build_env/jbds/requirements" />
+ <mkdir dir="${requirement.build.root}" />
+ </then>
+ </if>
+ <echo level="debug">requirement.build.root = ${requirement.build.root}</echo>
+
+ <delete failonerror="false" includeemptydirs="true">
+ <fileset dir="${requirement.root}" defaultexcludes="false">
+ <include name="**/return.properties" />
+ </fileset>
+ <!-- should check build.destination if builder is build instead of creating temp files in local SVN copy-->
+ <fileset dir="${build.root}/builders">
+ <include name="**/builder.built" />
+ </fileset>
+ </delete>
+ </target>
+
+ <macrodef name="buildBuilders">
+ <attribute name="builders" />
+ <sequential>
+ <for list="@{builders}" param="current-builder">
+ <sequential>
+ <runBuilder builder="@{current-builder}" />
+ </sequential>
+ </for>
+ </sequential>
+ </macrodef>
+</project>
\ No newline at end of file
Property changes on: trunk/requirements/buildRequirements.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/requirements/generic/build.xml
===================================================================
--- trunk/requirements/generic/build.xml (rev 0)
+++ trunk/requirements/generic/build.xml 2010-05-26 19:55:40 UTC (rev 22340)
@@ -0,0 +1,90 @@
+<project default="build.driver">
+
+ <property name="requirement" value="${requirement.name}"/>
+ <property name="driver.properties" value="${basedir}/build.properties" />
+ <loadproperties srcFile="${driver.properties}"/>
+
+ <property name="driver.dest" value="${requirement.build.root}/${requirement}"/>
+
+ <target name="init" />
+
+ <target name="build.requirement" depends="build.driver" />
+
+ <target name="unpack.requirement" depends="unzip.archive" />
+
+ <target name="download.requirement" depends="download.archive" />
+
+ <target name="build.driver" depends="unzip.archive" />
+
+ <target name="unzip.archive" depends="download.archive">
+ <property name="ext" value="zip"/>
+ <echo level="debug">Unpacking ${driver.dest}/${build.archive} to ${unzip.dest}</echo>
+ <antcall target="unpack-${ext}" />
+ <!--unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}" /-->
+ <tstamp/>
+ <antcall target="post.unpack.requirement" />
+ </target>
+
+ <target name="post.unpack.requirement">
+ <!--echo file="${requirement.root}/${requirement}/return.properties"># Generated on ${DSTAMP} ${TSTAMP}
+ </echo-->
+ </target>
+
+ <target name="unpack-tar.gz" >
+ <untar compression="gzip" src="${driver.dest}/${build.archive}" dest="${unzip.dest}" />
+ </target>
+
+ <target name="unpack-zip" >
+ <unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}" />
+ </target>
+
+ <target name="check.archive" depends="init">
+ <echo>Checking the requirement's archive ${build.archive}</echo>
+ <if>
+ <available file="${driver.dest}/${build.archive}" />
+ <then>
+ <if>
+ <isset property="md5" />
+ <then>
+ <echo>Archive is downloaded and MD5 checksum is provided</echo>
+ <echo level="verbose">Calcualting checksum for downloaded archive</echo>
+ <checksum file="${driver.dest}/${build.archive}" property="current.md5"/>
+ <echo level="verbose">${current.md5} calculated</echo>
+ <echo level="verbose">${md5} provided</echo>
+ <condition property="archive.exists">
+ <equals arg1="${current.md5}" arg2="${md5}"/>
+ </condition>
+ <if>
+ <isset property="archive.exists" />
+ <then>
+ <echo>Downloaded archive is correct, download is not required</echo>
+ </then>
+ <else>
+ <echo>Downloaded archive checksum is not correct, new download required</echo>
+ </else>
+ </if>
+ </then>
+ <else>
+ <echo>Archive is downloaded and no MD5 checksum is provided</echo>
+ <property name="archive.exists" value="true"/>
+ </else>
+ </if>
+ </then>
+ <else>
+ <echo>Archive has not downloaded yet, download required</echo>
+ </else>
+ </if>
+ </target>
+
+ <target name="download.archive" depends="check.archive" unless="archive.exists">
+ <mkdir dir="${driver.dest}"/>
+ <get taskname="download ${requirement}"
+ src="${build.uri}/${build.archive}"
+ dest="${driver.dest}/${build.archive}" />
+ <antcall target="post.download.requirement"/>
+ </target>
+
+ <target name="post.download.requirement">
+ </target>
+
+</project>
Property changes on: trunk/requirements/generic/build.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Added: trunk/requirements/jbossas/build.properties
===================================================================
--- trunk/requirements/jbossas/build.properties (rev 0)
+++ trunk/requirements/jbossas/build.properties 2010-05-26 19:55:40 UTC (rev 22340)
@@ -0,0 +1,27 @@
+#jbossas.build.uri=http://downloads.sourceforge.net/sourceforge/jboss
+jbossas.build.uri=http://repository.jboss.org/sourceforge
+
+jboss32.build.uri=${jbossas.build.uri}
+jboss32.build.name=jboss-3.2.8.SP1
+jboss32.build.archive=${jboss32.build.name}.zip
+jboss32.build.archive.md5=97147374ee5b048e4462c7ebaf3cccb5
+
+jboss40.build.uri=${jbossas.build.uri}
+jboss40.build.name=jboss-4.0.5.GA
+jboss40.build.archive=${jboss40.build.name}.zip
+jboss40.build.archive.md5=a39e85981958fea2411e9346e218aa39
+
+jboss42.build.uri=${jbossas.build.uri}
+jboss42.build.name=jboss-4.2.3.GA
+jboss42.build.archive=${jboss42.build.name}.zip
+jboss42.build.archive.md5=d1ded1cc876733fec96b5e2934c81220
+
+jboss50.build.uri=${jbossas.build.uri}
+jboss50.build.name=jboss-5.0.1.GA
+jboss50.build.archive=${jboss50.build.name}.zip
+jboss50.build.archive.md5=dd308175c43796db824692cb0cdea82d
+
+jboss51.build.uri=${jbossas.build.uri}
+jboss51.build.name=jboss-5.1.0.GA
+jboss51.build.archive=${jboss51.build.name}.zip
+jboss51.build.archive.md5=78322c75ca0c13002a04418b4a8bc920
\ No newline at end of file
Property changes on: trunk/requirements/jbossas/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/requirements/jbossas/buildRequirement.xml
===================================================================
--- trunk/requirements/jbossas/buildRequirement.xml (rev 0)
+++ trunk/requirements/jbossas/buildRequirement.xml 2010-05-26 19:55:40 UTC (rev 22340)
@@ -0,0 +1,63 @@
+<project default="build.requirement">
+ <property file="build.properties"/>
+
+ <target name="build-jbossas">
+ <ant antfile="../generic/build.xml" target="${action}" inheritall="true">
+ <property name="requirement" value="jbossas"/>
+ </ant>
+ </target>
+
+ <target name="build.requirement">
+ <antcall target="build-all" >
+ <param name="action" value="build.requirement" />
+ </antcall>
+ <echo file="${requirement.root}/jbossas/return.properties">
+ jboss32.home=${unzip.dest}/${jboss32.build.name}
+ jboss40.home=${unzip.dest}/${jboss40.build.name}
+ jboss42.home=${unzip.dest}/${jboss42.build.name}
+ jboss50.home=${unzip.dest}/${jboss50.build.name}
+ jboss51.home=${unzip.dest}/${jboss51.build.name}
+ </echo>
+ </target>
+
+ <target name="download.requirement">
+ <antcall target="build-all" >
+ <param name="action" value="download.requirement" />
+ </antcall>
+ <!--echo file="${requirement.root}/jbossas/return.properties">
+ jboss32.home=${unzip.dest}/${jboss32.build.name}
+ jboss40.home=${unzip.dest}/${jboss40.build.name}
+ jboss42.home=${unzip.dest}/${jboss42.build.name}
+ jboss50.home=${unzip.dest}/${jboss50.build.name}
+ jboss51.home=${unzip.dest}/${jboss51.build.name}
+ </echo-->
+ </target>
+
+ <target name="build-all" >
+ <antcall target="build-jbossas">
+ <param name="build.uri" value="${jboss32.build.uri}"/>
+ <param name="build.archive" value="${jboss32.build.archive}"/>
+ <param name="md5" value="${jboss32.build.archive.md5}"/>
+ </antcall>
+ <antcall target="build-jbossas">
+ <param name="build.uri" value="${jboss40.build.uri}"/>
+ <param name="build.archive" value="${jboss40.build.archive}"/>
+ <param name="md5" value="${jboss40.build.archive.md5}"/>
+ </antcall>
+ <antcall target="build-jbossas">
+ <param name="build.uri" value="${jboss42.build.uri}"/>
+ <param name="build.archive" value="${jboss42.build.archive}"/>
+ <param name="md5" value="${jboss42.build.archive.md5}"/>
+ </antcall>
+ <antcall target="build-jbossas">
+ <param name="build.uri" value="${jboss50.build.uri}"/>
+ <param name="build.archive" value="${jboss50.build.archive}"/>
+ <param name="md5" value="${jboss50.build.archive.md5}"/>
+ </antcall>
+ <antcall target="build-jbossas">
+ <param name="build.uri" value="${jboss51.build.uri}"/>
+ <param name="build.archive" value="${jboss51.build.archive}"/>
+ <param name="md5" value="${jboss51.build.archive.md5}"/>
+ </antcall>
+ </target>
+</project>
Property changes on: trunk/requirements/jbossas/buildRequirement.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/requirements/jbossas/return.properties
===================================================================
--- trunk/requirements/jbossas/return.properties (rev 0)
+++ trunk/requirements/jbossas/return.properties 2010-05-26 19:55:40 UTC (rev 22340)
@@ -0,0 +1,7 @@
+
+ jboss32.home=/home/eskimo/Projects/jbds-build/jbosstools-src/requirements/target/jboss-3.2.8.SP1
+ jboss40.home=/home/eskimo/Projects/jbds-build/jbosstools-src/requirements/target/jboss-4.0.5.GA
+ jboss42.home=/home/eskimo/Projects/jbds-build/jbosstools-src/requirements/target/jboss-4.2.3.GA
+ jboss50.home=/home/eskimo/Projects/jbds-build/jbosstools-src/requirements/target/jboss-5.0.1.GA
+ jboss51.home=/home/eskimo/Projects/jbds-build/jbosstools-src/requirements/target/jboss-5.1.0.GA
+
\ No newline at end of file
Property changes on: trunk/requirements/jbossas/return.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/requirements/lib/ant-contrib.jar
===================================================================
(Binary files differ)
Property changes on: trunk/requirements/lib/ant-contrib.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22339 - branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-05-26 15:47:19 -0400 (Wed, 26 May 2010)
New Revision: 22339
Modified:
branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
Log:
JBIDE-6291: Compilation errors in AbstractTypeDefinition (org.jboss.tools.cdi.core)
patcb is applied
Modified: branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
===================================================================
--- branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-05-26 19:39:24 UTC (rev 22338)
+++ branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-05-26 19:47:19 UTC (rev 22339)
@@ -19,7 +19,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.core.SourceRange;
+import org.eclipse.jdt.core.SourceRange;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.impl.ParametedType;
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22338 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-05-26 15:39:24 -0400 (Wed, 26 May 2010)
New Revision: 22338
Added:
trunk/requirements/
Log:
https://jira.jboss.org/browse/JBDS-1202 problems running tests
Share project "requirements" into "https://svn.jboss.org/repos/jbosstools"
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22337 - in trunk/as: tests/org.jboss.ide.eclipse.as.archives.integration.test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-05-26 14:50:17 -0400 (Wed, 26 May 2010)
New Revision: 22337
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties
Log:
as.integration.test plug-in do not need unpacking during installation to work with tycho build. Manifest was adjusted.
Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2010-05-26 18:33:57 UTC (rev 22336)
+++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2010-05-26 18:50:17 UTC (rev 22337)
@@ -1,54 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.ide.eclipse.as.test.feature"
- label="JBossTools Test"
- version="2.1.0.qualifier"
- provider-name="JBoss by Red Hat">
-
- <description url="http://www.jboss.org/tools">
- JBossAS Test
- </description>
-
- <copyright>
- JBoss, Home of Professional Open Source
-Copyright 2006-2010, JBoss by Red Hat, and individual contributors as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
- </copyright>
-
- <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.
-</license>
-
-
- <plugin
- id="org.jboss.ide.eclipse.as.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jmx.core.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.ide.eclipse.as.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.ide.eclipse.as.archives.integration.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.ide.eclipse.as.test.feature"
+ label="JBossTools Test"
+ version="2.1.0.qualifier"
+ provider-name="JBoss by Red Hat">
+
+ <description url="http://www.jboss.org/tools">
+ JBossAS Test
+ </description>
+
+ <copyright>
+ JBoss, Home of Professional Open Source
+Copyright 2006-2010, JBoss by Red Hat, and individual contributors as indicated
+by the @authors tag. See the copyright.txt in the distribution
+for a full listing of individual contributors.
+ </copyright>
+
+ <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.
+ </license>
+
+ <plugin
+ id="org.jboss.ide.eclipse.as.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jmx.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.ide.eclipse.as.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.ide.eclipse.as.archives.integration.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF 2010-05-26 18:33:57 UTC (rev 22336)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF 2010-05-26 18:50:17 UTC (rev 22337)
@@ -5,7 +5,7 @@
Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.archives.integration.test.ASArchivesIntegrationTest
Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: jbossasarchivesintegrationtest.jar
+Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties 2010-05-26 18:33:57 UTC (rev 22336)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties 2010-05-26 18:50:17 UTC (rev 22337)
@@ -1,6 +1,6 @@
bin.includes = META-INF/,\
- jbossasarchivesintegrationtest.jar,\
- plugin.properties
-source.jbossasarchivesintegrationtest.jar = src/
+ plugin.properties,\
+ .
jars.compile.order = jbossasarchivesintegrationtest.jar
-output.jbossasarchivesintegrationtest.jar = bin/
\ No newline at end of file
+output.jbossasarchivesintegrationtest.jar = bin/
+source.. = src/
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22336 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-05-26 14:33:57 -0400 (Wed, 26 May 2010)
New Revision: 22336
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AllAsUiTests.java
Log:
AllAsuITests renamed to AsUiAllTests to let ticho build find the suite
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AllAsUiTests.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AllAsUiTests.java 2010-05-26 17:49:37 UTC (rev 22335)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AllAsUiTests.java 2010-05-26 18:33:57 UTC (rev 22336)
@@ -1,16 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.test;
-
-import org.jboss.ide.eclipse.as.ui.wizards.test.NewServerWizardTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllAsUiTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(AllAsUiTests.class.getName());
- suite.addTestSuite(NewServerWizardTest.class);
- return suite;
- }
-
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java (from rev 22298, trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AllAsUiTests.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java 2010-05-26 18:33:57 UTC (rev 22336)
@@ -0,0 +1,16 @@
+package org.jboss.ide.eclipse.as.ui.test;
+
+import org.jboss.ide.eclipse.as.ui.wizards.test.NewServerWizardTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AsUiAllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite(AsUiAllTests.class.getName());
+ suite.addTestSuite(NewServerWizardTest.class);
+ return suite;
+ }
+
+}
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 7 months
- 1
- 0