JBoss Tools SVN: r23355 - workspace/dgolovin/experimental-build.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-07-09 14:09:44 -0400 (Fri, 09 Jul 2010)
New Revision: 23355
Added:
workspace/dgolovin/experimental-build/build.xml
workspace/dgolovin/experimental-build/parent-pom.xml
workspace/dgolovin/experimental-build/pom.xml
Log:
copy of root poms from trunk
Copied: workspace/dgolovin/experimental-build/build.xml (from rev 23354, trunk/build.xml)
===================================================================
--- workspace/dgolovin/experimental-build/build.xml (rev 0)
+++ workspace/dgolovin/experimental-build/build.xml 2010-07-09 18:09:44 UTC (rev 23355)
@@ -0,0 +1,17 @@
+<project default="run" basedir="." name="jbosstools build.xml">
+
+<!--
+ This script is provided here for convenience if building entire tree already on disk.
+ Generally, you would this instead to self-bootstrap the process:
+
+ svn co http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/build/
+ cd build
+ ant
+
+ See build/build.xml for usage details, commandline flag overrides, etc.
+ See also genpom.xml for how to generate missing pom.xml files.
+-->
+ <target name="run">
+ <ant antfile="build/build.xml" inheritall="true" inheritrefs="true" />
+ </target>
+</project>
Copied: workspace/dgolovin/experimental-build/parent-pom.xml (from rev 23354, trunk/parent-pom.xml)
===================================================================
--- workspace/dgolovin/experimental-build/parent-pom.xml (rev 0)
+++ workspace/dgolovin/experimental-build/parent-pom.xml 2010-07-09 18:09:44 UTC (rev 23355)
@@ -0,0 +1,663 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>JBoss Tools Parent</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- <tychoVersion>0.10.0-SNAPSHOT</tychoVersion> -->
+ <tychoVersion>0.9.0</tychoVersion>
+ <scmBranch>trunk</scmBranch>
+ <BUILD_ALIAS>M1</BUILD_ALIAS>
+ <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
+ <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
+ <systemProperties></systemProperties>
+ <target.platform>e36-wtp32</target.platform>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-packaging-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <format>'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}'</format>
+ <archiveSite>true</archiveSite>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <!-- <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch>
+ </environment> -->
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+
+ <!-- to skip running tests (compile only) use commandline flag: -Dmaven.test.skip
+ To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail
+ at end) -->
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <!-- timeout in seconds -->
+ <surefire.timeout>1200</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties}
+ </argLine>
+ <!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho -->
+ <!-- set useUIThread=true for regular ui tests -->
+ <!-- set useUIThread=false for swtbot tests (?) -->
+ <product>org.eclipse.sdk.ide</product>
+ <application>org.eclipse.ui.ide.workbench</application>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.ide</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <!-- http://www.jmock.org/maven.html -->
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-legacy</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ </dependencies>
+ <includes>
+ <include>**/AllTests.class</include>
+ <include>**/*AllTests*.class</include>
+ <include>**/*AllBotTests*.class</include>
+ <include>**/*TestSuite*.class</include>
+ </includes>
+ <parallel>true</parallel>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
+ </connection>
+ <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
+ </developerConnection>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
+ </url>
+ </scm>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>https://jira.jboss.org/jira/secure/</url>
+ </issueManagement>
+ <profiles>
+ <profile>
+ <id>helios</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <target.platform>e36-wtp32</target.platform>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>target-platform</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <classifier>${target.platform}</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Time saver: to build everything from scratch (without target platform);
+ To enable it use -P helios-no-target in command line.
+ Do not remove repos that contains the same artefacts, it is done for purpose
+ to make build more stable in case one of the repos is offline.
+ -->
+ <profile>
+ <id>helios-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>helios</id>
+ <url>http://download.eclipse.org/releases/helios/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>webtools32</id>
+ <url>http://download.eclipse.org/webtools/repository/helios</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>eclipse36</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.6/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>birt26</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>swtbot-helios</id>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse-extras</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>orbit</id>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>hudson</id>
+ <activation>
+ <property>
+ <name>BUILD_NUMBER</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-packaging-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <format>'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}'
+ </format>
+ <archiveSite>true</archiveSite>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>svn-repos</id>
+ <repositories>
+ <repository>
+ <id>svnkit13</id>
+ <url>http://eclipse.svnkit.com/1.3.x/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>subclipse16</id>
+ <url>http://subclipse.tigris.org/update_1.6.x/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>subversive07</id>
+ <url>http://download.eclipse.org/technology/subversive/0.7/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>subversive20</id>
+ <url>http://community.polarion.com/projects/subversive/download/eclipse/2.0/up...
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>galileo</id>
+ <repositories>
+ <repository>
+ <id>galileo</id>
+ <url>http://download.eclipse.org/releases/galileo/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>eclipse35</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.5/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>birt25r</id>
+ <url>http://download.eclipse.org/birt/update-site/2.5</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>swtbot-galileo</id>
+ <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>webtools</id>
+ <url>http://download.eclipse.org/webtools/updates/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>orbit</id>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
+ </url>
+ <layout>p2</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <repository>
+ <id>m2eclipse</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse-extras</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>coverage</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <properties>
+ <emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file>
+ <emma.filter />
+ <emma.instrument.bundles />
+ </properties>
+ <build>
+ <plugins>
+ <!-- plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${emma.session.out.file}</file>
+ <type>es</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <file></file>
+ <groupId></groupId>
+ <artifactId></artifactId>
+ <version></version>
+ <packaging></packaging>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <systemProperties combine.children="append">
+ <emma.session.out.file>${emma.session.out.file}</emma.session.out.file>
+ <emma.filter>${emma.filter}</emma.filter>
+ <eclemma.instrument.bundles>${emma.instrument.bundles}</eclemma.instrument.bundles>
+ </systemProperties>
+ <frameworkExtensions>
+ <frameworkExtension>
+ <groupId>org.eclemma.runtime.equinox</groupId>
+ <artifactId>org.eclemma.runtime.equinox</artifactId>
+ <version>1.1.0.200908261008</version>
+ </frameworkExtension>
+ </frameworkExtensions>
+ <application>org.eclipse.ui.ide.workbench</application>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.ide</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>emma</groupId>
+ <artifactId>emma_ant</artifactId>
+ <version>2.0.5312</version>
+ </dependency>
+ <dependency>
+ <groupId>emma</groupId>
+ <artifactId>emma</artifactId>
+ <version>2.0.5312</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>emma-report</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <taskdef resource="emma_ant.properties" />
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+ <if>
+ <available file="${project.build.directory}/emma" type="dir" />
+ <then>
+ <echo>Process emma report...</echo>
+ <!-- emma enabled="true">
+ <instr metadatafile="${project.build.directory}/coverage.em" mode="overwrite" instrpath="${project.build.directory}/../../../plugins/${emma.instrument.bundles}/target/classes" />
+ </emma-->
+ <emma enabled="true">
+ <report>
+ <infileset dir="${project.build.directory}/emma" includes="*.es,*.em" />
+ <txt outfile="${project.build.directory}/emma/coverage.txt" />
+ <xml outfile="${project.build.directory}/emma/coverage.xml" />
+ </report>
+ </emma>
+ <loadfile property="emma.txt"
+ srcFile="${project.build.directory}/emma/coverage.txt"
+ failonerror="false" />
+ <echo>${emma.txt}</echo>
+ </then>
+ </if>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>requirements</id>
+ <activation>
+ <file>
+ <exists>${basedir}/requirements.properties</exists>
+ </file>
+ </activation>
+ <properties>
+ <requirements.root>${basedir}/../../../requirements</requirements.root>
+ <requirement.build.root>${requirements.root}/target</requirement.build.root>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>download-plugin-requirements</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property file="requirements.properties" />
+ <echo>Requirements build</echo>
+ <ant dir="${basedir}/../../../requirements" inheritAll="true" >
+ <property name="requirements" value="${requirements}" />
+ <property name="settings.offline" value="${settings.offline}" />
+ <property name="skipDownload" value="${skipDownload}" />
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>sonatype-maven-central</id>
+ <url>http://repository.sonatype.org/content/repositories/central/
+ </url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>maven-snapshots-sonatype</id>
+ <url>https://repository.apache.org/content/repositories/maven-snapshots-sonatype/
+ </url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>tycho</id>
+ <url>https://repository.sonatype.org/content/repositories/snapshots/
+ </url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+</project>
Copied: workspace/dgolovin/experimental-build/pom.xml (from rev 23354, trunk/pom.xml)
===================================================================
--- workspace/dgolovin/experimental-build/pom.xml (rev 0)
+++ workspace/dgolovin/experimental-build/pom.xml 2010-07-09 18:09:44 UTC (rev 23355)
@@ -0,0 +1,52 @@
+<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>
+<groupId>org.jboss</groupId>
+<artifactId>jbosstools</artifactId>
+<version>0.0.1-SNAPSHOT</version>
+<packaging>pom</packaging>
+<modules>
+ <module>build/target-platform</module>
+ <module>build/libs</module>
+
+ <!-- this order is important! make sure you've run genpom.xml first! -->
+ <!-- dgolovin's order -->
+ <module>tests</module>
+ <module>freemarker</module>
+ <module>jmx</module>
+ <module>archives</module>
+ <module>as</module>
+ <module>common</module>
+ <module>jst</module>
+ <module>xulrunner</module>
+ <module>vpe</module>
+ <module>jsf</module>
+
+ <module>hibernatetools</module>
+ <module>portlet</module>
+ <module>workingset</module>
+
+ <module>struts</module>
+
+ <module>profiler</module>
+ <module>smooks</module>
+ <module>cdi</module>
+ <module>birt</module>
+ <module>bpel</module>
+ <module>esb</module>
+ <module>seam</module>
+ <module>examples</module>
+ <module>maven</module>
+ <module>tptp</module>
+ <module>ws</module>
+ <module>modeshape</module>
+ <module>flow</module>
+ <module>jbpm</module>
+ <!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
+ ant -q -->
+ <module>drools</module>
+
+ <module>site</module>
+</modules>
+</project>
+
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23354 - in trunk/documentation/whatsnew/bpel: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-07-09 13:27:52 -0400 (Fri, 09 Jul 2010)
New Revision: 23354
Added:
trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.M1.html
trunk/documentation/whatsnew/bpel/images/NewFileWizard.png
Log:
Added "new & noteworthy" for 3.2.0.M1
Added: trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.M1.html
===================================================================
--- trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.M1.html (rev 0)
+++ trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.M1.html 2010-07-09 17:27:52 UTC (rev 23354)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>BPEL Tools 1.0.0.CR1 What's New</title>
+</head>
+<body>
+<h1>JBoss Eclipse BPEL Editor 1.1.0.M1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>BPEL
+ Editor</b></td>
+ <td valign="top">The following issues were fixed. The list
+ includes several XPath validation errors, user interface warts, <a
+ href="http://www.docjar.com/docs/api/java/lang/NullPointerException.html">NPEs</a>
+ and some cosmetic issues.
+ <ol>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-5999">JBIDE-5999</a>
+ <br></br>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6000">JBIDE-6000</a>
+ <br></br>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6015">JBIDE-6015</a>
+ <br></br>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6032">JBIDE-6032</a>
+ <br></br>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6357">JBIDE-6357</a>
+ <br></br>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6471">JBIDE-6471</a>
+ <br></br>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6472">JBIDE-6472</a>
+ <br></br>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6585">JBIDE-6585</a>
+ <br></br>
+ </ol>
+ Many of these fixes have been contributed back to the <a
+ href="http://eclipse.org/bpel">eclipse BPEL project</a>.</td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Deployment
+ Editor</b></td>
+ <td valign="top">A serious flaw in the ODE Deployment editor has
+ been fixed. See <a href="https://jira.jboss.org/browse/JBIDE-6230">JBIDE-6230</a>.
+ <p></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Editor</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>""New
+ File"" Wizard</b></td>
+ <td valign="top">The BPEL "New File" Wizard has been enhanced to
+ allow specification of a SOAP or HTTP service endpoint, which generates the
+ <service> and <binding> elements in the WSDL artifact.
+ This saves lot of mouse clicks. See
+ <a href="https://jira.jboss.org/browse/JBIDE-6154">JBIDE-6154</a> for details.
+ <p></p>
+ <img src="images/NewFileWizard.png"/>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
Added: trunk/documentation/whatsnew/bpel/images/NewFileWizard.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/bpel/images/NewFileWizard.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23353 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-07-09 13:26:36 -0400 (Fri, 09 Jul 2010)
New Revision: 23353
Added:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/EFS.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CGS.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/CFS.java
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterProperty.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/HibernateLaunchConstants.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-6595 - fix for (1), (2), (3), (4), partially (9)
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/CFS.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/CFS.java (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/CFS.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.console;
+
+/**
+ * XML Ant code generation strings
+ *
+ * @author vitali
+ */
+public class CFS {
+ //
+ public static final String JDBCCONFIGURATION = "jdbcconfiguration"; //$NON-NLS-1$
+ public static final String ANNOTATIONCONFIGURATION = "annotationconfiguration"; //$NON-NLS-1$
+ public static final String JPACONFIGURATION = "jpaconfiguration"; //$NON-NLS-1$
+ public static final String CONFIGURATION = "configuration"; //$NON-NLS-1$
+ //
+ public static final String CONFIGURATIONFILE = "configurationFile"; //$NON-NLS-1$
+ public static final String PROPERTYFILE = "propertyFile"; //$NON-NLS-1$
+ public static final String ENTITYRESOLVER = "entityResolver"; //$NON-NLS-1$
+ public static final String NAMINGSTRATEGY = "namingStrategy"; //$NON-NLS-1$
+ public static final String PERSISTENCEUNIT = "persistenceUnit"; //$NON-NLS-1$
+ public static final String DETECTMANYTOMANY = "detectManyToMany"; //$NON-NLS-1$
+ public static final String DETECTONTTOONE = "detectOneToOne"; //$NON-NLS-1$
+ public static final String DETECTOPTIMISTICLOCK = "detectOptimisticLock"; //$NON-NLS-1$
+ public static final String PACKAGENAME = "packageName"; //$NON-NLS-1$
+ public static final String REVENGFILE = "revEngFile"; //$NON-NLS-1$
+ public static final String REVERSESTRATEGY = "reverseStrategy"; //$NON-NLS-1$
+ public static final String ISREVENG = "isRevEng"; //$NON-NLS-1$
+}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-07-09 16:35:32 UTC (rev 23352)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.hibernate.console;
+import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Properties;
@@ -43,85 +44,75 @@
return prefs;
}
- public Document createXML(boolean includeMappings) {
+ public Document createXML() {
Document res = DocumentFactory.getInstance().createDocument();
- Element root = createRoot(includeMappings);
+ Element root = createRoot();
res.setRootElement(root);
return res;
}
- public Element createRoot(boolean includeMappings) {
+ public Element createRoot() {
Properties properties = prefs.getProperties();
- Element root = createRoot(properties, includeMappings);
+ Element root = createRoot(properties);
return root;
}
- protected Element createRoot(Properties properties, boolean includeMappings) {
+ protected Element createRoot(Properties properties) {
String rootName = null;
- Boolean jdbcConfig = Boolean.valueOf(additional.getProperty("isRevEng", "false")); //$NON-NLS-1$ //$NON-NLS-2$
+ Boolean jdbcConfig = Boolean.valueOf(additional.getProperty(CFS.ISREVENG, "false")); //$NON-NLS-1$
if (jdbcConfig) {
- rootName = "jdbcconfiguration"; //$NON-NLS-1$
+ rootName = CFS.JDBCCONFIGURATION;
} else if (prefs.getConfigurationMode().equals(ConfigurationMode.ANNOTATIONS)) {
- rootName = "annotationconfiguration"; //$NON-NLS-1$
+ rootName = CFS.ANNOTATIONCONFIGURATION;
} else if (prefs.getConfigurationMode().equals(ConfigurationMode.JPA)) {
- rootName = "jpaconfiguration"; //$NON-NLS-1$
+ rootName = CFS.JPACONFIGURATION;
} else if (prefs.getConfigurationMode().equals(ConfigurationMode.CORE)) {
- rootName = "configuration"; //$NON-NLS-1$
+ rootName = CFS.CONFIGURATION;
} else {
rootName = "undef"; //$NON-NLS-1$
}
Element root = DocumentFactory.getInstance().createElement(rootName);
- final String configurationFile = getPreferences().getConfigXMLFile() == null ? null :
- getPreferences().getConfigXMLFile().toString();
- if (!StringHelper.isEmpty(configurationFile)) {
- root.addAttribute("configurationFile", configurationFile); //$NON-NLS-1$
- }
- final String propertyFile = getPreferences().getPropertyFile() == null ? null :
- getPreferences().getPropertyFile().toString();
- if (!StringHelper.isEmpty(propertyFile)) {
- root.addAttribute("propertyFile", propertyFile); //$NON-NLS-1$
- }
- final String entityResolver = getPreferences().getEntityResolverName();
- if (!StringHelper.isEmpty(entityResolver)) {
- root.addAttribute("entityResolver", entityResolver); //$NON-NLS-1$
- }
- final String persistenceUnit = getPreferences().getPersistenceUnitName();
- if (!StringHelper.isEmpty(persistenceUnit)) {
- root.addAttribute("persistenceUnit", persistenceUnit); //$NON-NLS-1$
- }
- final String detectManyToMany = additional.getProperty("detectManyToMany", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (!StringHelper.isEmpty(detectManyToMany)) {
- root.addAttribute("detectManyToMany", detectManyToMany); //$NON-NLS-1$
- }
- final String detectOneToOne = additional.getProperty("detectOneToOne", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (!StringHelper.isEmpty(detectOneToOne)) {
- root.addAttribute("detectOneToOne", detectOneToOne); //$NON-NLS-1$
- }
- final String detectOptimisticLock = additional.getProperty("detectOptimisticLock", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (!StringHelper.isEmpty(detectOptimisticLock)) {
- root.addAttribute("detectOptimisticLock", detectOptimisticLock); //$NON-NLS-1$
- }
- final String packageName = additional.getProperty("packageName", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (!StringHelper.isEmpty(packageName)) {
- root.addAttribute("packageName", packageName); //$NON-NLS-1$
- }
- final String revEngFile = additional.getProperty("revEngFile", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (!StringHelper.isEmpty(revEngFile)) {
- root.addAttribute("revEngFile", revEngFile); //$NON-NLS-1$
- }
- final String reverseStrategy = additional.getProperty("reverseStrategy", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (!StringHelper.isEmpty(reverseStrategy)) {
- root.addAttribute("reverseStrategy", reverseStrategy); //$NON-NLS-1$
- }
- if (includeMappings) {
+ updateAttr(root, file2Str(getPreferences().getConfigXMLFile()), CFS.CONFIGURATIONFILE);
+ updateAttr(root, file2Str(getPreferences().getPropertyFile()), CFS.PROPERTYFILE);
+ updateAttr(root, getPreferences().getEntityResolverName(), CFS.ENTITYRESOLVER);
+ updateAttr(root, getPreferences().getNamingStrategy(), CFS.NAMINGSTRATEGY);
+ updateAttr(root, getPreferences().getPersistenceUnitName(), CFS.PERSISTENCEUNIT);
+ updateAttr(root, additional, CFS.DETECTMANYTOMANY);
+ updateAttr(root, additional, CFS.DETECTONTTOONE);
+ updateAttr(root, additional, CFS.DETECTOPTIMISTICLOCK);
+ updateAttr(root, additional, CFS.PACKAGENAME);
+ updateAttr(root, additional, CFS.REVENGFILE);
+ updateAttr(root, additional, CFS.REVERSESTRATEGY);
+ // includeMappings
+ File[] mappingFiles = prefs.getMappingFiles();
+ if (mappingFiles.length > 0) {
Element fileset = root.addElement("fileset"); //$NON-NLS-1$
fileset.addAttribute("dir", "./src"); //$NON-NLS-1$ //$NON-NLS-2$
fileset.addAttribute("id", "id"); //$NON-NLS-1$ //$NON-NLS-2$
- Element include = fileset.addElement("include"); //$NON-NLS-1$
- include.addAttribute("name", "**/*"); //$NON-NLS-1$ //$NON-NLS-2$
+ for (int i = 0; i < mappingFiles.length; i++) {
+ Element include = fileset.addElement("include"); //$NON-NLS-1$
+ include.addAttribute("name", mappingFiles[i].getAbsolutePath()); //$NON-NLS-1$
+ }
}
return root;
}
+
+ public static String file2Str(File file) {
+ return file == null ? null : file.toString();
+ }
+
+ public static void updateAttr(Element el, String val, String prName) {
+ if (!StringHelper.isEmpty(val)) {
+ el.addAttribute(prName, val);
+ }
+ }
+
+ public static void updateAttr(Element el, Properties prs, String prName) {
+ final String val = prs.getProperty(prName, ""); //$NON-NLS-1$
+ if (!StringHelper.isEmpty(val)) {
+ el.addAttribute(prName, val);
+ }
+ }
public static void dump(OutputStream os, Element element) {
try {
@@ -138,6 +129,5 @@
// ignore
}
}
-
}
}
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/EFS.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/EFS.java (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/EFS.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.model.impl;
+
+/**
+ * ExporterFactory strings
+ *
+ * @author vitali
+ */
+public class EFS {
+ //
+ public static final String OUTPUTDIR = "outputdir"; //$NON-NLS-1$
+ public static final String TEMPLATE_PATH = "template_path"; //$NON-NLS-1$
+ public static final String FILE_PATTERN = "file_pattern"; //$NON-NLS-1$
+ public static final String TEMPLATE_NAME = "template_name"; //$NON-NLS-1$
+ public static final String FOR_EACH = "for_each"; //$NON-NLS-1$
+ public static final String EXPORTTODATABASE = "exportToDatabase"; //$NON-NLS-1$
+}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-07-09 16:35:32 UTC (rev 23352)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -155,10 +155,11 @@
/** Method that resolves an expression through eclipses built-in variable manager.
* @throws CoreException if expression could not be evaluated. */
- private String resolve(String expression) throws CoreException {
- if(expression==null) return null;
+ public static String resolve(String expression) throws CoreException {
+ if (expression == null) {
+ return null;
+ }
IStringVariableManager variableManager = VariablesPlugin.getDefault().getStringVariableManager();
-
return variableManager.performStringSubstitution(expression, false);
}
@@ -172,30 +173,30 @@
Exporter exporter = getExporterDefinition().createExporterInstance();
-
+ Properties extract = new Properties();
Properties props = new Properties();
props.putAll(globalProperties);
props.putAll(getProperties());
-
+
exporter.setProperties(props);
exporter.setArtifactCollector(collector);
+ extractExporterProperties(exporterId, props, extract);
+
String outputPath = defaultOutputDirectory;
- if(props.containsKey("outputdir")) { //$NON-NLS-1$
- outputPath = props.getProperty("outputdir"); //$NON-NLS-1$
- // done to avoid validation check in hibernate tools templates
- props.remove("outputdir"); //$NON-NLS-1$
+ if (extract.containsKey(EFS.OUTPUTDIR)) {
+ outputPath = extract.getProperty(EFS.OUTPUTDIR);
}
String resolvedOutputDir = resolve(outputPath);
String loc = PathHelper.getLocationAsStringPath(resolvedOutputDir);
- if(outputPath != null && loc == null) {
+ if (outputPath != null && loc == null) {
String out = NLS.bind(HibernateConsoleMessages.ExporterFactory_output_dir_in_does_not_exist,
- resolvedOutputDir, getExporterDefinition().getDescription());
+ resolvedOutputDir, getExporterDefinition().getDescription());
throw new HibernateConsoleRuntimeException(out);
}
- if(StringHelper.isNotEmpty(loc)) { // only set if something valid found
+ if (StringHelper.isNotEmpty(loc)) { // only set if something valid found
outputDirectories.add(loc);
exporter.setOutputDirectory(new File(loc));
}
@@ -203,15 +204,15 @@
exporter.setConfiguration(cfg);
List<String> templatePathList = new ArrayList<String>();
- if(props.containsKey("template_path")) { //$NON-NLS-1$
- String resolveTemplatePath = resolve(props.getProperty("template_path")); //$NON-NLS-1$
+ if (extract.containsKey(EFS.TEMPLATE_PATH)) {
+ String resolveTemplatePath = resolve(extract.getProperty(EFS.TEMPLATE_PATH));
StringTokenizer st = new StringTokenizer(resolveTemplatePath, ";"); //$NON-NLS-1$
String out = ""; //$NON-NLS-1$
while (st.hasMoreTokens()) {
String locationAsStringPath = PathHelper.getLocationAsStringPath(st.nextToken());
- if(locationAsStringPath==null) {
+ if (locationAsStringPath == null) {
out += NLS.bind(HibernateConsoleMessages.ExporterFactory_template_dir_in_does_not_exist,
- resolveTemplatePath, getExporterDefinition().getDescription()) + '\n';
+ resolveTemplatePath, getExporterDefinition().getDescription()) + '\n';
} else {
templatePathList.add(locationAsStringPath);
}
@@ -220,50 +221,76 @@
out = out.substring(0, out.length() - 1);
throw new HibernateConsoleRuntimeException(out);
}
- props.remove("template_path"); // done to avoid validation check in hibernate tools templates //$NON-NLS-1$
}
- if (StringHelper.isNotEmpty(customTemplatePath)){
+
+ if (StringHelper.isNotEmpty(customTemplatePath)) {
String resolvedCustomTemplatePath = resolve(customTemplatePath);
StringTokenizer st = new StringTokenizer(resolvedCustomTemplatePath, ";"); //$NON-NLS-1$
String out = ""; //$NON-NLS-1$
while (st.hasMoreTokens()) {
String locationAsStringPath = PathHelper.getLocationAsStringPath(st.nextToken());
- if(locationAsStringPath != null) {
+ if (locationAsStringPath != null) {
templatePathList.add(locationAsStringPath);
} else {
out = NLS.bind(HibernateConsoleMessages.ExporterFactory_template_dir_in_does_not_exist,
- resolvedCustomTemplatePath, getExporterDefinition().getDescription());
+ resolvedCustomTemplatePath, getExporterDefinition().getDescription());
}
}
- if (!("".equals(out))){ //$NON-NLS-1$
+ if (!("".equals(out))) { //$NON-NLS-1$
out = out.substring(0, out.length() - 1);
throw new HibernateConsoleRuntimeException(out);
}
}
-
exporter.setTemplatePath(templatePathList.toArray(new String[templatePathList.size()]));
-
-
// special handling for GenericExporter (TODO: be delegated via plugin.xml)
- if(getExporterDefinition().getId().equals("org.hibernate.tools.hbmtemplate")) { //$NON-NLS-1$
+ if (exporterId.equals("org.hibernate.tools.hbmtemplate")) { //$NON-NLS-1$
GenericExporter ge = (GenericExporter) exporter;
-
- ge.setFilePattern(props.getProperty("file_pattern", null)); //$NON-NLS-1$
- props.remove("file_pattern"); //$NON-NLS-1$
- ge.setTemplateName(props.getProperty("template_name",null)); //$NON-NLS-1$
- props.remove("template_name"); //$NON-NLS-1$
- ge.setForEach(props.getProperty("for_each",null)); //$NON-NLS-1$
- props.remove("for_each"); //$NON-NLS-1$
-
+ ge.setFilePattern(extract.getProperty(EFS.FILE_PATTERN));
+ ge.setTemplateName(extract.getProperty(EFS.TEMPLATE_NAME));
+ ge.setForEach(extract.getProperty(EFS.FOR_EACH));
}
// special handling for Hbm2DDLExporter
- if(getExporterDefinition().getId().equals("org.hibernate.tools.hbm2ddl")) { //$NON-NLS-1$
+ if (exporterId.equals("org.hibernate.tools.hbm2ddl")) { //$NON-NLS-1$
Hbm2DDLExporter ddlExporter = (Hbm2DDLExporter) exporter;
//avoid users to delete their databases with a single click
- ddlExporter.setExport(Boolean.getBoolean(props.getProperty("exportToDatabase", Boolean.toString(false)))); //$NON-NLS-1$
- props.remove("exportToDatabase"); //$NON-NLS-1$
+ ddlExporter.setExport(Boolean.getBoolean(extract.getProperty(EFS.EXPORTTODATABASE)));
}
return exporter;
}
+ /**
+ * Extract and update GUI specific exporter properties
+ *
+ * @param exporterId
+ * @param props - properties which values remain
+ * @param extract - separated updated properties
+ * @throws CoreException
+ */
+ public static void extractExporterProperties(
+ String exporterId, Properties props, Properties extract) throws CoreException {
+ if (props.containsKey(EFS.OUTPUTDIR)) {
+ extract.put(EFS.OUTPUTDIR, resolve(props.getProperty(EFS.OUTPUTDIR)));
+ // done to avoid validation check in hibernate tools templates
+ props.remove(EFS.OUTPUTDIR);
+ }
+ if (props.containsKey(EFS.TEMPLATE_PATH)) {
+ extract.put(EFS.TEMPLATE_PATH, resolve(props.getProperty(EFS.TEMPLATE_PATH)));
+ // done to avoid validation check in hibernate tools templates
+ props.remove(EFS.TEMPLATE_PATH);
+ }
+ if (exporterId.equals("org.hibernate.tools.hbmtemplate")) { //$NON-NLS-1$
+ extract.put(EFS.FILE_PATTERN, props.getProperty(EFS.FILE_PATTERN, null));
+ props.remove(EFS.FILE_PATTERN);
+ extract.put(EFS.TEMPLATE_NAME, props.getProperty(EFS.TEMPLATE_NAME, null));
+ props.remove(EFS.TEMPLATE_NAME);
+ extract.put(EFS.FOR_EACH, props.getProperty(EFS.FOR_EACH, null));
+ props.remove(EFS.FOR_EACH);
+
+ }
+ // special handling for Hbm2DDLExporter
+ if (exporterId.equals("org.hibernate.tools.hbm2ddl")) { //$NON-NLS-1$
+ extract.put(EFS.EXPORTTODATABASE, props.getProperty(EFS.EXPORTTODATABASE, Boolean.toString(false)));
+ props.remove(EFS.EXPORTTODATABASE);
+ }
+ }
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterProperty.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterProperty.java 2010-07-09 16:35:32 UTC (rev 23352)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterProperty.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -22,12 +22,13 @@
package org.hibernate.eclipse.console.model.impl;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
+import org.hibernate.eclipse.launch.CGS;
public class ExporterProperty
{
private static ExporterProperty[] globalProperties = new ExporterProperty[] {
- new ExporterProperty ("jdk5", HibernateConsoleMessages.ExporterProperty_use_java5_syntax, "false", false), //$NON-NLS-1$ //$NON-NLS-2$
- new ExporterProperty ("ejb3", HibernateConsoleMessages.ExporterProperty_generate_ejb3_annotations, "false", false) //$NON-NLS-1$ //$NON-NLS-2$
+ new ExporterProperty (CGS.JDK5, HibernateConsoleMessages.ExporterProperty_use_java5_syntax, "false", false), //$NON-NLS-1$
+ new ExporterProperty (CGS.EJB3, HibernateConsoleMessages.ExporterProperty_generate_ejb3_annotations, "false", false) //$NON-NLS-1$
};
private String defaultValue;
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CGS.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CGS.java (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CGS.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.launch;
+
+/**
+ * XML Ant code generation strings
+ *
+ * @author vitali
+ */
+public class CGS {
+ //
+ public static final String NAME = "name"; //$NON-NLS-1$
+ public static final String KEY = "key"; //$NON-NLS-1$
+ public static final String VALUE = "value"; //$NON-NLS-1$
+ public static final String LOCATION = "location"; //$NON-NLS-1$
+ public static final String DEFAULT = "default"; //$NON-NLS-1$
+ public static final String PROPERTY = "property"; //$NON-NLS-1$
+ public static final String PROJECT = "project"; //$NON-NLS-1$
+ public static final String TARGET = "target"; //$NON-NLS-1$
+ public static final String TASKDEF = "taskdef"; //$NON-NLS-1$
+ public static final String CLASSNAME = "classname"; //$NON-NLS-1$
+ public static final String DESTDIR = "destdir"; //$NON-NLS-1$
+ public static final String EJB3 = "ejb3"; //$NON-NLS-1$
+ public static final String JDK5 = "jdk5"; //$NON-NLS-1$
+ public static final String HIBERNATETOOL = "hibernatetool"; //$NON-NLS-1$
+}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-07-09 16:35:32 UTC (rev 23352)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -22,6 +22,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfiguration;
+import org.hibernate.console.CFS;
import org.hibernate.console.ConfigurationXMLFactory;
import org.hibernate.console.ConnectionProfileUtil;
import org.hibernate.console.ConsoleConfiguration;
@@ -57,49 +58,49 @@
}
Properties props = new Properties();
if (attributes.isReverseEngineer()) {
- props.setProperty("isRevEng", Boolean.toString(attributes.isReverseEngineer())); //$NON-NLS-1$
- props.setProperty("packageName", attributes.getPackageName()); //$NON-NLS-1$
- props.setProperty("detectManyToMany", Boolean.toString(attributes.detectManyToMany())); //$NON-NLS-1$
- props.setProperty("detectOneToOne", Boolean.toString(attributes.detectOneToOne())); //$NON-NLS-1$
- props.setProperty("detectOptimisticLock", Boolean.toString(attributes.detectOptimisticLock())); //$NON-NLS-1$
- props.setProperty("reverseStrategy", attributes.getRevengStrategy()); //$NON-NLS-1$
+ props.setProperty(CFS.ISREVENG, Boolean.toString(attributes.isReverseEngineer()));
+ props.setProperty(CFS.PACKAGENAME, attributes.getPackageName());
+ props.setProperty(CFS.DETECTMANYTOMANY, Boolean.toString(attributes.detectManyToMany()));
+ props.setProperty(CFS.DETECTONTTOONE, Boolean.toString(attributes.detectOneToOne()));
+ props.setProperty(CFS.DETECTOPTIMISTICLOCK, Boolean.toString(attributes.detectOptimisticLock()));
+ props.setProperty(CFS.REVERSESTRATEGY, attributes.getRevengStrategy());
String revEngFile = getResLocation(attributes.getRevengSettings());
- props.setProperty("revEngFile", revEngFile); //$NON-NLS-1$
+ props.setProperty(CFS.REVENGFILE, revEngFile);
}
String consoleConfigName = attributes.getConsoleConfigurationName();
ConsoleConfigurationPreferences consoleConfigPrefs =
getConsoleConfigPreferences(consoleConfigName);
ConfigurationXMLFactory csfXML = new ConfigurationXMLFactory(
consoleConfigPrefs, props);
- Element rootConsoleConfig = csfXML.createRoot(false);
+ Element rootConsoleConfig = csfXML.createRoot();
//
- Element root = DocumentFactory.getInstance().createElement("project"); //$NON-NLS-1$
- root.addAttribute("name", "CodeGen"); //$NON-NLS-1$ //$NON-NLS-2$
+ Element root = DocumentFactory.getInstance().createElement(CGS.PROJECT);
+ root.addAttribute(CGS.NAME, "CodeGen"); //$NON-NLS-1$
String defaultTargetName = "JdbcCodeGen"; //$NON-NLS-1$
- root.addAttribute("default", defaultTargetName); //$NON-NLS-1$
- Element el = root.addElement("property"); //$NON-NLS-1$
- el.addAttribute("name", "build.dir"); //$NON-NLS-1$ //$NON-NLS-2$
+ root.addAttribute(CGS.DEFAULT, defaultTargetName);
+ Element el = root.addElement(CGS.PROPERTY);
+ el.addAttribute(CGS.NAME, "build.dir"); //$NON-NLS-1$
String location = getResLocation(attributes.getOutputPath());
- el.addAttribute("location", location); //$NON-NLS-1$
- el = root.addElement("property"); //$NON-NLS-1$
- el.addAttribute("name", "jdbc.driver"); //$NON-NLS-1$ //$NON-NLS-2$
+ el.addAttribute(CGS.LOCATION, location);
+ el = root.addElement(CGS.PROPERTY);
+ el.addAttribute(CGS.NAME, "jdbc.driver"); //$NON-NLS-1$
String driverURL = getConnectionProfileDriverURL(consoleConfigPrefs.getConnectionProfileName());
- el.addAttribute("location", driverURL); //$NON-NLS-1$
+ el.addAttribute(CGS.LOCATION, driverURL);
//
- Element target = root.addElement("target"); //$NON-NLS-1$
- target.addAttribute("name", defaultTargetName); //$NON-NLS-1$
+ Element target = root.addElement(CGS.TARGET);
+ target.addAttribute(CGS.NAME, defaultTargetName);
//
- Element taskdef = target.addElement("taskdef"); //$NON-NLS-1$
- taskdef.addAttribute("name", "hibernatetool"); //$NON-NLS-1$ //$NON-NLS-2$
- taskdef.addAttribute("classname", "org.hibernate.tool.ant.HibernateToolTask"); //$NON-NLS-1$ //$NON-NLS-2$
+ Element taskdef = target.addElement(CGS.TASKDEF);
+ taskdef.addAttribute(CGS.NAME, CGS.HIBERNATETOOL);
+ taskdef.addAttribute(CGS.CLASSNAME, "org.hibernate.tool.ant.HibernateToolTask"); //$NON-NLS-1$
//
- Element hibernatetool = target.addElement("hibernatetool"); //$NON-NLS-1$
- hibernatetool.addAttribute("destdir", "${build.dir}"); //$NON-NLS-1$ //$NON-NLS-2$
+ Element hibernatetool = target.addElement(CGS.HIBERNATETOOL);
+ hibernatetool.addAttribute(CGS.DESTDIR, "${build.dir}"); //$NON-NLS-1$
hibernatetool.content().add(rootConsoleConfig);
//
Properties globalProps = new Properties();
- globalProps.put("ejb3", "" + attributes.isEJB3Enabled()); //$NON-NLS-1$ //$NON-NLS-2$
- globalProps.put("jdk5", "" + attributes.isJDK5Enabled()); //$NON-NLS-1$//$NON-NLS-2$
+ globalProps.put(CGS.EJB3, "" + attributes.isEJB3Enabled()); //$NON-NLS-1$
+ globalProps.put(CGS.JDK5, "" + attributes.isJDK5Enabled()); //$NON-NLS-1$
List<ExporterFactory> exporterFactories = attributes.getExporterFactories();
for (Iterator<ExporterFactory> iter = exporterFactories.iterator(); iter.hasNext();) {
ExporterFactory ef = iter.next();
@@ -112,6 +113,13 @@
Properties expProps = new Properties();
expProps.putAll(globalProps);
expProps.putAll(ef.getProperties());
+ Properties extract = new Properties();
+ try {
+ ExporterFactory.extractExporterProperties(ef.getId(), expProps, extract);
+ } catch (CoreException e) {
+ // ignore
+ }
+ expProps.putAll(extract);
for (Map.Entry<String, ExporterProperty> name2prop : defExpProps.entrySet()) {
Object val = expProps.get(name2prop.getKey());
if (val == null || 0 == val.toString().compareTo(name2prop.getValue().getDefaultValue())) {
@@ -122,14 +130,14 @@
if ("hbmtemplate".compareToIgnoreCase(expName) == 0 ) { //$NON-NLS-1$
Element property = null;
if (attributes.isJDK5Enabled()) {
- property = exporter.addElement("property"); //$NON-NLS-1$
- property.addAttribute("key", "jdk5"); //$NON-NLS-1$ //$NON-NLS-2$
- property.addAttribute("value", "" + attributes.isJDK5Enabled()); //$NON-NLS-1$ //$NON-NLS-2$
+ property = exporter.addElement(CGS.PROPERTY);
+ property.addAttribute(CGS.KEY, CGS.JDK5);
+ property.addAttribute(CGS.VALUE, "" + attributes.isJDK5Enabled()); //$NON-NLS-1$
}
if (attributes.isEJB3Enabled()) {
- property = exporter.addElement("property"); //$NON-NLS-1$
- property.addAttribute("key", "ejb3"); //$NON-NLS-1$ //$NON-NLS-2$
- property.addAttribute("value", "" + attributes.isEJB3Enabled()); //$NON-NLS-1$ //$NON-NLS-2$
+ property = exporter.addElement(CGS.PROPERTY);
+ property.addAttribute(CGS.KEY, CGS.EJB3);
+ property.addAttribute(CGS.VALUE, "" + attributes.isEJB3Enabled()); //$NON-NLS-1$
}
}
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2010-07-09 16:35:32 UTC (rev 23352)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -225,8 +225,8 @@
// Global properties
Properties props = new Properties();
- props.put("ejb3", ""+attributes.isEJB3Enabled()); //$NON-NLS-1$ //$NON-NLS-2$
- props.put("jdk5", ""+attributes.isJDK5Enabled()); //$NON-NLS-1$//$NON-NLS-2$
+ props.put(CGS.EJB3, "" + attributes.isEJB3Enabled()); //$NON-NLS-1$
+ props.put(CGS.JDK5, "" + attributes.isJDK5Enabled()); //$NON-NLS-1$
for (int i = 0; i < exporterFactories.length; i++)
{
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java 2010-07-09 16:35:32 UTC (rev 23352)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -88,6 +88,7 @@
import org.hibernate.eclipse.console.ExtensionManager;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
+import org.hibernate.eclipse.console.model.impl.EFS;
import org.hibernate.eclipse.console.model.impl.ExporterDefinition;
import org.hibernate.eclipse.console.model.impl.ExporterFactory;
import org.hibernate.eclipse.console.utils.EclipseImages;
@@ -798,7 +799,7 @@
// hard-coded checks: this should be delegated to extension point that knows about the different exporters.
//Iterator iterator = observableFactoryList.getList().iterator(); // check all exporters
for (ExporterFactory ef : selectedExporters) {// check only selected exporters
- String str = ef.getProperties().get("outputdir"); //$NON-NLS-1$
+ String str = ef.getProperties().get(EFS.OUTPUTDIR);
String msg = null;
if(str!=null) {
msg = PathHelper.checkDirectory(str, HibernateConsoleMessages.ExporterSettingsTab_output_directory_for + " " + ef.getExporterDefinition().getDescription(), true); //$NON-NLS-1$
@@ -808,7 +809,7 @@
}
}
- str = ef.getProperties().get("template_path"); //$NON-NLS-1$
+ str = ef.getProperties().get(EFS.TEMPLATE_PATH);
if(str!=null) {
msg = PathHelper.checkDirectory(str, HibernateConsoleMessages.ExporterSettingsTab_template_directory_for + " " + ef.getExporterDefinition().getDescription(), true); //$NON-NLS-1$
if(msg!=null) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/HibernateLaunchConstants.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/HibernateLaunchConstants.java 2010-07-09 16:35:32 UTC (rev 23352)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/HibernateLaunchConstants.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -40,6 +40,9 @@
*/
package org.hibernate.eclipse.launch;
+import org.hibernate.console.CFS;
+import org.hibernate.eclipse.console.model.impl.EFS;
+
public class HibernateLaunchConstants
{
public static final String ATTR_PREFIX = "org.hibernate.tools."; //$NON-NLS-1$
@@ -48,13 +51,13 @@
public static final String ATTR_EXPORTERS = ATTR_PREFIX + "exporters"; //$NON-NLS-1$
public static final String ATTR_CONSOLE_CONFIGURATION_NAME = ATTR_PREFIX + "configurationname"; //$NON-NLS-1$
- public static final String ATTR_OUTPUT_DIR = ATTR_PREFIX + "outputdir"; //$NON-NLS-1$
+ public static final String ATTR_OUTPUT_DIR = ATTR_PREFIX + EFS.OUTPUTDIR;
public static final String ATTR_REVERSE_ENGINEER = ATTR_PREFIX + "schema2hbm"; //$NON-NLS-1$
- public static final String ATTR_REVERSE_ENGINEER_SETTINGS = ATTR_PREFIX + "revengfile"; //$NON-NLS-1$
+ public static final String ATTR_REVERSE_ENGINEER_SETTINGS = ATTR_PREFIX + CFS.REVENGFILE;
public static final String ATTR_REVERSE_ENGINEER_STRATEGY = ATTR_PREFIX + "revengstrategy"; //$NON-NLS-1$
public static final String ATTR_USE_OWN_TEMPLATES = ATTR_PREFIX + "useOwnTemplates"; //$NON-NLS-1$
- public static final String ATTR_ENABLE_EJB3_ANNOTATIONS = ATTR_PREFIX + "ejb3"; //$NON-NLS-1$
- public static final String ATTR_ENABLE_JDK5 = ATTR_PREFIX + "jdk5"; //$NON-NLS-1$
+ public static final String ATTR_ENABLE_EJB3_ANNOTATIONS = ATTR_PREFIX + CGS.EJB3;
+ public static final String ATTR_ENABLE_JDK5 = ATTR_PREFIX + CGS.JDK5;
public static final String ATTR_PACKAGE_NAME = ATTR_PREFIX + "package"; //$NON-NLS-1$
public static final String ATTR_ENABLE_TEMPLATE_DIR = ATTR_PREFIX + "templatepathenabled"; //$NON-NLS-1$
public static final String ATTR_TEMPLATE_DIR = ATTR_PREFIX + "templatepath"; //$NON-NLS-1$
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2010-07-09 16:35:32 UTC (rev 23352)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2010-07-09 17:26:36 UTC (rev 23353)
@@ -50,6 +50,7 @@
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
+import org.hibernate.eclipse.console.model.impl.EFS;
import org.hibernate.eclipse.console.utils.LaunchHelper;
import org.hibernate.eclipse.launch.HibernateLaunchConstants;
import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
@@ -126,7 +127,7 @@
@SuppressWarnings("unchecked")
private static boolean isExportersAffected(ILaunchConfiguration config,
IPath oldPath) throws CoreException {
- String[] k = new String[]{"outputdir"}; //$NON-NLS-1$
+ String[] k = new String[]{EFS.OUTPUTDIR};
List<String> exporterNames = config.getAttribute(HibernateLaunchConstants.ATTR_EXPORTERS, Collections.EMPTY_LIST);
for (String exporterName : exporterNames) {
Map<String, String> props = config.getAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + '.' +
@@ -229,7 +230,7 @@
@SuppressWarnings("unchecked")
private static void updateExporters(IPath oldPath, IPath newPath,
ILaunchConfigurationWorkingCopy wc) throws CoreException {
- String[] keys = new String[]{"outputdir"}; //$NON-NLS-1$
+ String[] keys = new String[]{EFS.OUTPUTDIR};
List<String> exporterNames = wc.getAttribute(HibernateLaunchConstants.ATTR_EXPORTERS, Collections.EMPTY_LIST);
for (String exporterName : exporterNames) {
String exporterProp = HibernateLaunchConstants.ATTR_EXPORTERS + '.' +
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23352 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-09 12:35:32 -0400 (Fri, 09 Jul 2010)
New Revision: 23352
Modified:
trunk/build/publish.sh
Log:
add skips and more failures to fail log
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-09 15:33:20 UTC (rev 23351)
+++ trunk/build/publish.sh 2010-07-09 16:35:32 UTC (rev 23352)
@@ -69,10 +69,16 @@
wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl}
fl=${WORKSPACE}/site/${JOB_NAME}/FAIL_LOG.txt
sed -ne "/<<< FAI/,+9 p" ${bl} | sed -e "/AILURE/,+9 s/\(.\+AILURE.\+\)/\n----------\n\n\1/g" > ${fl}
+sed -ne "/ FAI/ p" ${bl} | sed -e "/AILURE \[/ s/\(.\+AILURE \[.\+\)/\n----------\n\n\1/g" >> ${fl}
+sed -ne "/ SKI/ p" ${bl} | sed -e "/KIPPED \[/ s/\(.\+KIPPED \[.\+\)/\n----------\n\n\1/g" >> ${fl}
fc=$(sed -ne "/FAI\|LURE/ p" ${fl} | wc -l)
if [[ $fc != "0" ]]; then
echo "" >> ${fl}; echo -n "FAI" >> ${fl}; echo -n "LURES FOUND: "$fc >> ${fl};
fi
+fc=$(sed -ne "/KIPPED/ p" ${fl} | wc -l)
+if [[ $fc != "0" ]]; then
+ echo "" >> ${fl}; echo -n "SKI" >> ${fl}; echo -n "PS FOUND: "$fc >> ${fl};
+fi
el=${WORKSPACE}/site/${JOB_NAME}/ERRORLOG.txt
sed -ne "/<<< ERR/,+9 p" ${bl} | sed -e "/RROR/,+9 s/\(.\+RROR.\+\)/\n----------\n\n\1/g" > ${el}
sed -ne "/\[ERR/,+2 p" ${bl} | sed -e "/ROR\] Fai/,+2 s/\(.\+ROR\] Fai.\+\)/\n----------\n\n\1/g" >> ${el}
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23351 - in trunk/vpe/plugins/org.jboss.tools.vpe.docbook: templates and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-07-09 11:33:20 -0400 (Fri, 09 Jul 2010)
New Revision: 23351
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml
Removed:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-6586 :
VPE JUnits failed: child of node X must be H1
- VPE template files for docbook have been renamed according to standard VPE naming convention: vpe-templates-*.xml
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/plugin.xml 2010-07-09 15:16:41 UTC (rev 23350)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/plugin.xml 2010-07-09 15:33:20 UTC (rev 23351)
@@ -5,10 +5,10 @@
point="org.jboss.tools.vpe.templates">
<templates
name="Web Deployment Descriptor"
- path="templates/docbook.xml"></templates>
+ path="templates/vpe-templates-docbook.xml"></templates>
<templates
name="XInclude"
- path="templates/xinclude.xml">
+ path="templates/vpe-templates-xinclude.xml">
</templates>
</extension>
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml 2010-07-09 15:16:41 UTC (rev 23350)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml 2010-07-09 15:33:20 UTC (rev 23351)
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <!--vpe:template-taglib uri="-//OASIS//DTD DocBook XML V4.3CR3//EN"/-->
-
- <vpe:tag name="chapter" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="section" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="sect1" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="sect2" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="title" case-sensitive="yes">
- <vpe:template children="no" modify="yes">
- <h1>
- <vpe:value expr="{tagtext()}" />
- </h1>
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="para" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <p />
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="itemizedlist" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <ul />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="listitem" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <li />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="ulink" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <a href="{@url}" />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="programlisting" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <pre />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="emphasis" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <em />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="tgroup" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <table border="1px" />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="row" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <tr />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="entry" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <td />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="property" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <i />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="imagedata" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <img src="{src(@fileref)}" />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="mediaobject" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="imageobject" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="figure" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div />
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="orderedlist" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <ol />
- </vpe:template>
- </vpe:tag>
- <vpe:tag case-sensitive="yes" name="chapterinfo">
- <vpe:template children="yes" modify="yes">
- <vpe:any display="none" icon="no" value="{name()}" />
- </vpe:template>
- </vpe:tag>
- <vpe:tag case-sensitive="yes" name="note">
- <vpe:template children="yes" modify="yes">
- <vpe:any background-color="yellow" border="blue" icon="no" />
- </vpe:template>
- </vpe:tag>
-</vpe:templates>
\ No newline at end of file
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml (from rev 23234, trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml)
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-07-09 15:33:20 UTC (rev 23351)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <!--vpe:template-taglib uri="-//OASIS//DTD DocBook XML V4.3CR3//EN"/-->
+
+ <vpe:tag name="chapter" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="section" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="sect1" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div />
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="sect2" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div />
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="title" case-sensitive="yes">
+ <vpe:template children="no" modify="yes">
+ <h1>
+ <vpe:value expr="{tagtext()}" />
+ </h1>
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="para" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <p />
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="itemizedlist" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <ul />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="listitem" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <li />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="ulink" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <a href="{@url}" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="programlisting" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <pre />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="emphasis" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <em />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="tgroup" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <table border="1px" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="row" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <tr />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="entry" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <td />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="property" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <i />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="imagedata" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <img src="{src(@fileref)}" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="mediaobject" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div />
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="imageobject" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div />
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="figure" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div />
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="orderedlist" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <ol />
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag case-sensitive="yes" name="chapterinfo">
+ <vpe:template children="yes" modify="yes">
+ <vpe:any display="none" icon="no" value="{name()}" />
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag case-sensitive="yes" name="note">
+ <vpe:template children="yes" modify="yes">
+ <vpe:any background-color="yellow" border="blue" icon="no" />
+ </vpe:template>
+ </vpe:tag>
+</vpe:templates>
\ No newline at end of file
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml (from rev 23234, trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml)
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml 2010-07-09 15:33:20 UTC (rev 23351)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <vpe:template-taglib uri="http://www.w3.org/2001/XInclude" prefix="xi" />
+
+ <vpe:tag name="xi:include" case-sensitive="yes">
+ <vpe:template children="yes" file="{@href}" class="org.jboss.tools.vpe.editor.template.VpeIncludeTemplate"/>
+ </vpe:tag>
+</vpe:templates>
\ No newline at end of file
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml 2010-07-09 15:16:41 UTC (rev 23350)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml 2010-07-09 15:33:20 UTC (rev 23351)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <vpe:template-taglib uri="http://www.w3.org/2001/XInclude" prefix="xi" />
-
- <vpe:tag name="xi:include" case-sensitive="yes">
- <vpe:template children="yes" file="{@href}" class="org.jboss.tools.vpe.editor.template.VpeIncludeTemplate"/>
- </vpe:tag>
-</vpe:templates>
\ No newline at end of file
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23350 - in trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext: config and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2010-07-09 11:16:41 -0400 (Fri, 09 Jul 2010)
New Revision: 23350
Added:
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/widgets/SWTBotSection.java
Modified:
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java
Log:
SWTBot Extensions: added 'runOnce' annotation, added Section widget
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2010-07-09 14:10:56 UTC (rev 23349)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2010-07-09 15:16:41 UTC (rev 23350)
@@ -2,19 +2,18 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
-
+import java.util.Set;
import org.apache.log4j.Logger;
import org.eclipse.swtbot.swt.finder.junit.ScreenshotCaptureListener;
+import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires;
import org.jboss.tools.ui.bot.ext.config.TestConfiguration;
import org.jboss.tools.ui.bot.ext.config.TestConfigurator;
-import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires;
import org.jboss.tools.ui.bot.ext.config.requirement.RequirementBase;
import org.junit.runner.Description;
import org.junit.runner.Runner;
-import org.junit.runner.manipulation.Filter;
-import org.junit.runner.manipulation.NoTestsRemainException;
import org.junit.runner.notification.RunListener;
import org.junit.runner.notification.RunNotifier;
import org.junit.runners.BlockJUnit4ClassRunner;
@@ -106,12 +105,20 @@
TestConfigurator.currentConfig = this.config;
}
List<RequirementBase> reqs = TestConfigurator.getClassRequirements(klass);
- if (reqs != null) {
+ if (reqs != null) {
+ SWTBotTestRequires anno = klass.getAnnotation(SWTBotTestRequires.class);
+ if (anno!=null && anno.runOnce() && cleanUp.isClassPlanned(klass)) {
+ // class is already planned to run and contains annotation runOnce
+ log.info("Skipping class '" + klass.getCanonicalName()
+ + "' - runOnce=true, class already planned");
+ return null;
+ }
log.info("Returning runner for class '"
+ klass.getCanonicalName() + "'");
// increment number of tests planned to run by 1 (class contains
// at least 1 test method)
cleanUp.incrPlanned();
+ cleanUp.addClass(klass);
return new ReqAwareClassRunner(klass, reqs, config);
}
log.info("Skipping class '" + klass.getCanonicalName()
@@ -123,7 +130,7 @@
/**
* listener which listens to test runs, does some cleanup after all tests
- * have run
+ * have run it also holds set of all classes which run (usefull for runOnce annotation)
*
* @author lzoubek
*
@@ -155,6 +162,17 @@
public int getFinished() {
return testsFinished;
}
+ private Set<String> classes = new HashSet<String>();
+ /**
+ * adds class to runList - as it is planned to run
+ * @param klass
+ */
+ public void addClass(Class<?> klass) {
+ classes.add(klass.getName());
+ }
+ public boolean isClassPlanned(Class<?> klass) {
+ return classes.contains(klass.getName());
+ }
@Override
public void testFinished(Description description) throws Exception {
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-07-09 14:10:56 UTC (rev 23349)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-07-09 15:16:41 UTC (rev 23350)
@@ -29,10 +29,12 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.eclipse.ui.forms.widgets.Section;
import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt;
import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
import org.jboss.tools.ui.bot.ext.parts.SWTBotHyperlinkExt;
import org.jboss.tools.ui.bot.ext.parts.SWTBotScaleExt;
+import org.jboss.tools.ui.bot.ext.widgets.SWTBotSection;
/**
* Extended version of SWTWorkbenchBot, logging added
@@ -162,6 +164,15 @@
public SWTBotButton clickButton(String text) {
return button(text).click();
}
-
+ @SuppressWarnings("unchecked")
+ public SWTBotSection section(String label) {
+ try {
+ List<Section> sections = (List<Section>)widgets(allOf(withText(label),widgetOfType(Section.class)));
+ return new SWTBotSection(sections.get(0));
+ } catch (WidgetNotFoundException ex) {
+ throw new WidgetNotFoundException(
+ "Could not find widget of type Section", ex);
+ }
+ }
}
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-07-09 14:10:56 UTC (rev 23349)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-07-09 15:16:41 UTC (rev 23350)
@@ -1132,6 +1132,30 @@
return containsItem;
}
/**
+ * returns true if path composed from items exists in tree
+ * @param tree
+ * @param items
+ * @return
+ */
+ public static boolean containstInTree(SWTBotTree tree, String...items) {
+ try {
+ SWTBotTreeItem ancestor = tree.getTreeItem(items[0]);
+ tree.expandNode(items[0]);
+ for (int i=1;i<items.length;i++) {
+ try {
+ ancestor = ancestor.expandNode(items[i]);
+ }
+ catch (WidgetNotFoundException ex) {
+ return false;
+ }
+ }
+ return true;
+ }
+ catch (WidgetNotFoundException ex) {
+ return false;
+ }
+ }
+ /**
* Returns true if editor with editorLabel exists within bot
* static version
* @param bot
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java 2010-07-09 14:10:56 UTC (rev 23349)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/Annotations.java 2010-07-09 15:16:41 UTC (rev 23350)
@@ -56,6 +56,14 @@
* @return
*/
boolean clearProjects() default true;
+ /**
+ * if you want your class to be run just once (among all suites and possibly multiple configurations)
+ * set this to true, default is false.
+ * This is useful when testing against multiple configurations is not needed
+ * or for test class which would last too long and would uselessly run more than once
+ * @return
+ */
+ boolean runOnce() default false;
}
/**
* Server requirement, by default matches all server types and versions
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2010-07-09 14:10:56 UTC (rev 23349)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2010-07-09 15:16:41 UTC (rev 23350)
@@ -82,11 +82,16 @@
}
// load default config by default
try {
+ log.info(" * Loading default configuration first");
currentConfig = new TestConfiguration("default", "");
+
} catch (Exception e) {
// log only message, nothing
log.error(e.getMessage());
}
+ finally {
+ log.info(" * Defaults loaded");
+ }
}
/**
Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/widgets/SWTBotSection.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/widgets/SWTBotSection.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/widgets/SWTBotSection.java 2010-07-09 15:16:41 UTC (rev 23350)
@@ -0,0 +1,19 @@
+package org.jboss.tools.ui.bot.ext.widgets;
+
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBotControl;
+import org.eclipse.ui.forms.widgets.Section;
+/**
+ * this class represents Section (expandable labeled area,
+ * section is often used as a basic building block if forms
+ * because it provides for logical grouping of information.)
+ * @author lzoubek
+ *
+ */
+public class SWTBotSection extends AbstractSWTBotControl<Section> {
+
+ public SWTBotSection(Section w) throws WidgetNotFoundException {
+ super(w);
+ }
+
+}
Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/widgets/SWTBotSection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23349 - in trunk/documentation/whatsnew/jbpm: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-07-09 10:10:56 -0400 (Fri, 09 Jul 2010)
New Revision: 23349
Added:
trunk/documentation/whatsnew/jbpm/images/log-notification.png
trunk/documentation/whatsnew/jbpm/images/new-esb-notifier.png
trunk/documentation/whatsnew/jbpm/images/reservation-service.png
trunk/documentation/whatsnew/jbpm/jbpm-news-3.1.7.GA-full.html
trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html
Log:
revert the deleted pages
Added: trunk/documentation/whatsnew/jbpm/images/log-notification.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/log-notification.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/images/new-esb-notifier.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/new-esb-notifier.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/images/reservation-service.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/reservation-service.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/jbpm-news-3.1.7.GA-full.html
===================================================================
--- trunk/documentation/whatsnew/jbpm/jbpm-news-3.1.7.GA-full.html (rev 0)
+++ trunk/documentation/whatsnew/jbpm/jbpm-news-3.1.7.GA-full.html 2010-07-09 14:10:56 UTC (rev 23349)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>jBPM Tools 3.1.7.GA What's New</title>
+</head>
+<body>
+<h1>jBPM Tools 3.1.7.GA What's New</h1>
+
+ <p align="right"><a href="../index.html">< Main Index</a> <a href="../jmx/jmx-news-1.0.0.GA-full.html">JBoss JMX Tools News></a></p>
+
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>jPDL Graphical Process Designer</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>ESB Service Node</b></td>
+ <td valign="top">
+ <p>The configuration of the ESB service node was updated.
+ The one way notification is removed and ReplyTo/DefaultTo is now supported in the configuration panel.</p>
+ <p><img src="images/reservation-service.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>ESB Notification</b></td>
+ <td valign="top">
+ <p>A new predefined action was added that can be used on transitions and events throughout the
+ process definition. It is a ESB notification action.</p>
+ <p><img src="images/new-esb-notifier.png"/></p>
+ <p>The action is configured in a similar way as the ESB service node.</p>
+ <p><img src="images/log-notification.png"/></p>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html 2010-07-09 14:10:56 UTC (rev 23349)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>jBPM Tools 3.2.0.M2 What's New</title>
+</head>
+<body>
+<h1>jBPM Tools 3.2.0.M2 What's New</h1>
+
+ <p align="right"><a href="../index.html">< Main Index</a> <a href="../core/core-news-3.1.0.M2.html">Core Tools ></a>
+
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>jbpm 4</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>New jbpm4 plugin</b></td>
+ <td valign="top">
+ <p>The newly released jbpm4 plugin that supports jbpm4 with a better jPDL editor with BPMN based graphics is included in this release.</p>
+ <p>It can coexist with the jbpm3 plugin but some actions/wizards will overlap but that will be merged before the final release</p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23348 - in trunk/documentation/whatsnew/jbpm: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-07-09 09:59:35 -0400 (Fri, 09 Jul 2010)
New Revision: 23348
Added:
trunk/documentation/whatsnew/jbpm/images/deployment-explorer.png
trunk/documentation/whatsnew/jbpm/images/deployment-page.png
trunk/documentation/whatsnew/jbpm/images/for-each.png
trunk/documentation/whatsnew/jbpm/images/multiple-processes-in-folder.png
trunk/documentation/whatsnew/jbpm/images/new-jbpm-menu.png
trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M1.html
Removed:
trunk/documentation/whatsnew/jbpm/images/log-notification.png
trunk/documentation/whatsnew/jbpm/images/new-esb-notifier.png
trunk/documentation/whatsnew/jbpm/images/reservation-service.png
trunk/documentation/whatsnew/jbpm/jbpm-news-3.1.7.GA-full.html
trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html
Log:
new_and_noteworthy 3.2.0.M1
Added: trunk/documentation/whatsnew/jbpm/images/deployment-explorer.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/deployment-explorer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/images/deployment-page.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/deployment-page.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/images/for-each.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/for-each.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/documentation/whatsnew/jbpm/images/log-notification.png
===================================================================
(Binary files differ)
Added: trunk/documentation/whatsnew/jbpm/images/multiple-processes-in-folder.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/multiple-processes-in-folder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/documentation/whatsnew/jbpm/images/new-esb-notifier.png
===================================================================
(Binary files differ)
Added: trunk/documentation/whatsnew/jbpm/images/new-jbpm-menu.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/new-jbpm-menu.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/documentation/whatsnew/jbpm/images/reservation-service.png
===================================================================
(Binary files differ)
Deleted: trunk/documentation/whatsnew/jbpm/jbpm-news-3.1.7.GA-full.html
===================================================================
--- trunk/documentation/whatsnew/jbpm/jbpm-news-3.1.7.GA-full.html 2010-07-09 13:00:46 UTC (rev 23347)
+++ trunk/documentation/whatsnew/jbpm/jbpm-news-3.1.7.GA-full.html 2010-07-09 13:59:35 UTC (rev 23348)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Language" content="en-us" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="stylesheet" href="../whatsnew.css"/>
-<title>jBPM Tools 3.1.7.GA What's New</title>
-</head>
-<body>
-<h1>jBPM Tools 3.1.7.GA What's New</h1>
-
- <p align="right"><a href="../index.html">< Main Index</a> <a href="../jmx/jmx-news-1.0.0.GA-full.html">JBoss JMX Tools News></a></p>
-
-
-<table border="0" cellpadding="10" cellspacing="0" width="80%">
-
- <tr>
- <td colspan="2">
- <hr/>
- <h3>jPDL Graphical Process Designer</h3>
- <hr/>
- </td>
- </tr>
- <tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>ESB Service Node</b></td>
- <td valign="top">
- <p>The configuration of the ESB service node was updated.
- The one way notification is removed and ReplyTo/DefaultTo is now supported in the configuration panel.</p>
- <p><img src="images/reservation-service.png"/></p>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr/>
- </td>
- </tr>
- <tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>ESB Notification</b></td>
- <td valign="top">
- <p>A new predefined action was added that can be used on transitions and events throughout the
- process definition. It is a ESB notification action.</p>
- <p><img src="images/new-esb-notifier.png"/></p>
- <p>The action is configured in a similar way as the ESB service node.</p>
- <p><img src="images/log-notification.png"/></p>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
-
-
Added: trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M1.html
===================================================================
--- trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M1.html (rev 0)
+++ trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M1.html 2010-07-09 13:59:35 UTC (rev 23348)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>jBPM Tools 3.2.0.M1 What's New</title>
+</head>
+<body>
+<h1>jBPM Tools 3.2.0.M1 What's New</h1>
+
+ <p align="right"><a href="../index.html">< Main Index</a>
+
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>jbpm 3.x</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Multiple Processes</b></td>
+ <td valign="top">
+ <p>It is now possible to create multiple processes in one folder using the normal process creation wizard. To allow this, we had to
+ change the name of the created graphical info file. The new layout is illustrated in the screenshot below.</p>
+ <p><img src="images/multiple-processes-in-folder.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>jBPM Menu</b></td>
+ <td valign="top">
+ <p>We added a top level 'jBPM' menu for the jBPM 3 process files. In this menu you will find the 'Show Grid' entry that used to be
+ available in 'View' menu which has been removed. The actions to deploy a process archive, to test the connection to a jBPM server
+ and to save a deployment archive locally have been added to the new 'jBPM' menu. These actions are not available anymore on the
+ deployment page. The menu is illustrated on the screenshot below.</p>
+ <p><img src="images/new-jbpm-menu.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Deployment Page</b></td>
+ <td valign="top">
+ <p>The deployment page has been completely revised. There are now separate fields for the three most important files that are usually
+ included in a deployment archive: the process file, the graphical info file and the process image. Additional files and/or classes and
+ resources can be added from the workspace. Finally, the deployment credentials and server information can be specified as before.
+ The different actions to deploy, ping the server and save the deployment archive have been moved to the new jBPM menu mentioned earlier.</p>
+ <p><img src="images/deployment-explorer.png"/></p>
+ <p>On the image above you see a typical project layout which is referenced from the deployment page illustrated below.</p>
+ <p><img src="images/deployment-page.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>jbpm 4</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Foreach Activity</b></td>
+ <td valign="top">
+ <p>Our jBPM 4 editor now contains the possibility to add and edit the properties of a so-called 'Foreach' activity. This is
+ a special kind of fork that will spawn a new branch of execution for each element of a specified collection. The new element is
+ illustrated below.</p>
+ <p><img src="images/for-each.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M1.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html 2010-07-09 13:00:46 UTC (rev 23347)
+++ trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html 2010-07-09 13:59:35 UTC (rev 23348)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Language" content="en-us" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="stylesheet" href="../whatsnew.css"/>
-<title>jBPM Tools 3.2.0.M2 What's New</title>
-</head>
-<body>
-<h1>jBPM Tools 3.2.0.M2 What's New</h1>
-
- <p align="right"><a href="../index.html">< Main Index</a> <a href="../core/core-news-3.1.0.M2.html">Core Tools ></a>
-
-
-<table border="0" cellpadding="10" cellspacing="0" width="80%">
-
- <tr>
- <td colspan="2">
- <hr/>
- <h3>jbpm 4</h3>
- <hr/>
- </td>
- </tr>
- <tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>New jbpm4 plugin</b></td>
- <td valign="top">
- <p>The newly released jbpm4 plugin that supports jbpm4 with a better jPDL editor with BPMN based graphics is included in this release.</p>
- <p>It can coexist with the jbpm3 plugin but some actions/wizards will overlap but that will be merged before the final release</p>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr/>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
-
-
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23347 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-07-09 09:00:46 -0400 (Fri, 09 Jul 2010)
New Revision: 23347
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties
Log:
Corrected wrong string "Seam Component Name" -> "EL Variable Name"
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2010-07-09 12:52:56 UTC (rev 23346)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2010-07-09 13:00:46 UTC (rev 23347)
@@ -20,7 +20,7 @@
RESOURCE_BUNDLES_RENAME_PARTICIPANT_UPDATE_BUNDLE_REFERENCES=Update bundle references in EL
REFACTOR_CONTRIBUTOR_MAIN_MENU=EL Refactor
REFACTOR_CONTRIBUTOR_RENAME_EL_VARIABLE=Rename EL Variable
-RENAME_EL_VARIABLE_WIZARD_EL_VARIABLE_NAME=Seam component name:
+RENAME_EL_VARIABLE_WIZARD_EL_VARIABLE_NAME=EL Variable name:
IS_JSF_CHECK_NEED=Is JSF check
IS_KB_NATURE_CHECK_NEED=Is KB natures check
IS_JSF_NATURE_CHECK_NEED=Is JSF natures check
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23346 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-07-09 08:52:56 -0400 (Fri, 09 Jul 2010)
New Revision: 23346
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.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/browse/JBIDE-6550
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2010-07-09 12:51:50 UTC (rev 23345)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2010-07-09 12:52:56 UTC (rev 23346)
@@ -32,6 +32,6 @@
IBean bean = beans.iterator().next();
assertTrue("The bean should be an interceptor", bean instanceof IClassBean);
IClassBean interceptor = (IClassBean)bean;
- assertFalse("The intercpetor should inherites interceptor bindings", interceptor.getInterceptorBindingDeclarations().isEmpty());
+ assertFalse("The interceptor should inherites interceptor bindings", interceptor.getInterceptorBindings().isEmpty());
}
}
\ No newline at end of file
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-07-09 12:51:50 UTC (rev 23345)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-07-09 12:52:56 UTC (rev 23346)
@@ -1285,7 +1285,9 @@
*/
public void testInterceptorBindingsWithConflictingAnnotationMembersNotOk() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/Foo.java");
- assertMarkerIsCreated(file, CDIValidationMessages.CONFLICTING_INTERCEPTOR_BINDINGS, 19, 20);
+// assertMarkerIsCreated(file, CDIValidationMessages.CONFLICTING_INTERCEPTOR_BINDINGS, 19, 20);
+ //At present CDICoreValidator puts marker to class name
+ assertMarkerIsCreated(file, CDIValidationMessages.CONFLICTING_INTERCEPTOR_BINDINGS, 21);
}
/**
15 years, 9 months
- 1
- 0