JBoss Tools SVN: r40862 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-08 19:41:06 -0400 (Tue, 08 May 2012)
New Revision: 40862
Added:
branches/jbosstools-3.2.x/build/parent/pom-tycho0.14.1.xml
Log:
provide version of parent pom which uses tycho 0.14.1 for use with Teiid 7.4.x -- trying to figure out why tests fail
Added: branches/jbosstools-3.2.x/build/parent/pom-tycho0.14.1.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom-tycho0.14.1.xml (rev 0)
+++ branches/jbosstools-3.2.x/build/parent/pom-tycho0.14.1.xml 2012-05-08 23:41:06 UTC (rev 40862)
@@ -0,0 +1,1094 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <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>
+ <modules>
+ <module>../target-platform</module>
+ </modules>
+
+ <properties>
+ <!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
+ <tychoVersion>0.14.1</tychoVersion>
+ <scmBranch>branches/jbosstools-3.2.x</scmBranch>
+ <JBT_VERSION>3.2.3</JBT_VERSION>
+ <JBDS_VERSION>4.1.3</JBDS_VERSION>
+ <BUILD_ALIAS>M</BUILD_ALIAS>
+ <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
+ <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
+ <systemProperties></systemProperties>
+ <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
+
+ <!-- target files available for building: multiple sites, 1 unified site,
+ 1 local mirrored site -->
+ <target.platform.classifier.multiple>mutiple
+ </target.platform.classifier.multiple>
+ <target.platform.classifier.unified>unified
+ </target.platform.classifier.unified>
+ <target.platform.classifier.local>local
+ </target.platform.classifier.local>
+
+ <!-- 1a. URL of latest JBT target platform site -->
+ <jbosstools-target-platform-repo>http://download.jboss.org/jbosstools/updates/target-platform/latest/</jbosstools-target-platform-repo>
+
+ <!-- 1b. or, use -Dtarget.platform.site=file:///home/$user/trunk/build/target-platform/REPO/
+ (old convention) -->
+ <!-- -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/
+ (new convention) -->
+ <!-- Set this to a path on your own machine, or use remote URL like http://download.jboss.org/jbosstools/updates/target-platform/latest/
+ Can also generate a local.target file which will always point to your local
+ repo w/o having to edit here. See local.target profile below for more information. -->
+ <local.site>file:///home/hudson/static_build_env/jbds/target-platform/e362-wtp325.target/</local.site>
+ <target.platform.site>${local.site}</target.platform.site>
+
+ <!-- 2a. URL of latest JBT nightly staging composite site (all the components
+ in once place) -->
+ <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl...</jbosstools-nightly-staging-composite>
+
+ <!-- 2b., or, use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.2_stable_branch/</local.composite>
+
+ <!-- 3. optionally, use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
+ <local.requirements>file:///qa/services/http/binaries/RHDS/updates/helios/</local.requirements>
+
+ <!-- 4. published aggregate update site goes here, for consumption by QE
+ and downstream JBDS builds -->
+ <jbosstools.update.site>http://download.jboss.org/jbosstools/updates/nightly/core/3.2_stable_branch/</jbosstools.update.site>
+
+ <!-- 5. extra requirements (for 3rd party "Extras" site) -->
+ <jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/helios/extras/</jboss-requirements-composite-extras-mirror>
+ </properties>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <configuration>
+ <quiet>true</quiet>
+ <tasks>
+ <taskdef resource="net/sf/antcontrib/antlib.xml" />
+ <if>
+ <available file="${basedir}/target/site" type="dir" />
+ <then>
+
+ <var name="ant.script" unset="true" />
+ <for param="ant.script"
+ list="update-site-build.xml, ../update-site-build.xml, ../parent/update-site-build.xml, ../build/parent/update-site-build.xml, ../../update-site-build.xml, ../../parent/update-site-build.xml, ../../build/parent/update-site-build.xml"
+ delimiter=", ">
+ <sequential>
+ <if>
+ <available file="@{ant.script}" type="file" />
+ <then>
+ <var name="ant.script" value="@{ant.script}" />
+ </then>
+ </if>
+ </sequential>
+ </for>
+ <if>
+ <not>
+ <isset property="ant.script" />
+ </not>
+ <then>
+ <tempfile property="ant.script" destdir="${java.io.tmpdir}"
+ deleteonexit="true" />
+ <get
+ src="http://anonsvn.jboss.org/repos/jbosstools/branches/jbosstools-3.2.x/build..."
+ dest="${ant.script}" verbose="false" usetimestamp="true" />
+ </then>
+ </if>
+ <if>
+ <isset property="ant.script" />
+ <then>
+ <ant antfile="${ant.script}" />
+ </then>
+ <else>
+ <echo>[WARN] Could not run build/parent/update-site-build.xml</echo>
+ </else>
+ </if>
+ </then>
+ </if>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-commons-net</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-regexp</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <format>'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}'</format>
+ <archiveSite>true</archiveSite>
+ <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>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.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.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <!-- timeout in seconds -->
+ <surefire.timeout>1800</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+ <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</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 (?) -->
+
+ <!-- TODO: add new profile to permit running against JBDS product/application
+ for JBDS tests, against Eclipse SDK for JBT -->
+ <product>org.eclipse.sdk</product>
+ <application>org.eclipse.ui.ide.workbench</application>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk</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>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+
+ <!-- not strictly needed but this suppresses warnings when compiling
+ that the default value (1.5) is being overwritten by the value in the MANIFEST.MF.
+ You can use this in your plugins or their aggregator pom.xml files to set
+ this for your plugins -->
+
+ <!-- <source>1.6</source> -->
+ <!-- <target>1.6</target> -->
+ </configuration>
+
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <encoding>ISO-8859-1</encoding>
+ </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>
+
+ <!-- TODO: remove this when no one depends on it; replace with unified.target,
+ not multiuple.target, since no one should need to resolve against all these
+ sites (and one site is by far faster) ! -->
+ <profile>
+ <id>helios</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.target.platform</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <classifier>${target.platform.classifier.multiple}</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Target platform file pointing at a single update site from which to
+ resolve. See unified.site if you want to resolve against a site w/o using
+ the unified.target file -->
+ <profile>
+ <id>unified.target</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.target.platform</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <classifier>${target.platform.classifier.unified}</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- To use this profile, must have first created a local.target file,
+ which points to a local repo. You can do this by hand or generate it from
+ multiple.target using: cd ~/trunk/build/target-platform; ant See also the
+ README in target-platform/ folder for additional usage examples. You can
+ also run `ant help`. If you want to build the target-platform/pom.xml AND
+ generate a local repo + local.target file ALL AT THE SAME TIME, you can do:
+ mvn clean install -Plocal -f /path/to/target-platform/pom.xml -->
+ <profile>
+ <id>local.target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.target.platform</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <classifier>${target.platform.classifier.local}</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Time saver: to build everything from scratch from a single local repo
+ on Hudson cluster or on local machine. Use -Dtarget.platform.site=file:///path/to/your/own/repo -->
+ <profile>
+ <id>helios-local-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jbosstools-target-platform-repo</id>
+ <url>${target.platform.site}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <!-- if you have a local repo mirror of the unified.site, you can use this
+ profile with the -Dtarget.platform.site=file:///path/to/repo to resolve dependencies
+ without needing to use a local.target file -->
+ <profile>
+ <id>local.site</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jbosstools-target-platform-repo</id>
+ <url>${target.platform.site}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <!-- TODO: remove this when no one depends on it; replace with unified.site -->
+ <profile>
+ <id>helios-remote-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jbosstools-target-platform-repo</id>
+ <url>${jbosstools-target-platform-repo}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <!-- Time saver: to build everything from scratch from a single repo containing
+ all deps in unified.target, but without using the target file to filter site
+ contents (may end up using a different version of a dependency if site contains
+ multiple versions) -->
+ <profile>
+ <id>unified.site</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jbosstools-target-platform-repo</id>
+ <url>http://download.jboss.org/jbosstools/updates/target-platform/latest/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </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. -->
+ <!-- TODO: rename when no one depends on it; rename to multiple.site -->
+ <profile>
+ <id>helios-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jbosstools-target-platform-repo</id>
+ <url>http://download.jboss.org/jbosstools/updates/target-platform/latest/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <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>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>webtools322</id>
+ <url>http://download.eclipse.org/webtools/downloads/drops/R3.2.2/R-3.2.2-20100...
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jboss-webtools32</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/webtools/3.2/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jboss-birt26</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/birt/2.6/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jboss-drools-nightly</id>
+ <url>http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools/all...
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jboss-swtbot-helios</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/
+ </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>jboss-xulrunner-1.9.1.2</id>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>google eclipse plugins</id>
+ <url>http://dl.google.com/eclipse/plugin/3.6</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>osx</id>
+ <activation>
+ <property>
+ <name>java.vendor.url</name>
+ <value>http://www.apple.com/</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+ <systemProperties combine.children="append"> -d32 -Dosgi.arch=x86 -XstartOnFirstThread </systemProperties>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>hudson</id>
+ <activation>
+ <property>
+ <name>BUILD_NUMBER</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-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>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.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-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</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</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>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </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" />
+ <html outfile="${project.build.directory}/emma/coverage.html" />
+ </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>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>download-plugin-requirements</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+ <if>
+ <available file="${requirements.root}" type="dir" />
+ <then>
+ <property file="requirements.properties" />
+ <echo>Requirements build</echo>
+ <ant dir="${requirements.root}" inheritAll="true">
+ <property name="requirements" value="${requirements}" />
+ <property name="settings.offline" value="${settings.offline}" />
+ <property name="skipDownload" value="${skipDownload}" />
+ </ant>
+ </then>
+ </if>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jbosstools-nightly-trunk</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jbosstools-nightly-trunk</id>
+ <url>${jbosstools.update.site}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jbosstools-nightly-staging-composite</id>
+ <url>${jbosstools-nightly-staging-composite}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jboss-requirements-composite-mirror</id>
+ <url>http://download.jboss.org/jbosstools/updates/helios/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <!-- same contents as jboss-requirements-composite-mirror, but locally
+ available (to improve network lag) -->
+ <profile>
+ <id>local.requirements</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.requirements</id>
+ <url>${local.requirements}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <!-- Contains all the Third Party Extras deps. This is the superset of sites
+ from which the JBDS Extras site is created. -->
+ <profile>
+ <id>jboss-requirements-composite-extras-mirror</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>jboss-requirements-composite-extras-mirror</id>
+ <url>${jboss-requirements-composite-extras-mirror}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <!-- same contents as jbosstools-nightly-staging-composite, but locally
+ available (to improve network lag) -->
+ <profile>
+ <id>local.composite</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.composite</id>
+ <url>${local.composite}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <!-- this plugin is available from https://github.com/nickboldt/maven-plugins/tree/master/unique-GAV-plugin/ -->
+ <id>GAV</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugin</groupId>
+ <artifactId>unique-GAV-plugin</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <verbose>true</verbose>
+ <doInfo>true</doInfo>
+ <doWarn>true</doWarn>
+ <doError>true</doError>
+ <sourceDirectory>.</sourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <distributionManagement>
+ <repository>
+ <id>jboss-releases-repository</id>
+ <name>JBoss Releases Repository</name>
+ <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+ </repository>
+ <snapshotRepository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <!-- <repository> <id>jboss-releases-repository</id> <name>JBoss Releases
+ Repository</name> <uniqueVersion>false</uniqueVersion> <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
+ <layout>default</layout> </repository> <snapshotRepository> <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshot Repository</name> <uniqueVersion>false</uniqueVersion>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ <layout>default</layout> </snapshotRepository> -->
+ </distributionManagement>
+</project>
12 years, 8 months
JBoss Tools SVN: r40861 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-05-08 18:39:34 -0400 (Tue, 08 May 2012)
New Revision: 40861
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
Log:
JBIDE-10930 : don't add an extra / if context root starts with / already
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2012-05-08 20:20:45 UTC (rev 40860)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2012-05-08 22:39:34 UTC (rev 40861)
@@ -212,7 +212,7 @@
contextRoot = webModule.getContextRoot();
}
if( !contextRoot.equals("/") && !contextRoot.equals("./")) //$NON-NLS-1$ //$NON-NLS-2$
- url += "/"+contextRoot; //$NON-NLS-1$
+ url += contextRoot.startsWith("/") ? contextRoot : "/"+contextRoot; //$NON-NLS-1$ //$NON-NLS-2$
if (!url.endsWith("/")) //$NON-NLS-1$
url += "/"; //$NON-NLS-1$
12 years, 8 months
JBoss Tools SVN: r40860 - in trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test: create and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-05-08 16:20:45 -0400 (Tue, 08 May 2012)
New Revision: 40860
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/AbstractSeamTestBase.java
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/misc/GotoComponent.java
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ComponentsValidator.java
Log:
Fixes for 3.3.0.Beta3
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/AbstractSeamTestBase.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/AbstractSeamTestBase.java 2012-05-08 20:16:42 UTC (rev 40859)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/AbstractSeamTestBase.java 2012-05-08 20:20:45 UTC (rev 40860)
@@ -17,7 +17,7 @@
server=@Server(),
seam=@Seam(),
db=@DB(),
- perspective="Seam 2",
+ perspective="Seam",
clearProjects=false)
public abstract class AbstractSeamTestBase extends SWTTestExt {
@@ -37,7 +37,7 @@
/**Creates any Seam Action, Form etc. */
public void createSeamUnit(String unitType, String type){
- bot.menu("File").menu("New").menu("Seam 2 " +unitType).click();
+ bot.menu("File").menu("New").menu("Seam " +unitType).click();
SWTBotShell shell = bot.activeShell();
bot.textWithLabel("Seam Project:").setText(testProjectName + type);
if ("Entity".equals(unitType)) {
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2012-05-08 20:16:42 UTC (rev 40859)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2012-05-08 20:20:45 UTC (rev 40860)
@@ -8,7 +8,6 @@
import org.jboss.tools.seam.ui.bot.test.EARTests;
import org.jboss.tools.seam.ui.bot.test.TestControl;
import org.jboss.tools.seam.ui.bot.test.WARTests;
-import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
@@ -29,52 +28,38 @@
public CreateSeamProjects() {
}
-
- private SWTJBTExt swtJbtExt = new SWTJBTExt(bot);
-
- @Test
+ @Test
@Category(WARTests.class)
public void testCreateSeamProjectWar(){
createSeamProject(TestControl.TYPE_WAR);
- util.waitForNonIgnoredJobs();
+ util.waitForNonIgnoredJobs(Timing.time100S());
+ bot.sleep(Timing.time3S());
+ // checkSeamProject(TestControl.TYPE_WAR);
}
-
- @Test
- @Category(WARTests.class)
- public void testCheckSeamProjectWar(){
- bot.sleep(Timing.time3S());
- checkSeamProject(TestControl.TYPE_WAR);
- }
-
- @Test
+ @Test
@Category(EARTests.class)
public void testCreateSeamProjectEar(){
createSeamProject(TestControl.TYPE_EAR);
- util.waitForNonIgnoredJobs();
+ util.waitForNonIgnoredJobs(Timing.time100S());
+ bot.sleep(Timing.time3S());
+ // checkSeamProject(TestControl.TYPE_EAR);
}
-
- @Test
- @Category(EARTests.class)
- public void testCheckSeamProjectEar(){
- bot.sleep(Timing.time3S());
- checkSeamProject(TestControl.TYPE_EAR);
- }
-
protected void createSeamProject(String type) {
SWTJBTBot bot = new SWTJBTBot();
- bot.menu("File").menu("New").menu("Seam 2 Web Project").click();
+ bot.menu("File").menu("New").menu("Seam Web Project").click();
bot.textWithLabel("Project name:").setText(AbstractSeamTestBase.testProjectName + type);
bot.comboBoxInGroup("Target runtime").setSelection(SWTTestExt.configuredState.getServer().name);
bot.comboBoxInGroup("Target Server").setSelection(SWTTestExt.configuredState.getServer().name);
bot.comboBoxInGroup("Configuration").setSelection(
AbstractSeamTestBase.seamConfigPrefix +
- SWTTestExt.configuredState.getSeam().version);
+ SWTTestExt.configuredState.getSeam().version +
+ (SWTTestExt.configuredState.getSeam().version.equals("2.3") ? " (Technical Preview)" : ""));
bot.button("Next >").click();
bot.button("Next >").click();
bot.button("Next >").click();
bot.button("Next >").click();
- bot.comboBoxWithLabel("Seam 2 Runtime:").setSelection(SWTTestExt.configuredState.getSeam().name);
+ bot.comboBoxWithLabel("Seam Runtime:").setSelection(SWTTestExt.configuredState.getSeam().name);
new SWTBotRadioExt(bot.radio(type).widget).clickWithoutDeselectionEvent();
bot.comboBoxWithLabel("Connection profile:").setSelection(SWTTestExt.configuredState.getDB().name);
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/misc/GotoComponent.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/misc/GotoComponent.java 2012-05-08 20:16:42 UTC (rev 40859)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/misc/GotoComponent.java 2012-05-08 20:20:45 UTC (rev 40860)
@@ -27,7 +27,7 @@
private void testGotoComponent(String type) {
SWTJBTBot bot = new SWTJBTBot();
- bot.menu("Navigate").menu("Open Seam 2 Component").click();
+ bot.menu("Navigate").menu("Open Seam Component").click();
bot.text().setText("authenticator");
SWTBotTableItem tabItem = bot.table().getTableItem("authenticator - " + AbstractSeamTestBase.testProjectName + type +
((type == TestControl.TYPE_EAR) ? "-ejb" : ""));
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ComponentsValidator.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ComponentsValidator.java 2012-05-08 20:16:42 UTC (rev 40859)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ComponentsValidator.java 2012-05-08 20:20:45 UTC (rev 40860)
@@ -1,10 +1,6 @@
package org.jboss.tools.seam.ui.bot.test.validate;
-import java.util.Properties;
-
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.seam.ui.bot.test.AbstractSeamTestBase;
import org.jboss.tools.seam.ui.bot.test.EARTests;
@@ -55,8 +51,8 @@
SWTTestExt.util.waitForNonIgnoredJobs(60000);
// check that Seam Problem exists
- SWTBotView pBotView = problems.show();
- SWTBotTreeItem[] sProblems = problems.getFilteredErrorsTreeItems(bot, "does not have a setter or a field",
+ problems.show();
+ SWTBotTreeItem[] sProblems = ProblemsView.getFilteredErrorsTreeItems(bot, "does not have a setter or a field",
"/" + testProjectName, "components.xml", "Seam Problem");
assertTrue("No Seam problem found.", ( (sProblems != null) && (sProblems.length > 0) ));
assertTrue("More than one Seam problem found.", sProblems.length <= 1);
@@ -65,11 +61,11 @@
SWTBotEclipseEditor aEditor;
if (type == TestControl.TYPE_EAR)
- aEditor = projectExplorer.openFile(testProjectName + type + "-ejb",
+ aEditor = packageExplorer.openFile(testProjectName + type + "-ejb",
"ejbModule", "org.domain.seamprjear.session", "Authenticator.java").toTextEditor();
else
- aEditor = projectExplorer.openFile(testProjectName + type,
- "src", "hot", "org", "domain", "seamprjwar", "session", "Authenticator.java").toTextEditor();
+ aEditor = packageExplorer.openFile(testProjectName + type,
+ "src/hot", "org.domain.seamprjwar.session", "Authenticator.java").toTextEditor();
idx = 0;
for(String line : aEditor.getLines()) {
@@ -84,7 +80,7 @@
// check that Seam Problem disappeared
problems.show();
- sProblems = problems.getFilteredErrorsTreeItems(bot, "does not have a setter or a field",
+ sProblems = ProblemsView.getFilteredErrorsTreeItems(bot, "does not have a setter or a field",
"/" + testProjectName, "components.xml", "Seam Problem");
assertTrue("Seam problem still exists.", sProblems == null || sProblems.length == 0);
12 years, 8 months
JBoss Tools SVN: r40859 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-05-08 16:16:42 -0400 (Tue, 08 May 2012)
New Revision: 40859
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
Log:
Select default profile when creating Server Runtime
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-05-08 19:54:01 UTC (rev 40858)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-05-08 20:16:42 UTC (rev 40859)
@@ -874,6 +874,13 @@
bot.textWithLabel(key.toString()).setText(
properties.getProperty((String) (key).toString()));
}
+ // try to select default profile if is available
+ try{
+ bot.table().select("default");
+ } catch (WidgetNotFoundException wnf){
+ // do nothing
+ }
+
if (jreToUse != null) {
bot.comboBox(0).setSelection(jreToUse);
}
12 years, 8 months
JBoss Tools SVN: r40858 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-08 15:54:01 -0400 (Tue, 08 May 2012)
New Revision: 40858
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
Log:
JBIDE-11794
https://issues.jboss.org/browse/JBIDE-11794
Test dependency is removed.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2012-05-08 19:00:56 UTC (rev 40857)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2012-05-08 19:54:01 UTC (rev 40858)
@@ -73,6 +73,8 @@
static String SCOPE_NAME = "MyScope";
static String INTERCEPTOR_BINDING_NAME = "MyInterceptorBinding";
static String INTERCEPTOR_BINDING2_NAME = "MyInterceptorBinding2";
+ static String EXISTING_PACK_NAME = "org.jboss.jsr299.tck.tests.jbt.validation.target";
+ static String EXISTING_INTERCEPTOR_BINDING_NAME = "InterceptorBindingWTypeTarget"; // @Inherited @Target({TYPE})
static String INTERCEPTOR_NAME = "MyInterceptor";
static String DECORATOR_NAME = "MapDecorator<K,V>";
static String BEAN_NAME = "MyBean";
@@ -311,6 +313,15 @@
}
}
+ /**
+ * Existing interceptor binding, taken from TCK, is annotated @Inherited @Target({TYPE})
+ * If this test fails, first check that the existing interceptor binding has not been
+ * moved or modified.
+ * In the previous version, the result of testNewInterceptorBindingWizard() was used,
+ * but that turned to be not safe, since the order of tests is not guaranteed.
+ *
+ * @throws CoreException
+ */
public void testNewInterceptorBindingWizardWithBinding() throws CoreException {
IProject tck = ResourcesPlugin.getWorkspace().getRoot().getProject("tck");
tck.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
@@ -323,7 +334,7 @@
try {
NewInterceptorBindingWizardPage page = (NewInterceptorBindingWizardPage)context.page;
ICDIProject cdi = CDICorePlugin.getCDIProject(context.tck, true);
- IInterceptorBinding s = cdi.getInterceptorBinding(PACK_NAME + "." + INTERCEPTOR_BINDING_NAME);
+ IInterceptorBinding s = cdi.getInterceptorBinding(EXISTING_PACK_NAME + "." + EXISTING_INTERCEPTOR_BINDING_NAME);
assertNotNull(s);
page.addInterceptorBinding(s);
@@ -348,13 +359,23 @@
}
}
+ /**
+ * Existing interceptor binding, taken from TCK, is annotated @Inherited @Target({TYPE})
+ * If this test fails, first check that the existing interceptor binding has not been
+ * moved or modified.
+ * In the previous version, the result of testNewInterceptorBindingWizard() was used,
+ * but that turned to be not safe, since the order of tests is not guaranteed.
+ *
+ * @throws CoreException
+ */
public void testNewInterceptorWizard() {
WizardContext context = new WizardContext();
context.init("org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard",
PACK_NAME, INTERCEPTOR_NAME);
ICDIProject cdi = CDICorePlugin.getCDIProject(context.tck, true);
- ICDIAnnotation a = cdi.getInterceptorBinding(PACK_NAME + "." + INTERCEPTOR_BINDING_NAME);
+ ICDIAnnotation a = cdi.getInterceptorBinding(EXISTING_PACK_NAME + "." + EXISTING_INTERCEPTOR_BINDING_NAME);
+ assertNotNull(a);
try {
NewInterceptorWizardPage page = (NewInterceptorWizardPage)context.page;
@@ -366,7 +387,7 @@
String text = context.getNewTypeContent();
assertTrue(text.contains("@Interceptor"));
- assertTrue(text.contains("@" + INTERCEPTOR_BINDING_NAME));
+ assertTrue(text.contains("@" + EXISTING_INTERCEPTOR_BINDING_NAME));
IProject tck = ResourcesPlugin.getWorkspace().getRoot().getProject("tck");
12 years, 8 months
JBoss Tools SVN: r40857 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-08 15:00:56 -0400 (Tue, 08 May 2012)
New Revision: 40857
Modified:
trunk/build/parent/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-11666 change systemProperties for OSX to platformSystemProperties
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-05-08 18:40:19 UTC (rev 40856)
+++ trunk/build/parent/pom.xml 2012-05-08 19:00:56 UTC (rev 40857)
@@ -22,6 +22,7 @@
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
+ <platformSystemProperties></platformSystemProperties>
<maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
<swtbot.test.skip>true</swtbot.test.skip>
@@ -160,7 +161,7 @@
</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) -->
@@ -176,7 +177,7 @@
<useUIThread>true</useUIThread>
<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
<!-- tycho.testArgLine repeated to keep jacoco configuration for jacoco-maven-plugin -->
- <argLine>${tycho.testArgLine} ${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine>
+ <argLine>${tycho.testArgLine} ${memoryOptions1} ${memoryOptions2} ${platformSystemProperties} ${systemProperties} -Dusage_reporting_enabled=false</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 (?) -->
@@ -663,7 +664,7 @@
</activation>
<properties>
<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
- <systemProperties combine.children="append"> -d32 -Dosgi.arch=x86 -XstartOnFirstThread </systemProperties>
+ <platformSystemProperties> -d32 -Dosgi.arch=x86 -XstartOnFirstThread </platformSystemProperties>
</properties>
</profile>
12 years, 8 months
JBoss Tools SVN: r40856 - trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2012-05-08 14:40:19 -0400 (Tue, 08 May 2012)
New Revision: 40856
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java
Log:
JBIDE-11798 CND Editor Opens In A Dirty State When Qualified Name Has Undeclared Qualifier.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java 2012-05-08 16:38:14 UTC (rev 40855)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java 2012-05-08 18:40:19 UTC (rev 40856)
@@ -291,30 +291,33 @@
private void updateUi() {
// set qualifier choices if they have changed
final String[] currentItems = this.cbxQualifiers.getItems();
+ final List<String> allQualifiers = new ArrayList<String>(this.validQualifiers);
+ String currentQualifier = null;
+
+ if (isEditMode()) {
+ currentQualifier = this.qnameBeingEdited.getQualifier();
+
+ if (!Utils.isEmpty(currentQualifier) && !this.validQualifiers.contains(currentQualifier)) {
+ allQualifiers.add(currentQualifier);
+ }
+ }
// only reload qualifiers if different
- if ((this.validQualifiers.size() != currentItems.length) || !this.validQualifiers.containsAll(Arrays.asList(currentItems))) {
- final String[] newQualifiers = this.validQualifiers.toArray(new String[this.validQualifiers.size()]);
+ if ((allQualifiers.size() != currentItems.length) || !allQualifiers.containsAll(Arrays.asList(currentItems))) {
+ final String[] newQualifiers = allQualifiers.toArray(new String[allQualifiers.size()]);
Arrays.sort(newQualifiers);
this.cbxQualifiers.setItems(newQualifiers);
}
// select the current qualifier and set the name
if (isEditMode()) {
- final String currentQualifier = this.qnameBeingEdited.getQualifier();
-
if (Utils.isEmpty(currentQualifier)) {
this.cbxQualifiers.select(0);
} else {
final int index = this.cbxQualifiers.indexOf(currentQualifier);
-
- if (index == -1) {
- // not a valid qualifier but add and select
- this.cbxQualifiers.add(currentQualifier);
- this.cbxQualifiers.select(this.cbxQualifiers.getItemCount() - 1);
- } else {
- this.cbxQualifiers.select(index);
- }
+ // qualifier should already be a valid selection
+ assert (index != -1) : "qualifier not found=" + currentQualifier; //$NON-NLS-1$
+ this.cbxQualifiers.select(index);
}
final String name = this.qnameBeingEdited.getUnqualifiedName();
12 years, 8 months
JBoss Tools SVN: r40855 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-08 12:38:14 -0400 (Tue, 08 May 2012)
New Revision: 40855
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
Log:
Only an addition of server and runtime type array
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2012-05-08 15:39:44 UTC (rev 40854)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2012-05-08 16:38:14 UTC (rev 40855)
@@ -29,6 +29,9 @@
public static final String EAP_43 = "org.jboss.ide.eclipse.as.runtime.eap.43"; //$NON-NLS-1$
public static final String EAP_50 = "org.jboss.ide.eclipse.as.runtime.eap.50"; //$NON-NLS-1$
public static final String EAP_60 = "org.jboss.ide.eclipse.as.runtime.eap.60"; //$NON-NLS-1$
+ public static final String[] ALL_JBOSS_RUNTIMES = new String[] {
+ AS_32,AS_40,AS_42,AS_50,AS_51,AS_60,AS_70,AS_71,EAP_43,EAP_50,EAP_60
+ };
// NEW_SERVER_ADAPTER Add the new runtime constant above this line
public static final String SERVER_AS_PREFIX = "org.jboss.ide.eclipse.as."; //$NON-NLS-1$
@@ -44,6 +47,10 @@
public static final String SERVER_EAP_43 = "org.jboss.ide.eclipse.as.eap.43"; //$NON-NLS-1$
public static final String SERVER_EAP_50 = "org.jboss.ide.eclipse.as.eap.50"; //$NON-NLS-1$
public static final String SERVER_EAP_60 = "org.jboss.ide.eclipse.as.eap.60"; //$NON-NLS-1$
+ public static final String[] ALL_JBOSS_SERVERS = new String[] {
+ SERVER_AS_32,SERVER_AS_40,SERVER_AS_42,SERVER_AS_50,SERVER_AS_51,
+ SERVER_AS_60,SERVER_AS_70,SERVER_AS_71,SERVER_EAP_43,SERVER_EAP_50,SERVER_EAP_60
+ };
// NEW_SERVER_ADAPTER Add the new server id above this line
public static final String DEPLOY_ONLY_RUNTIME = "org.jboss.ide.eclipse.as.runtime.stripped"; //$NON-NLS-1$
12 years, 8 months
JBoss Tools SVN: r40854 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-05-08 11:39:44 -0400 (Tue, 08 May 2012)
New Revision: 40854
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftPasswordStorageKey.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/SecurePasswordStore.java
Log:
[JBIDE-11634] corrected key that's used to store OpenShift password (removed url-encoding, used proper path partitioning)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftPasswordStorageKey.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftPasswordStorageKey.java 2012-05-08 15:03:30 UTC (rev 40853)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftPasswordStorageKey.java 2012-05-08 15:39:44 UTC (rev 40854)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.utils;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.SecurePasswordStore.IStorageKey;
@@ -23,25 +26,37 @@
public class OpenShiftPasswordStorageKey implements IStorageKey {
private static final char SEPARATOR = '/';
-
- private static final String PREFERNCES_BASEKEY = OpenShiftUIActivator.PLUGIN_ID.replace('.', SEPARATOR);
+ private static final Pattern SCHEME_PATTERN = Pattern.compile(".+://(.*)");
+ private static final String PREFERNCES_BASEKEY = OpenShiftUIActivator.PLUGIN_ID;
+
private String platform;
private String userName;
public OpenShiftPasswordStorageKey(String platform, String userName) {
- this.platform = platform;
+ this.platform = stripScheme(platform);
this.userName = userName;
}
@Override
public String getKey() {
return new StringBuilder(PREFERNCES_BASEKEY)
+ .append(SEPARATOR)
.append(platform)
.append(SEPARATOR)
.append(userName)
.toString();
}
+ private String stripScheme(String value) {
+ Matcher matcher = SCHEME_PATTERN.matcher(value);
+ if (matcher.find()
+ && matcher.groupCount() == 1) {
+ return matcher.group(1);
+ } else {
+ return value;
+ }
+ }
+
@Override
public boolean equals(IStorageKey key) {
if (!key.getClass().isAssignableFrom(OpenShiftPasswordStorageKey.class)) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/SecurePasswordStore.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/SecurePasswordStore.java 2012-05-08 15:03:30 UTC (rev 40853)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/SecurePasswordStore.java 2012-05-08 15:39:44 UTC (rev 40854)
@@ -11,7 +11,6 @@
package org.jboss.tools.openshift.express.internal.ui.utils;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import org.eclipse.equinox.security.storage.EncodingUtils;
import org.eclipse.equinox.security.storage.ISecurePreferences;
@@ -25,8 +24,6 @@
*/
public class SecurePasswordStore {
- private static final String ENCODING = "UTF-8";
-
public static interface IStorageKey {
public String getKey();
@@ -115,7 +112,6 @@
}
ISecurePreferences root = SecurePreferencesFactory.getDefault();
- String keyString = URLEncoder.encode(key.getKey(), ENCODING);
- return root.node(keyString);
+ return root.node(key.getKey());
}
}
12 years, 8 months
JBoss Tools SVN: r40853 - in trunk/openshift/plugins: org.jboss.tools.openshift.egit.core/META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-08 11:03:30 -0400 (Tue, 08 May 2012)
New Revision: 40853
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/module/
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/EGitCoreActivator.java
trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/src/org/jboss/tools/openshift/egit/ui/EGitUIActivator.java
Log:
JBIDE-11797
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2012-05-08 14:58:39 UTC (rev 40852)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/META-INF/MANIFEST.MF 2012-05-08 15:03:30 UTC (rev 40853)
@@ -17,5 +17,4 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Export-Package: org.jboss.tools.openshift.egit.core,
- org.jboss.tools.openshift.egit.core.internal,
- org.jboss.tools.openshift.egit.core.module
+ org.jboss.tools.openshift.egit.core.internal
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/plugin.xml 2012-05-08 14:58:39 UTC (rev 40852)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/plugin.xml 2012-05-08 15:03:30 UTC (rev 40853)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.wst.server.core.moduleTypes">
- <moduleType
- id="jbt.egit"
- name="Egit">
- </moduleType>
- </extension>
- <!--
- <extension
- point="org.eclipse.wst.server.core.moduleFactories">
- <moduleFactory
- class="org.jboss.ide.eclipse.as.egit.core.module.GitProjectModuleFactoryDelegate"
- id="org.jboss.ide.eclipse.as.egit.core.module.gitProjectModuleFactory"
- projects="true">
- <moduleType
- types="jbt.egit"
- versions="1.0">
- </moduleType>
- </moduleFactory>
- </extension>
- <extension
- point="org.jboss.ide.eclipse.as.core.publishMethod">
- <publishMethod
- class="org.jboss.ide.eclipse.as.egit.core.EgitPublishMethod"
- id="egit"
- name="Egit Publish Method"
- serverTypes="org.jboss.ide.eclipse.as.systemCopyServer">
- </publishMethod>
- </extension>
- <extension
- point="org.jboss.ide.eclipse.as.core.behaviourExtension">
- <behaviour
- behaviourDelegate="org.jboss.ide.eclipse.as.egit.core.EgitBehaviourDelegate"
- name="%EGitMethodName"
- publishMethod="org.jboss.ide.eclipse.as.egit.core.EgitPublishMethod"
- serverTypes="%ServerTypesJBoss7"
- typeId="egit">
- </behaviour>
- </extension>
- -->
-</plugin>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/EGitCoreActivator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/EGitCoreActivator.java 2012-05-08 14:58:39 UTC (rev 40852)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/internal/EGitCoreActivator.java 2012-05-08 15:03:30 UTC (rev 40853)
@@ -18,7 +18,7 @@
public class EGitCoreActivator implements BundleActivator {
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.egit.core";
+ public static final String PLUGIN_ID = "org.jboss.tools.openshift.egit.core";
private static BundleContext context;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/src/org/jboss/tools/openshift/egit/ui/EGitUIActivator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/src/org/jboss/tools/openshift/egit/ui/EGitUIActivator.java 2012-05-08 14:58:39 UTC (rev 40852)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.ui/src/org/jboss/tools/openshift/egit/ui/EGitUIActivator.java 2012-05-08 15:03:30 UTC (rev 40853)
@@ -9,7 +9,7 @@
public class EGitUIActivator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.egit.internal.ui"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.jboss.tools.openshift.egit.ui"; //$NON-NLS-1$
// The shared instance
private static EGitUIActivator plugin;
12 years, 8 months