JBoss Tools SVN: r21503 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-15 14:57:08 -0400 (Thu, 15 Apr 2010)
New Revision: 21503
Modified:
branches/modular_build/runstack.sh
Log:
add example of commandline flag
Modified: branches/modular_build/runstack.sh
===================================================================
--- branches/modular_build/runstack.sh 2010-04-15 18:51:47 UTC (rev 21502)
+++ branches/modular_build/runstack.sh 2010-04-15 18:57:08 UTC (rev 21503)
@@ -7,7 +7,7 @@
if [[ $# -lt 1 ]]; then
echo "Usage: $0 component1 component2 ..."
echo "Eg. $0 tests common jmx archives as"
- echo "Eg. $0 jst jsf vpe struts seam"
+ echo "Eg. $0 jst jsf vpe struts seam -Dmaven.test.skip"
exit 1
fi
14 years, 9 months
JBoss Tools SVN: r21502 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-15 14:51:47 -0400 (Thu, 15 Apr 2010)
New Revision: 21502
Modified:
branches/modular_build/genpom.xml
Log:
clean up output and remove unused macros
Modified: branches/modular_build/genpom.xml
===================================================================
--- branches/modular_build/genpom.xml 2010-04-15 18:42:02 UTC (rev 21501)
+++ branches/modular_build/genpom.xml 2010-04-15 18:51:47 UTC (rev 21502)
@@ -3,7 +3,6 @@
<property name="projectName" value="org.jboss.tools" />
<property name="pathToParentPom" value="" />
<property name="pomVersion" value="0.0.1-SNAPSHOT" />
- <property name="debug" value="false" />
<property name="dirsToExclude"
value="**/*.sdk.*, **/doc*, **/download.jboss.org, **/util, **/test, **/builders, **/contrib, **/releng, ."
/>
@@ -55,21 +54,6 @@
</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>
-
<!-- = = = = = = = = = = = = = = = = =
macrodef: write out a pom.xml which aggregates subdirs
= = = = = = = = = = = = = = = = = -->
@@ -112,8 +96,7 @@
casesensitive="true"
override="true"
/>
- <debug> Agg dir: ${activeDir}, artifactType: ${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, parentpom: @{parentpom}</debug>
- <!-- <echo>Write Agg @{dir}/pom.xml</echo> -->
+ <echo level="debug"> Agg dir: ${activeDir}, artifactType: ${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, parentpom: @{parentpom}</echo>
<echo file="@{dir}/pom.xml"><project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
@@ -187,7 +170,7 @@
casesensitive="true"
override="true"
/>
- <debug> Mod dir: ${activeDir}, artifactType: ${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, parentpom: @{parentpom}</debug>
+ <echo level="debug"> Mod dir: ${activeDir}, artifactType: ${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, parentpom: @{parentpom}</echo>
<echo file="@{dir}/pom.xml"><project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
@@ -252,7 +235,6 @@
<dirset dir="@{dir}" excludes="${dirsToExclude}" includes="*" />
</path>
<sequential>
- <!-- <debug> @{subdir}</debug> -->
<var name="aggregate" value="false" />
<if>
<or>
@@ -294,8 +276,8 @@
artifactVersion="@{artifactVersion}"
/>
- <debug>subdir = @{subdir}</debug>
- <echo>Aggregated: ${artifactIdAgg}</echo>
+ <echo level="debug">subdir = @{subdir}</echo>
+ <echo level="verbose">Aggregated: ${artifactIdAgg}</echo>
<var name="artifactIdAgg" unset="true" />
</else>
@@ -307,30 +289,6 @@
</sequential>
</macrodef>
- <!-- = = = = = = = = = = = = = = = = =
- macrodef: count items in a list
- = = = = = = = = = = = = = = = = = -->
- <!-- example usage:
- <list.count list="foo bar baz" />
- <echo message="${list.count.return}" />
- <var name="list.count.return" unset="true"/>
- <list.count list="foo bar" />
- <echo message="${list.count.return}" />
- -->
- <macrodef name="list.count">
- <attribute name="list" default="" />
- <sequential>
- <var name="count" value="" />
- <for param="listitem" list="@{list}" delimiter=",
- ">
- <sequential>
- <var name="count" value="${count}0" />
- </sequential>
- </for>
- <length property="list.count.return" string="${count}" />
- </sequential>
- </macrodef>
-
</target>
<target name="run" depends="init">
@@ -371,7 +329,7 @@
<!-- summary -->
<length string="${modulecountstring}" property="modulecount" />
<length string="${aggregatorcountstring}" property="aggregatorcount" />
- <echo>Modules: ${modulecount} Aggregations: ${aggregatorcount}</echo>
+ <echo level="info">Modules: ${modulecount} Aggregations: ${aggregatorcount}</echo>
</target>
@@ -519,7 +477,7 @@
</then>
</elseif>
<else>
- <echo>Warning! artifactVersion not found for ${dir}!</echo>
+ <echo level="verbose">Warning! artifactVersion not found for ${dir}!</echo>
<var name="artifactVersion" value="0.0.0" />
</else>
</if>
@@ -554,7 +512,7 @@
</and>
<then>
<basename file="${dir}" property="this.dir" />
- <echo>For ${this.dir}, got ${artifactVersion}; should be ${artifactVersion.from.tag}</echo>
+ <echo level="info">For ${this.dir}, got ${artifactVersion}; should be ${artifactVersion.from.tag}</echo>
</then>
<else>
<var name="artifactVersion.from.tag" value="${artifactVersion}" />
@@ -604,7 +562,7 @@
</then>
</elseif>
<else>
- <echo>Warning! artifactId not found for ${dir}!</echo>
+ <echo level="info">Warning! artifactId not found for ${dir}!</echo>
<basename property="artifactId" file="${dir}" />
</else>
</if>
14 years, 9 months
JBoss Tools SVN: r21501 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-15 14:42:02 -0400 (Thu, 15 Apr 2010)
New Revision: 21501
Modified:
branches/modular_build/build.xml
Log:
JBDS-486: support building multiple components and passing thru extra flags
Modified: branches/modular_build/build.xml
===================================================================
--- branches/modular_build/build.xml 2010-04-15 18:07:22 UTC (rev 21500)
+++ branches/modular_build/build.xml 2010-04-15 18:42:02 UTC (rev 21501)
@@ -1,9 +1,9 @@
-<!-- Run a given ${COMPONENT} build -->
+<!-- Build a given list of ${COMPONENTS} -->
<project default="run" basedir=".">
<!-- Configuration Start -->
<!-- must set name of component to build/test -->
- <property name="COMPONENT" value="tests" />
+ <property name="COMPONENTS" value="tests,common" />
<!-- default maven version -->
<property name="maven.version" value="3.0-alpha-7" />
@@ -15,10 +15,10 @@
<!-- To run this script via commandline (build default module, tests):
cd /home/nboldt/workspace36/jbosstools-modular_build; ant
or, to build a specific module:
- cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DCOMPONENT=jbpm
+ cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DCOMPONENTS=tests,common
-->
- <target name="run" depends="init, genpom, install, deploy" />
+ <target name="run" depends="init, genpoms, install, deploy" />
<!-- override for local build -->
<condition property="isInHudson" value="true">
@@ -78,38 +78,38 @@
<chmod perm="755" file="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/mvn" />
</target>
- <target name="genpom">
- <ant antfile="genpom.xml" target="run">
- <property name="WORKINGDIR" value="${WORKINGDIR}/${COMPONENT}" />
- <property name="pathToParentPom" value="../" />
- </ant>
+ <target name="genpoms">
+ <for param="COMPONENT" list="${COMPONENTS}" delimiter=",">
+ <sequential>
+ <ant antfile="genpom.xml" target="run">
+ <property name="WORKINGDIR" value="${WORKINGDIR}/@{COMPONENT}" />
+ <property name="pathToParentPom" value="../" />
+ </ant>
+ </sequential>
+ </for>
</target>
<target name="install">
- <!-- <echo level="debug">Generate settings.xml file</echo>
- <mkdir dir="${COMMON_TOOLS}/m2-repository" />
- <echo file="${COMMON_TOOLS}/apache-maven-${maven.version}/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>${COMMON_TOOLS}/m2-repository</localRepository>
- <interactiveMode>false</interactiveMode>
- <pluginGroups></pluginGroups><proxies></proxies><servers></servers><mirrors></mirrors><profiles></profiles>
-</settings></echo> -->
-
- <echo level="verbose">Exe: ${COMMON_TOOLS}/apache-maven-${maven.version}/bin/mvn</echo>
- <echo level="verbose">Pom: ${WORKINGDIR}/${COMPONENT}/pom.xml</echo>
- <exec executable="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/mvn"
- dir="${WORKINGDIR}/${COMPONENT}"
- failifexecutionfails="true"
- failonerror="true"
- timeout="10800000"
- >
- <env key="M2_HOME" value="${COMMON_TOOLS}/apache-maven-${maven.version}" />
- <env key="MAVEN_OPTS" value="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m" />
- <!-- more debug output with <env key="MAVEN_OPTS" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/> -->
- <!-- <arg line="-gs ${COMMON_TOOLS}/apache-maven-${maven.version}/conf/settings.xml" /> -->
- <!-- <arg line="-o -Dmaven.test.skip" /> -->
- <arg line="-Dmaven.repo.local=${COMMON_TOOLS}/m2-repository -fae clean install" />
- </exec>
+ <!-- could set -Dmaven.test.skip to skip tests, etc. -->
+ <property name="MAVEN_FLAGS" value="" />
+ <for param="COMPONENT" list="${COMPONENTS}" delimiter=",">
+ <sequential>
+ <echo level="verbose">Exe: ${COMMON_TOOLS}/apache-maven-${maven.version}/bin/mvn</echo>
+ <echo level="verbose">Pom: ${WORKINGDIR}/(a){COMPONENT}/pom.xml</echo>
+ <exec executable="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/mvn"
+ dir="${WORKINGDIR}/@{COMPONENT}"
+ failifexecutionfails="true"
+ failonerror="true"
+ timeout="10800000"
+ >
+ <env key="M2_HOME" value="${COMMON_TOOLS}/apache-maven-${maven.version}" />
+ <env key="MAVEN_OPTS" value="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m" />
+ <!-- more debug output with <env key="MAVEN_OPTS" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/> -->
+ <!-- <arg line="-o -Dmaven.test.skip" /> -->
+ <arg line="${MAVEN_FLAGS} -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository -fae clean install" />
+ </exec>
+ </sequential>
+ </for>
</target>
<target name="deploy">
14 years, 9 months
JBoss Tools SVN: r21500 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-15 14:07:22 -0400 (Thu, 15 Apr 2010)
New Revision: 21500
Modified:
branches/modular_build/build.xml
Log:
move -X flags into MAVEN_OPTS
Modified: branches/modular_build/build.xml
===================================================================
--- branches/modular_build/build.xml 2010-04-15 16:53:01 UTC (rev 21499)
+++ branches/modular_build/build.xml 2010-04-15 18:07:22 UTC (rev 21500)
@@ -104,13 +104,11 @@
timeout="10800000"
>
<env key="M2_HOME" value="${COMMON_TOOLS}/apache-maven-${maven.version}" />
- <!-- <env key="MAVEN_OPTS"
- value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
- /> -->
+ <env key="MAVEN_OPTS" value="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m" />
+ <!-- more debug output with <env key="MAVEN_OPTS" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/> -->
<!-- <arg line="-gs ${COMMON_TOOLS}/apache-maven-${maven.version}/conf/settings.xml" /> -->
<!-- <arg line="-o -Dmaven.test.skip" /> -->
<arg line="-Dmaven.repo.local=${COMMON_TOOLS}/m2-repository -fae clean install" />
- <arg line="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m" />
</exec>
</target>
14 years, 9 months
JBoss Tools SVN: r21499 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-04-15 12:53:01 -0400 (Thu, 15 Apr 2010)
New Revision: 21499
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2809
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java 2010-04-15 14:58:30 UTC (rev 21498)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java 2010-04-15 16:53:01 UTC (rev 21499)
@@ -38,6 +38,7 @@
PROJECT_TEMPLATE = new FilterSet();
PROJECT_TEMPLATE.addFilter("projectName","${project.name}"); //$NON-NLS-1$ //$NON-NLS-2$
+ PROJECT_TEMPLATE.addFilter("ejbProjectName","${seam.ejb.project}"); //$NON-NLS-1$ //$NON-NLS-2$
PROJECT_TEMPLATE.addFilter("jbossHome","${jboss.home}"); //$NON-NLS-1$ //$NON-NLS-2$
PROJECT_TEMPLATE.addFilter("hbm2ddl","${hibernate.hbm2ddl.auto}"); //$NON-NLS-1$ //$NON-NLS-2$
PROJECT_TEMPLATE.addFilter("driverJar","${driver.file}"); //$NON-NLS-1$ //$NON-NLS-2$
14 years, 9 months
JBoss Tools SVN: r21498 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/meta and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-04-15 10:58:30 -0400 (Thu, 15 Apr 2010)
New Revision: 21498
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/BusinessRulesProcessor.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-6118
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-04-15 14:29:02 UTC (rev 21497)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-04-15 14:58:30 UTC (rev 21498)
@@ -40,6 +40,8 @@
class="org.jboss.tools.esb.core.model.impl.FTPMessageFilterImpl"/>
<xclass id="org.jboss.tools.esb.core.model.impl.ContentBasedRouter"
class="org.jboss.tools.esb.core.model.impl.ContentBasedRouter"/>
+ <xclass id="org.jboss.tools.esb.core.model.impl.BusinessRulesProcessor"
+ class="org.jboss.tools.esb.core.model.impl.BusinessRulesProcessor"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"
class="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"/>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-04-15 14:29:02 UTC (rev 21497)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-04-15 14:58:30 UTC (rev 21498)
@@ -244,7 +244,8 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
- <XModelEntity ImplementingClass="%ESB%"
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.esb.core.model.impl.BusinessRulesProcessor"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
XMLSUBPATH="action" name="ESBPreActionBusinessRulesProcessor101">
<XChildrenEntities>
@@ -272,7 +273,7 @@
name="rule set" xmlname="ruleSet">
<Constraint loader="Tree">
<value name="ESBResourceTree"/>
- <value name="extensions=drl"/>
+ <value name="extensions=drl,dslr"/>
<value name="linkAction=OpenRuleSet"/>
</Constraint>
<Editor name="TreeChooser"/>
@@ -280,6 +281,24 @@
<XModelAttribute PROPERTIES="category=general;pre=true"
name="rule language" xmlname="ruleLanguage"/>
<XModelAttribute PROPERTIES="pre=true;category=general"
+ name="rule agent properties" xmlname="ruleAgentProperties">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="extensions=properties"/>
+ <value name="linkAction=OpenRuleAgent"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ name="decision table" xmlname="decisionTable">
+ <Constraint loader="Tree">
+ <value name="ESBResourceTree"/>
+ <value name="extensions=xls"/>
+ <value name="linkAction=OpenDecisionTable"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
default="Default(false)" name="rule reload" xmlname="ruleReload">
<Constraint loader="ListString">
<value name="Default(false)"/>
@@ -313,6 +332,16 @@
HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
ICON="action.empty" PROPERTIES="actionpath=Open;attribute=rule set"
displayName="Open Rule Set" kind="action" name="OpenRuleSet"/>
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ ICON="action.empty"
+ PROPERTIES="actionpath=Open;attribute=decision table"
+ displayName="Open Decision Table" kind="action" name="OpenDecisionTable"/>
+ <XActionItem
+ HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
+ ICON="action.empty"
+ PROPERTIES="actionpath=Open;attribute=rule agent properties"
+ displayName="Open Rule Agent Properties" kind="action" name="OpenRuleAgent"/>
<XActionItem kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
@@ -3428,7 +3457,8 @@
<EntityData EntityName="ESBPreActionBusinessRulesProcessor101">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="process" Mandatory="no"/>
- <AttributeData AttributeName="rule set"/>
+ <AttributeData AttributeName="rule set" Mandatory="no"/>
+ <AttributeData AttributeName="rule agent properties" Mandatory="no"/>
</EntityData>
</XActionItem>
</XActionItem>
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/BusinessRulesProcessor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/BusinessRulesProcessor.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/BusinessRulesProcessor.java 2010-04-15 14:58:30 UTC (rev 21498)
@@ -0,0 +1,40 @@
+package org.jboss.tools.esb.core.model.impl;
+
+import org.jboss.tools.esb.core.model.ESBCustomizedObjectImpl;
+
+public class BusinessRulesProcessor extends ESBCustomizedObjectImpl {
+ private static final long serialVersionUID = 1L;
+ public static String ATTR_RULE_AGENT_PROPERTIES = "rule agent properties";
+ public static String ATTR_DECISION_TABLE = "decision table";
+
+ static int RULE_SET_BASED = 0;
+ static int RULE_AGENT_BASED = 1;
+ static int DECISION_TABLE_BASED = 2;
+
+ public BusinessRulesProcessor() {}
+
+ @Override
+ public boolean isAttributeEditable(String name) {
+ if(ContentBasedRouter.ATTR_RULE_SET.equals(name)) {
+ int kind = getKind();
+ return kind < 0 || kind == RULE_SET_BASED;
+ } else if(ATTR_RULE_AGENT_PROPERTIES.equals(name)) {
+ int kind = getKind();
+ return kind < 0 || kind == RULE_AGENT_BASED;
+ } else if(ATTR_DECISION_TABLE.equals(name)) {
+ int kind = getKind();
+ return kind < 0 || kind == DECISION_TABLE_BASED;
+ }
+ return super.isAttributeEditable(name);
+ }
+
+ int getKind() {
+ String ruleSet = getAttributeValue(ContentBasedRouter.ATTR_RULE_SET);
+ if(ruleSet != null && ruleSet.length() > 0) return RULE_SET_BASED;
+ String ruleAgent = getAttributeValue(ATTR_RULE_AGENT_PROPERTIES);
+ if(ruleAgent != null && ruleAgent.length() > 0) return RULE_AGENT_BASED;
+ String decisionTable = getAttributeValue(ATTR_DECISION_TABLE);
+ if(decisionTable != null && decisionTable.length() > 0) return DECISION_TABLE_BASED;
+ return -1;
+ }
+}
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/impl/BusinessRulesProcessor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r21497 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-15 10:29:02 -0400 (Thu, 15 Apr 2010)
New Revision: 21497
Modified:
branches/modular_build/genpom.xml
Log:
ignore **/contrib folder when aggregating poms
Modified: branches/modular_build/genpom.xml
===================================================================
--- branches/modular_build/genpom.xml 2010-04-15 14:19:51 UTC (rev 21496)
+++ branches/modular_build/genpom.xml 2010-04-15 14:29:02 UTC (rev 21497)
@@ -5,7 +5,7 @@
<property name="pomVersion" value="0.0.1-SNAPSHOT" />
<property name="debug" value="false" />
<property name="dirsToExclude"
- value="**/*.sdk.*, **/doc*, **/download.jboss.org, **/util, **/test, **/builders, **/releng, ."
+ value="**/*.sdk.*, **/doc*, **/download.jboss.org, **/util, **/test, **/builders, **/contrib, **/releng, ."
/>
<!-- Configuration Ends -->
14 years, 9 months
JBoss Tools SVN: r21496 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-15 10:19:51 -0400 (Thu, 15 Apr 2010)
New Revision: 21496
Modified:
branches/modular_build/runstack.sh
Log:
collect more log info
Modified: branches/modular_build/runstack.sh
===================================================================
--- branches/modular_build/runstack.sh 2010-04-15 13:47:31 UTC (rev 21495)
+++ branches/modular_build/runstack.sh 2010-04-15 14:19:51 UTC (rev 21496)
@@ -32,7 +32,8 @@
# collect compilation results and failures
for d in $components; do
cd $workingdir; echo "==== $d ===="
- egrep -v "org\.|com\." $d/buildlog.latest.txt | egrep "SUCCESS|FAIL"
+ egrep -v "org\.|com\." $d/buildlog.latest.txt | egrep "SUCCESS"
+ egrep "FAILURE|SKIPPED" $d/buildlog.latest.txt
egrep -A1 "Cannot complete the request|depends on|satisfy dependency|Missing requirement|requires '.+'" $d/buildlog.latest.txt
echo ""
done
14 years, 9 months
JBoss Tools SVN: r21495 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-04-15 09:47:31 -0400 (Thu, 15 Apr 2010)
New Revision: 21495
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java
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/IStereotype.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708 Implemented new validation rules: Decorator or Interceptor has a name.
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-15 13:44:55 UTC (rev 21494)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2010-04-15 13:47:31 UTC (rev 21495)
@@ -21,7 +21,7 @@
*
* @author Alexey Kazakov
*/
-public interface IBean extends IScoped, ICDIElement, IVariable, IAnnotated {
+public interface IBean extends IScoped, IStereotyped, ICDIElement, IVariable, IAnnotated {
/**
* Returns the corresponding IType of the managed bean or session bean or of
@@ -107,14 +107,6 @@
Set<IQualifier> getQualifiers();
/**
- * Obtains the stereotype declarations of the bean class or producer method
- * or field.
- *
- * @return the set of stereotype declarations
- */
- Set<IStereotypeDeclaration> getStereotypeDeclarations();
-
- /**
* Determines if the bean is an alternative.
*
* @return <tt>true</tt> if the bean is an alternative, and <tt>false</tt>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java 2010-04-15 13:44:55 UTC (rev 21494)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java 2010-04-15 13:47:31 UTC (rev 21495)
@@ -19,7 +19,7 @@
*
* @author Alexey Kazakov
*/
-public interface IStereotype extends IScoped, ICDINamedAnnotation {
+public interface IStereotype extends IScoped, IStereotyped, ICDINamedAnnotation {
/**
* Returns the location of @Name declaration of this stereotype. If the bean
@@ -50,11 +50,4 @@
* @return the location of @Alternative declaration.
*/
IAnnotationDeclaration getAlternativeDeclaration();
-
- /**
- * Obtains the stereotype declarations of the stereotype.
- *
- * @return the set of stereotype declarations
- */
- Set<IStereotypeDeclaration> getStereotypeDeclarations();
}
\ No newline at end of file
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java 2010-04-15 13:47:31 UTC (rev 21495)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * 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.Set;
+
+/**
+ * Represents an element that can has stereotypes.
+ *
+ * @author Alexey Kazakov
+ */
+public interface IStereotyped {
+
+ /**
+ * Obtains the stereotype declarations of the element (bean class or
+ * producer method or field or stereotype).
+ *
+ * @return the set of stereotype declarations
+ */
+ Set<IStereotypeDeclaration> getStereotypeDeclarations();
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2010-04-15 13:44:55 UTC (rev 21494)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2010-04-15 13:47:31 UTC (rev 21495)
@@ -31,5 +31,7 @@
for (String name : CDIPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeverityPreferences.ERROR);
}
+ defaultPreferences.put(CDIPreferences.INTERCEPTOR_HAS_NAME, CDIPreferences.WARNING);
+ defaultPreferences.put(CDIPreferences.DECORATOR_HAS_NAME, CDIPreferences.WARNING);
}
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-04-15 13:44:55 UTC (rev 21494)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-04-15 13:47:31 UTC (rev 21495)
@@ -37,8 +37,10 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
+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.IInterceptor;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IProducerField;
@@ -47,6 +49,7 @@
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
+import org.jboss.tools.cdi.core.IStereotyped;
import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.cdi.core.preferences.CDIPreferences;
import org.jboss.tools.common.text.ITextSourceReference;
@@ -277,12 +280,24 @@
validateInjectionPoint(point);
}
+ if(bean instanceof IInterceptor) {
+ validateInterceptor((IInterceptor)bean);
+ }
+
+ if(bean instanceof IDecorator) {
+ validateDecorator((IDecorator)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) {
+ /*
+ * 3.5.1. Declaring a resource
+ * - producer field declaration specifies an EL name (together with one of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef)
+ */
if(producer instanceof IProducerField) {
IProducerField producerField = (IProducerField)producer;
if(producerField.getName()!=null) {
@@ -302,6 +317,10 @@
}
private void validateInjectionPoint(IInjectionPoint injection) {
+ /*
+ * 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
+ */
if(!(injection instanceof IInjectionPointField)) {
IAnnotationDeclaration named = injection.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
if(named!=null) {
@@ -324,6 +343,51 @@
}
}
+ private void validateInterceptor(IInterceptor interceptor) {
+ /*
+ * 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);
+ if (declaration == null) {
+ declaration = interceptor.getAnnotation(CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME);
+ }
+ if(declaration==null) {
+ declaration = getNamedStereotypeDeclaration(interceptor);
+ }
+ addError(CDIValidationMessages.INTERCEPTOR_HAS_NAME, CDIPreferences.INTERCEPTOR_HAS_NAME, declaration, interceptor.getResource());
+ }
+ }
+
+ private void validateDecorator(IDecorator decorator) {
+ /*
+ * 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);
+ if (declaration == null) {
+ declaration = decorator.getAnnotation(CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME);
+ }
+ if(declaration==null) {
+ declaration = getNamedStereotypeDeclaration(decorator);
+ }
+ addError(CDIValidationMessages.DECORATOR_HAS_NAME, CDIPreferences.DECORATOR_HAS_NAME, declaration, decorator.getResource());
+ }
+ }
+
+ private IAnnotationDeclaration getNamedStereotypeDeclaration(IStereotyped stereotyped) {
+ Set<IStereotypeDeclaration> declarations = stereotyped.getStereotypeDeclarations();
+ for (IStereotypeDeclaration declaration : declarations) {
+ if(CDIConstants.NAMED_QUALIFIER_TYPE_NAME.equals(declaration.getType().getFullyQualifiedName()) ||
+ getNamedStereotypeDeclaration(declaration.getStereotype())!=null) {
+ return declaration;
+ }
+ }
+ return null;
+ }
+
/*
* 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-15 13:44:55 UTC (rev 21494)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-04-15 13:47:31 UTC (rev 21495)
@@ -33,7 +33,8 @@
{CDIPreferences.STEREOTYPE_DECLARES_NON_EMPTY_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_stereotypeDeclaresNonEmptyName_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},
+ {CDIPreferences.INTERCEPTOR_HAS_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorHasName_label},
+ {CDIPreferences.DECORATOR_HAS_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_decoratorHasName_label},
},
CDICorePlugin.PLUGIN_ID
);
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-15 13:44:55 UTC (rev 21494)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-04-15 13:47:31 UTC (rev 21495)
@@ -12,6 +12,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
@@ -24,7 +25,7 @@
*/
public void testNonEmptyNamedForStereotype() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype declares a non-empty @Named annotation", 31);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.STEREOTYPE_DECLARES_NON_EMPTY_NAME, 31);
int markerNumbers = getMarkersNumber(file);
assertEquals("StereotypeWithNonEmptyNamed_Broken.java should has the only error marker.", markerNumbers, 1);
}
@@ -37,7 +38,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, 24, 27, 31);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, 15, 19, 24, 27, 31);
}
/**
@@ -48,7 +49,7 @@
*/
public void testNamedInjectPoint() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/NamedInjectionBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Injection point other than injected field declares a @Named annotation that does not specify the value member", 10, 16);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY_NAME, 10, 16);
}
/**
@@ -59,9 +60,9 @@
*/
public void testNamedInterceptor() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/NamedInterceptorBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Interceptor has a name", 9);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_HAS_NAME, 9);
file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/NamedStereotypedInterceptorBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Interceptor has a name", 7);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_HAS_NAME, 7);
}
/**
@@ -72,14 +73,20 @@
*/
public void testNamedDecorator() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/NamedDecoratorBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Decorator has a name", 10);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_HAS_NAME, 10);
file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/decorators/NamedStereotypedDecoratorBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Decorator has a name", 8);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_HAS_NAME, 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
+ */
public void testLegalTypesInTyped() throws Exception {
IFile petShopFile = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/PetShop.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, AbstractResourceMarkerTest.MARKER_TYPE, "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", 25);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, 25);
int markerNumbers = getMarkersNumber(petShopFile);
assertEquals("PetShop.java should has the only error marker.", markerNumbers, 1);
}
@@ -89,7 +96,7 @@
*/
public void testAnnotatedStereotype() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype declares any qualifier annotation other than @Named", 30);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_QUALIFIER_IN_STEREOTYPE, 30);
int markerNumbers = getMarkersNumber(file);
assertEquals("StereotypeWithBindingTypes_Broken.java should has the only error marker.", markerNumbers, 1);
}
@@ -99,7 +106,7 @@
*/
public void testTypedStereotype() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithTyped_Broken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype is annotated @Typed", 15);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.STEREOTYPE_IS_ANNOTATED_TYPED, 15);
int markerNumbers = getMarkersNumber(file);
assertEquals("StereotypeWithTyped_Broken.java should has the only error marker.", markerNumbers, 1);
}
@@ -110,7 +117,7 @@
*/
public void testStereotypeScope() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Stereotype declares more than one scope", 32, 33);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE, 32, 33);
int markerNumbers = getMarkersNumber(file);
assertEquals("StereotypeWithTooManyScopeTypes_Broken.java should has two error markers.", markerNumbers, 2);
}
@@ -121,7 +128,7 @@
*/
public void testMultipleBeanScope() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Bean class or producer method or field specifies multiple scope type annotations", 22, 23);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.MULTIPLE_SCOPE_TYPE_ANNOTATIONS, 22, 23);
int markerNumbers = getMarkersNumber(file);
assertEquals("StereotypeWithTyped_Broken.java should has two error markers.", markerNumbers, 2);
}
@@ -133,7 +140,7 @@
*/
public void testBeanWithMultipleScopedStereotypes() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Bean does not explicitly declare a scope when there is no default scope", 24, 25);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE, 24, 25);
int markerNumbers = getMarkersNumber(file);
assertEquals("Scallop_Broken.java should has two error markers.", markerNumbers, 2);
}
14 years, 9 months
JBoss Tools SVN: r21494 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-15 09:44:55 -0400 (Thu, 15 Apr 2010)
New Revision: 21494
Modified:
branches/modular_build/parent-pom.xml
Log:
add maven repos so plugins can be found when run on Hudson
Modified: branches/modular_build/parent-pom.xml
===================================================================
--- branches/modular_build/parent-pom.xml 2010-04-15 12:53:29 UTC (rev 21493)
+++ branches/modular_build/parent-pom.xml 2010-04-15 13:44:55 UTC (rev 21494)
@@ -288,8 +288,41 @@
</repository>
</repositories>
- <!-- <pluginRepositories>
+ <pluginRepositories>
<pluginRepository>
+ <id>maven-central</id>
+ <url>http://repo1.maven.org/maven2/
+ </url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>sonatype-maven-central</id>
+ <url>http://repository.sonatype.org/content/repositories/central/
+ </url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>maven-snapshots-sonatype</id>
+ <url>http://repository.apache.org/content/repositories/maven-snapshots-sonatype/
+ </url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ <!-- <pluginRepository>
<id>tycho</id>
<url>http://repository.sonatype.org/content/repositories/all-001/
</url>
@@ -299,6 +332,6 @@
<releases>
<enabled>true</enabled>
</releases>
- </pluginRepository>
- </pluginRepositories> -->
+ </pluginRepository> -->
+ </pluginRepositories>
</project>
14 years, 9 months