JBoss Tools SVN: r21453 - 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-04-13 16:39:11 -0400 (Tue, 13 Apr 2010)
New Revision: 21453
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/NamedStereotype.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708 Modified tests.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/NamedStereotype.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/NamedStereotype.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/NamedStereotype.java 2010-04-13 20:39:11 UTC (rev 21453)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.jbt.validation.resources;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
+import javax.inject.Named;
+
+@Stereotype
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@RequestScoped
+@Inherited
+@Named
+@interface NamedStereotype {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/NamedStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java 2010-04-13 16:33:43 UTC (rev 21452)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java 2010-04-13 20:39:11 UTC (rev 21453)
@@ -20,7 +20,7 @@
@Produces @WebServiceRef(lookup="java:app/service/PaymentService")
PaymentService paymentServiceResourceBroken;
- @Named
+ @NamedStereotype
@Produces @EJB //(ejbLink="../their.jar#PaymentService")
PaymentService paymentServiceEjbResourceBroken;
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-04-13 16:33:43 UTC (rev 21452)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-04-13 20:39:11 UTC (rev 21453)
@@ -37,7 +37,7 @@
*/
public void testResourceWithELName() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 15, 19, 23, 27, 31);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 15, 19, 24, 27, 31);
}
public void testLegalTypesInTyped() throws Exception {
14 years, 9 months
JBoss Tools SVN: r21452 - 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-04-13 12:33:43 -0400 (Tue, 13 Apr 2010)
New Revision: 21452
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotated.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.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.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 validation rule: Producer field declaration of resource specifies EL name.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2010-04-13 15:39:57 UTC (rev 21451)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2010-04-13 16:33:43 UTC (rev 21452)
@@ -44,4 +44,9 @@
public String STATEFUL_ANNOTATION_TYPE_NAME = "javax.ejb.Stateful";
public String STATELESS_ANNOTATION_TYPE_NAME = "javax.ejb.Stateless";
-}
+ public String RESOURCE_ANNOTATION_TYPE_NAME = "javax.annotation.Resource";
+ public String WEB_SERVICE_REF_ANNOTATION_TYPE_NAME = "javax.xml.ws.WebServiceRef";
+ public String EJB_ANNOTATION_TYPE_NAME = "javax.ejb.EJB";
+ public String PERSISTENCE_CONTEXT_ANNOTATION_TYPE_NAME = "javax.persistence.PersistenceContext";
+ public String PERSISTENCE_UNIT_ANNOTATION_TYPE_NAME = "javax.persistence.PersistenceUnit";
+}
\ No newline at end of file
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotated.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotated.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotated.java 2010-04-13 16:33:43 UTC (rev 21452)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core;
+
+import java.util.List;
+
+import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
+
+/**
+ * Represents a CDI element that can be annotated.
+ *
+ * @author Alexey Kazakov
+ */
+public interface IAnnotated {
+
+ /**
+ * Get all annotations of the element.
+ *
+ * @return all annotations of the element, or an empty list if no
+ * annotations are present
+ */
+ List<AnnotationDeclaration> getAnnotations();
+
+ /**
+ * Get element annotation of a certain annotation type.
+ *
+ * @param annotationTypeName
+ * the name of the annotation type
+ * @return the element annotation of the given annotation type, or a null
+ * value
+ */
+ IAnnotationDeclaration getAnnotation(String annotationTypeName);
+
+ /**
+ * Determine if the element has an annotation of a certain annotation type.
+ *
+ * @param annotationTypeName
+ * the annotation type to check for
+ * @return true if the element has an annotation of the given annotation
+ * type, or false otherwise
+ */
+ boolean isAnnotationPresent(String annotationTypeName);
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotated.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2010-04-13 15:39:57 UTC (rev 21451)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2010-04-13 16:33:43 UTC (rev 21452)
@@ -21,7 +21,7 @@
*
* @author Alexey Kazakov
*/
-public interface IBean extends IScoped, ICDIElement, IVariable {
+public interface IBean extends IScoped, ICDIElement, IVariable, IAnnotated {
/**
* Returns the corresponding IType of the managed bean or session bean or of
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2010-04-13 15:39:57 UTC (rev 21451)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2010-04-13 16:33:43 UTC (rev 21452)
@@ -17,7 +17,7 @@
*
* @author Alexey Kazakov
*/
-public interface IBeanMember extends IJavaSourceReference {
+public interface IBeanMember extends IJavaSourceReference, IAnnotated {
/**
* Returns the class bean that declares this method.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-04-13 15:39:57 UTC (rev 21451)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-04-13 16:33:43 UTC (rev 21452)
@@ -25,6 +25,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IAnnotated;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
@@ -43,7 +44,7 @@
* @author Viacheslav Kabanovich
*
*/
-public class AbstractBeanElement extends CDIElement {
+public class AbstractBeanElement extends CDIElement implements IAnnotated {
protected AbstractMemberDefinition definition;
public AbstractBeanElement() {}
@@ -56,6 +57,24 @@
return definition;
}
+ public List<AnnotationDeclaration> getAnnotations() {
+ if(definition!=null) {
+ return definition.getAnnotations();
+ }
+ return Collections.emptyList();
+ }
+
+ public IAnnotationDeclaration getAnnotation(String annotationTypeName) {
+ if(definition!=null) {
+ return definition.getAnnotation(annotationTypeName);
+ }
+ return null;
+ }
+
+ public boolean isAnnotationPresent(String annotationTypeName) {
+ return definition!=null && definition.isAnnotationPresent(annotationTypeName);
+ }
+
protected AnnotationDeclaration findNamedAnnotation() {
AnnotationDeclaration named = getDefinition().getNamedAnnotation();
if(named != null) return named;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-04-13 15:39:57 UTC (rev 21451)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2010-04-13 16:33:43 UTC (rev 21452)
@@ -22,6 +22,7 @@
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IAnnotated;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.InterceptorBindingDeclaration;
import org.jboss.tools.cdi.internal.core.impl.QualifierDeclaration;
@@ -33,7 +34,7 @@
* @author Viacheslav Kabanovich
*
*/
-public abstract class AbstractMemberDefinition {
+public abstract class AbstractMemberDefinition implements IAnnotated {
protected List<AnnotationDeclaration> annotations = new ArrayList<AnnotationDeclaration>();
protected IAnnotatable member;
protected Map<String, AnnotationDeclaration> annotationsByType = new HashMap<String, AnnotationDeclaration>();
@@ -82,14 +83,30 @@
}
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IAnnotated#getAnnotations()
+ */
public List<AnnotationDeclaration> getAnnotations() {
return annotations;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IAnnotated#getAnnotation(java.lang.String)
+ */
public AnnotationDeclaration getAnnotation(String typeName) {
return annotationsByType.get(typeName);
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IAnnotated#isAnnotationPresent(java.lang.String)
+ */
+ public boolean isAnnotationPresent(String annotationTypeName) {
+ return getAnnotation(annotationTypeName)!=null;
+ }
+
public AnnotationDeclaration getNamedAnnotation() {
return annotationsByType.get(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
}
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-04-13 15:39:57 UTC (rev 21451)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-04-13 16:33:43 UTC (rev 21452)
@@ -38,6 +38,8 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.IProducerField;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.IScopeDeclaration;
@@ -264,9 +266,34 @@
validateTyped(bean);
validateBeanScope(bean);
+ if(bean instanceof IProducer) {
+ validateProducer((IProducer)bean);
+ }
+
// TODO
}
+ private static final String[] RESOURCE_ANNOTATIONS = {CDIConstants.RESOURCE_ANNOTATION_TYPE_NAME, CDIConstants.WEB_SERVICE_REF_ANNOTATION_TYPE_NAME, CDIConstants.EJB_ANNOTATION_TYPE_NAME, CDIConstants.PERSISTENCE_CONTEXT_ANNOTATION_TYPE_NAME, CDIConstants.PERSISTENCE_UNIT_ANNOTATION_TYPE_NAME};
+
+ private void validateProducer(IProducer producer) {
+ if(producer instanceof IProducerField) {
+ IProducerField producerField = (IProducerField)producer;
+ if(producerField.getName()!=null) {
+ IAnnotationDeclaration declaration;
+ for (String annotationType : RESOURCE_ANNOTATIONS) {
+ declaration = producerField.getAnnotation(annotationType);
+ if(declaration!=null) {
+ IAnnotationDeclaration nameDeclaration = producerField.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ if(nameDeclaration!=null) {
+ declaration = nameDeclaration;
+ }
+ addError(CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, declaration, producer.getResource());
+ }
+ }
+ }
+ }
+ }
+
/*
* 2.2.2. Restricting the bean types of a bean
* - bean class or producer method or field specifies a @Typed annotation,
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-04-13 15:39:57 UTC (rev 21451)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-04-13 16:33:43 UTC (rev 21452)
@@ -31,7 +31,7 @@
CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_name,
new String[][]{
{CDIPreferences.STEREOTYPE_DECLARES_NON_EMPTY_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_stereotypeDeclaresNonEmptyName_label},
-// {CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_resourceProducerFieldSetsElName_label},
+ {CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_resourceProducerFieldSetsElName_label},
// {CDIPreferences.PARAM_INJECTION_DECLARES_EMPTY_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_paramInjectionDeclaresEmptyName_label},
// {CDIPreferences.INTERCEPTOR_HAS_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorHasName_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-04-13 15:39:57 UTC (rev 21451)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2010-04-13 16:33:43 UTC (rev 21452)
@@ -24,7 +24,7 @@
##Section Name
CDIValidatorConfigurationBlock_section_name=Name
CDIValidatorConfigurationBlock_pb_stereotypeDeclaresNonEmptyName_label=Stereotype has non-empty name:
-CDIValidatorConfigurationBlock_pb_resourceProducerFieldSetsElName_label=Producer field sets EL name:
+CDIValidatorConfigurationBlock_pb_resourceProducerFieldSetsElName_label=Producer field declaration of resource specifies EL name:
CDIValidatorConfigurationBlock_pb_paramInjectionDeclaresEmptyName_label=Empty name at parameter injection:
CDIValidatorConfigurationBlock_pb_interceptorHasName_label=Interceptor declares name:
CDIValidatorConfigurationBlock_pb_decoratorHasName_label=Decorator declares name:
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-04-13 15:39:57 UTC (rev 21451)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-04-13 16:33:43 UTC (rev 21452)
@@ -37,11 +37,7 @@
*/
public void testResourceWithELName() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 15);
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 19);
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 23);
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 27);
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 31);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 15, 19, 23, 27, 31);
}
public void testLegalTypesInTyped() throws Exception {
14 years, 9 months
JBoss Tools SVN: r21451 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-13 11:39:57 -0400 (Tue, 13 Apr 2010)
New Revision: 21451
Modified:
branches/modular_build/build.xml
Log:
JBDS-486: add ant-contrib, debug output, and generate settings.xml file so that we can use a local m2 repo dir
Modified: branches/modular_build/build.xml
===================================================================
--- branches/modular_build/build.xml 2010-04-13 05:28:35 UTC (rev 21450)
+++ branches/modular_build/build.xml 2010-04-13 15:39:57 UTC (rev 21451)
@@ -4,6 +4,9 @@
<!-- Configuration Start -->
<!-- must set name of component to build/test -->
<property name="COMPONENT" value="tests" />
+
+ <!-- more verbose output -->
+ <property name="debug" value="false" />
<!-- Configuration Ends -->
<!-- To run this script in Eclipse:
@@ -18,19 +21,65 @@
<target name="run" depends="init, genpom, install, deploy" />
<!-- override for local build -->
- <available file="/qa/tools/opt" type="dir" property="isJBossQA" />
- <target name="local" unless="isJBossQA">
+ <condition property="isInHudson" value="true">
+ <or>
+ <contains string="${user.dir}" substring="hudson" />
+ <contains string="${user.name}" substring="hudson" />
+ <contains string="${user.home}" substring="hudson" />
+ </or>
+ </condition>
+ <target name="local" unless="isInHudson">
<property name="WORKINGDIR" value="${basedir}" />
<property name="COMMON_TOOLS" value="${java.io.tmpdir}" />
</target>
- <!-- default settings for JBQA Hudson -->
+ <target name="get.ant-contrib" unless="ant-contrib.jar.exists">
+ <property name="ANTCONTRIB_MIRROR" value="http://downloads.sourceforge.net/ant-contrib/" />
+ <get usetimestamp="true"
+ dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip"
+ src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip"
+ />
+ <touch file="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" />
+ <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" />
+ <unzip src="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip"
+ dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_"
+ overwrite="true"
+ />
+ <copy file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar"
+ tofile="${COMMON_TOOLS}/ant-contrib.jar"
+ failonerror="true"
+ />
+ <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" />
+ </target>
+
<target name="init" depends="local">
<property name="WORKINGDIR" value="${basedir}" />
- <!-- <property name="COMMON_TOOLS" value="/qa/tools/opt" /> -->
<property name="COMMON_TOOLS" value="${basedir}/../tools" />
<mkdir dir="${COMMON_TOOLS}" />
+ <available file="${COMMON_TOOLS}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" />
+ <antcall target="get.ant-contrib" />
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
+ </classpath>
+ </taskdef>
+
+ <macrodef name="debug">
+ <text name="echo" />
+ <sequential>
+ <if>
+ <and>
+ <isset property="debug" />
+ <istrue value="${debug}" />
+ </and>
+ <then>
+ <echo message="@{echo}" />
+ </then>
+ </if>
+ </sequential>
+ </macrodef>
+
<property name="MAVEN_MIRROR" value="http://mirror.csclub.uwaterloo.ca/apache/maven/binaries" />
<get usetimestamp="true"
dest="${COMMON_TOOLS}/apache-maven-3.0-alpha-7-bin.tar.gz"
@@ -41,7 +90,7 @@
dest="${COMMON_TOOLS}"
src="${COMMON_TOOLS}/apache-maven-3.0-alpha-7-bin.tar.gz"
/>
- <chmod perm="755" file="${COMMON_TOOLS}/apache-maven-3.0-alpha-7/bin/mvn"/>
+ <chmod perm="755" file="${COMMON_TOOLS}/apache-maven-3.0-alpha-7/bin/mvn" />
</target>
<target name="genpom">
@@ -52,9 +101,18 @@
</target>
<target name="install">
- <echo>Run pom file: ${WORKINGDIR}/${COMPONENT}/pom.xml</echo>
-
+ <debug>Generate settings.xml file</debug>
+ <mkdir dir="${WORKINGDIR}/m2-repository" />
+ <echo file="${COMMON_TOOLS}/apache-maven-3.0-alpha-7/conf/settings.xml">
+<settings xmlns="http://maven.apache.org/settings/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <localRepository>${WORKINGDIR}/m2-repository</localRepository>
+ <interactiveMode>false</interactiveMode>
+ <pluginGroups></pluginGroups><proxies></proxies><servers></servers><mirrors></mirrors><profiles></profiles>
+</settings></echo>
+
+ <debug>Run pom file: ${WORKINGDIR}/${COMPONENT}/pom.xml</debug>
<exec executable="${COMMON_TOOLS}/apache-maven-3.0-alpha-7/bin/mvn" dir="${WORKINGDIR}/${COMPONENT}">
+ <arg line="-gs ${COMMON_TOOLS}/apache-maven-3.0-alpha-7/conf/settings.xml" />
<!-- <arg line="-o -Dmaven.test.skip" /> -->
<arg line="-fae clean install" />
</exec>
14 years, 9 months
JBoss Tools SVN: r21450 - branches/modular_build/vpe/features/org.jboss.tools.vpe.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-04-13 01:28:35 -0400 (Tue, 13 Apr 2010)
New Revision: 21450
Added:
branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/.project
branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/build.properties
branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/feature.xml
Log:
vpe editor feature
Added: branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/.project
===================================================================
--- branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/.project (rev 0)
+++ branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/.project 2010-04-13 05:28:35 UTC (rev 21450)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.vpe.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/build.properties
===================================================================
--- branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/build.properties (rev 0)
+++ branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/build.properties 2010-04-13 05:28:35 UTC (rev 21450)
@@ -0,0 +1 @@
+bin.includes = feature.xml
Property changes on: branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/feature.xml
===================================================================
--- branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/feature.xml (rev 0)
+++ branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2010-04-13 05:28:35 UTC (rev 21450)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.vpe.feature"
+ label="Feature"
+ version="3.1.0.qualifier">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <plugin
+ id="org.jboss.tools.vpe"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.docbook"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.html"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.jsp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.resref"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.ui.palette"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.xulrunner"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Property changes on: branches/modular_build/vpe/features/org.jboss.tools.vpe.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r21448 - in trunk/birt/plugins: org.jboss.tools.birt.oda.ui/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-04-12 19:06:44 -0400 (Mon, 12 Apr 2010)
New Revision: 21448
Modified:
trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF
trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/DataTypes.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6041 attempting to create a birt report with EnumType, gives Enuy
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/DataTypes.java
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/DataTypes.java 2010-04-12 21:35:26 UTC (rev 21447)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/DataTypes.java 2010-04-12 23:06:44 UTC (rev 21448)
@@ -59,7 +59,9 @@
typeStringIntPair.put( "BIG_INTEGER", new Integer( INT ) ); //$NON-NLS-1$
typeStringIntPair.put( "NULL", new Integer ( NULL ) ); //$NON-NLS-1$
typeStringIntPair.put( UNKNOWN, new Integer ( STRING ) );
-
+ typeStringIntPair.put( "ORG.HIBERNATE.TYPE.ENUMTYPE", new Integer ( STRING ) ); //$NON-NLS-1$
+ typeStringIntPair.put( "ENUMTYPE", new Integer ( STRING ) ); //$NON-NLS-1$
+
}
/**
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF 2010-04-12 21:35:26 UTC (rev 21447)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF 2010-04-12 23:06:44 UTC (rev 21448)
@@ -14,6 +14,7 @@
org.eclipse.jdt.core,
org.eclipse.ui.workbench.texteditor,
org.hibernate.eclipse.console,
- org.hibernate.eclipse
+ org.hibernate.eclipse,
+ org.eclipse.core.resources
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
14 years, 9 months
JBoss Tools SVN: r21447 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-04-12 17:35:26 -0400 (Mon, 12 Apr 2010)
New Revision: 21447
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
Added JUnit test for https://jira.jboss.org/jira/browse/JBIDE-6176
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-04-12 21:30:29 UTC (rev 21446)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-04-12 21:35:26 UTC (rev 21447)
@@ -155,6 +155,21 @@
}
/**
+ * Test for https://jira.jboss.org/jira/browse/JBIDE-6176
+ * @throws CoreException
+ */
+ public void testFactory() throws CoreException {
+ IFile componentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.java");
+ copyContentsFile(componentFile, "src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new");
+ refreshProject(project);
+
+ assertMarkerIsNotCreated(componentFile, MARKER_TYPE, "Factory method \"somethings\" with a void return type must have an associated @Out/Databinder", 22);
+
+ copyContentsFile(componentFile, "src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.original");
+ refreshProject(project);
+ }
+
+ /**
* Test for https://jira.jboss.org/jira/browse/JBIDE-784
* @throws CoreException
*/
14 years, 9 months
JBoss Tools SVN: r21446 - trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-04-12 17:30:29 -0400 (Mon, 12 Apr 2010)
New Revision: 21446
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.original
Log:
Added JUnit test for https://jira.jboss.org/jira/browse/JBIDE-6176
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.java 2010-04-12 21:30:29 UTC (rev 21446)
@@ -0,0 +1,4 @@
+package org.domain.SeamWebWarTestProject.session;
+
+public class FactoryTest {
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new 2010-04-12 21:30:29 UTC (rev 21446)
@@ -0,0 +1,25 @@
+package org.domain.SeamWebWarTestProject.session;
+
+import java.util.List;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Factory;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.datamodel.DataModel;
+import org.jboss.seam.annotations.datamodel.DataModelSelection;
+
+@Name("factoryTestName")
+public class FactoryTest {
+ @DataModel("somethings")
+ @Out
+ private List<String> somethingList;
+
+ @DataModelSelection
+ @Out(value = "something", required = false, scope = ScopeType.SESSION)
+ private String selectedSomething;
+
+ @Factory(value = "somethings") // !Error is displayed right here!
+ public void findSomething() {
+ }
+}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.original
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.original (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.original 2010-04-12 21:30:29 UTC (rev 21446)
@@ -0,0 +1,4 @@
+package org.domain.SeamWebWarTestProject.session;
+
+public class FactoryTest {
+}
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r21445 - trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-04-12 17:24:56 -0400 (Mon, 12 Apr 2010)
New Revision: 21445
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.2
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.4
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.5
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.original
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml
Log:
Added JUnit test for https://jira.jboss.org/jira/browse/JBIDE-6176
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.2
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.2 2010-04-12 19:16:32 UTC (rev 21444)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.2 2010-04-12 21:24:56 UTC (rev 21445)
@@ -6,11 +6,11 @@
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.1.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.1.xsd
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.2.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.2.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd">
<component class="org.domain.SeamWebWarTestProject.session.StateComponent" name="stateComponent" scope="application">
<property name="abc">value1</property>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 2010-04-12 19:16:32 UTC (rev 21444)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 2010-04-12 21:24:56 UTC (rev 21445)
@@ -6,9 +6,9 @@
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.1.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.1.xsd
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.2.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.2.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.4
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.4 2010-04-12 19:16:32 UTC (rev 21444)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.4 2010-04-12 21:24:56 UTC (rev 21445)
@@ -6,11 +6,11 @@
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.1.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.1.xsd
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.2.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.2.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd">
<core:init debug="true" jndi-pattern="@jndiPattern@"/>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.5
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.5 2010-04-12 19:16:32 UTC (rev 21444)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.5 2010-04-12 21:24:56 UTC (rev 21445)
@@ -6,11 +6,11 @@
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.1.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.1.xsd
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.2.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.2.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd">
<core:init debug="true" jndi-pattern="@jndiPattern@"/>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.original
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.original 2010-04-12 19:16:32 UTC (rev 21444)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.original 2010-04-12 21:24:56 UTC (rev 21445)
@@ -6,11 +6,11 @@
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.1.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.1.xsd
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.2.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.2.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd">
<core:init debug="true" jndi-pattern="@jndiPattern@"/>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml 2010-04-12 19:16:32 UTC (rev 21444)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml 2010-04-12 21:24:56 UTC (rev 21445)
@@ -6,11 +6,11 @@
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.1.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.1.xsd
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.2.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.2.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd">
<core:init debug="true" jndi-pattern="@jndiPattern@"/>
14 years, 9 months
JBoss Tools SVN: r21444 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-12 15:16:32 -0400 (Mon, 12 Apr 2010)
New Revision: 21444
Modified:
trunk/build.xml
Log:
JBDS-486 re-enable genpom.xml and add -fae flag to mvn3
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-04-12 19:16:21 UTC (rev 21443)
+++ trunk/build.xml 2010-04-12 19:16:32 UTC (rev 21444)
@@ -45,11 +45,10 @@
</target>
<target name="genpom">
- <!-- comment out because genpom.xml is broken, genpom.scala won't run on Hudson, and we should just commit the poms anyway -->
- <!-- <ant antfile="genpom.xml" target="run">
+ <ant antfile="genpom.xml" target="run">
<property name="WORKINGDIR" value="${WORKINGDIR}/${COMPONENT}" />
<property name="pathToParentPom" value="../" />
- </ant> -->
+ </ant>
</target>
<target name="install">
@@ -57,7 +56,7 @@
<exec executable="${COMMON_TOOLS}/apache-maven-3.0-alpha-7/bin/mvn" dir="${WORKINGDIR}/${COMPONENT}">
<!-- <arg line="-o -Dmaven.test.skip" /> -->
- <arg line="clean install" />
+ <arg line="-fae clean install" />
</exec>
</target>
14 years, 9 months