JBoss Tools SVN: r41413 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-05-25 07:58:40 -0400 (Fri, 25 May 2012)
New Revision: 41413
Added:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
JBIDE-11870 : use project-examples-shared-3.3.GA.xml or 3.3.0.GA
Added: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-05-25 11:58:40 UTC (rev 41413)
@@ -0,0 +1,360 @@
+<projects>
+ <!--
+ Beware : the project name MUST NOT be changed. It's referenced in JBoss Central
+ -->
+
+ <!-- Java EE Web Project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>jboss-javaee6-webapp</name>
+ <included-projects>jboss-javaee6-webapp</included-projects>
+ <shortDescription>Java EE Web Project</shortDescription>
+ <priority>1</priority>
+ <description>
+This is your project! It's a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss AS 7.1.
+This project is setup to allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0.
+It includes a persistence unit and some sample persistence and transaction code to help you get your feet wet with database access in enterprise Java.
+ </description>
+ <size>8192</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.13.1,0.17)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.13.1.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature,org.jboss.tools.maven.seam.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-javaee6-webapp-archetype</archetypeArtifactId>
+ <archetypeVersion>7.1.1-Beta1-JBT</archetypeVersion>
+
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+
+ <groupId>org.jboss.tools.examples</groupId>
+ <artifactId>jboss-javaee6-webapp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.examples</javaPackage>
+ <properties>
+ <property name="name" value="Java EE 6 webapp project"/>
+ </properties>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/newwebprj_wiz.gif" />
+ </project>
+ <!-- Java EE Project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>multi-javaee6-archetype</name>
+ <included-projects>multi-javaee6-archetype</included-projects>
+ <shortDescription>Java EE Project</shortDescription>
+ <priority>2</priority>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 / EAP 6. The project is an EAR, with an EJB-JAR and WAR</description>
+ <size>13806</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.13.1,0.17)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.13.1.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-javaee6-webapp-ear-archetype</archetypeArtifactId>
+ <archetypeVersion>7.1.1-Beta1-JBT</archetypeVersion>
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example</javaPackage>
+ </mavenArchetype>
+ <!--targetProjectFacet facet="jst.ear" version="6.0"/-->
+ <tags>wizard</tags>
+ <icon path="icons/ear-wiz-icon.gif" />
+ </project>
+ <!-- HTML5 project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>jboss-javaee6-poh5-archetype</name>
+ <included-projects>jboss-javaee6-poh5</included-projects>
+ <shortDescription>HTML5 Project</shortDescription>
+ <priority>3</priority>
+ <description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss AS 7.1 / EAP 6</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.13.1,0.15.0)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.13.1.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.aerogear.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-html5-mobile-archetype</archetypeArtifactId>
+ <archetypeVersion>1.0.0.M4</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>poh5</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.html5</javaPackage>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/html5.png" />
+ </project>
+ <!-- Richfaces project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>richfaces-archetype-simpleapp</name>
+ <included-projects>richfaces-archetype-simpleapp</included-projects>
+ <shortDescription>RichFaces Project</shortDescription>
+ <priority>4</priority>
+ <description>An archetype that generates a simple Richfaces application</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.13.1,0.17)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.13.1.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.richfaces.archetypes</archetypeGroupId>
+ <archetypeArtifactId>richfaces-archetype-kitchensink</archetypeArtifactId>
+ <archetypeVersion>4.2.2.Final-1</archetypeVersion>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ <!--
+ <archetypeRepository>https://repository.jboss.org/nexus/content/repositories/jboss_releases_st...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/snapshots/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>richfaces-webapp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.richfaces</javaPackage>
+ <properties>
+ <property name="richfaces-enterprise-version" value="4.2.1.Final" /> <!-- RF is broken in WFK / WFK repo not available-->
+ <property name="richfaces-version" value="4.2.2.Final" />
+ </properties>
+ </mavenArchetype>
+ <!--
+ <essentialEnterpriseDependencies>org.richfaces:richfaces-bom:pom:4.2.1.Final-redhat-1::,</essentialEnterpriseDependencies>
+ -->
+ <tags>wizard</tags>
+ <icon path="icons/rf_logo.png" />
+ </project>
+ <!-- Spring MVC -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>spring-mvc-webapp</name>
+ <included-projects>spring-mvc-webapp</included-projects>
+ <shortDescription>Spring MVC Project</shortDescription>
+ <priority>5</priority>
+ <description>An archetype that generates a starter Spring MVC application with Java EE persistence settings (server bootstrapped JPA, JTA transaction management) for JBoss AS7 / EAP 6</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.13.1,0.17)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.13.1.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spring.archetypes</archetypeGroupId>
+ <archetypeArtifactId>spring-mvc-webapp</archetypeArtifactId>
+ <archetypeVersion>1.0.0.CR5</archetypeVersion>
+ <!--
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>springmvc</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.springmvc</javaPackage>
+ <!--
+ <properties>
+ <property name="springBomVersion" value="2.0.0-redhat-5" />
+ </properties>
+ -->
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/spring_wiz.gif" />
+ </project>
+ <!-- GWT/Errai Project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>gwt-webapp</name>
+ <included-projects>gwt-kitchensink</included-projects>
+ <priority>6</priority>
+ <shortDescription>GWT Web Project</shortDescription>
+ <description>An archetype that generates a starter GWT application with Java EE 6 and Errai.
+
+Make sure you read the deployment instructions in README.md</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.15.1,0.17)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.15.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">com.google.gwt.eclipse.core</property>
+ <property name="versions">[2.4,)</property>
+ <property name="description">This project example requires Google Plugin for Eclipse</property>
+ <property name="connectorIds">com.google.gwt.eclipse.sdkbundle.e37.feature,com.google.gdt.eclipse.suite.e37.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2eclipse-wtp, JBoss Maven Integration and Google Plugin for Eclipse features.</importTypeDescription>
+ <!-- Activating the profile causes a build error :
+ 'dependencies.dependency.version' for org.jboss.as:jboss-as-arquillian-container-remote:jar is missing.
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ -->
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.errai.archetypes</archetypeGroupId>
+ <archetypeArtifactId>kitchensink-quickstart</archetypeArtifactId>
+ <archetypeVersion>2.0.0.Final-JBT</archetypeVersion>
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <!--
+ <archetypeRepository>https://repository.jboss.org/nexus/content/groups/public/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>gwt-kitchensink</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.gwt.kitchensink</javaPackage>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/new-gdt-project.png" />
+ </project>
+
+</projects>
12 years, 7 months
JBoss Tools SVN: r41412 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-05-25 07:09:45 -0400 (Fri, 25 May 2012)
New Revision: 41412
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
Log:
Extended ESB Bot tests to a 3-hour timeout - tests timed out last night
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-05-25 10:43:37 UTC (rev 41411)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-05-25 11:09:45 UTC (rev 41412)
@@ -29,7 +29,7 @@
<skip>${swtbot.test.skip}</skip>
<testSuite>org.jboss.tools.esb.ui.bot.test</testSuite>
<testClass>org.jboss.tools.esb.ui.bot.tests.ESBAllBotTests</testClass>
- <forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
+ <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds>
</configuration>
</plugin>
</plugins>
12 years, 7 months
JBoss Tools SVN: r41411 - trunk/bpel/features/org.jboss.tools.bpel.feature.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-05-25 06:43:37 -0400 (Fri, 25 May 2012)
New Revision: 41411
Modified:
trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml
Log:
[JBIDE-11536] Updated bpel version to 1.0
Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2012-05-25 10:35:34 UTC (rev 41410)
+++ trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2012-05-25 10:43:37 UTC (rev 41411)
@@ -59,8 +59,8 @@
<import plugin="org.eclipse.ui" version="3.4.0" match="compatible" />
<import plugin="org.eclipse.gef" version="3.4.0" match="compatible" />
<import feature="org.eclipse.bpel.feature" version="0.8.0" match="compatible" />
- <import feature="org.eclipse.bpel.common.feature" version="0.8.0" match="compatible" />
- <import feature="org.eclipse.bpel.apache.ode.runtime.feature" version="0.8.0" match="compatible" />
+ <import feature="org.eclipse.bpel.common.feature" version="1.0.0" match="compatible" />
+ <import feature="org.eclipse.bpel.apache.ode.runtime.feature" version="1.0.0" match="compatible" />
</requires>
<plugin id="org.jboss.tools.bpel.runtimes" download-size="0" install-size="0" version="0.0.0" unpack="false" />
12 years, 7 months
JBoss Tools SVN: r41409 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-25 06:07:23 -0400 (Fri, 25 May 2012)
New Revision: 41409
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
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/util/ServerUtil.java
Log:
JBIDE-11626 to trunk / cr1
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2012-05-25 09:51:28 UTC (rev 41408)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2012-05-25 10:07:23 UTC (rev 41409)
@@ -30,6 +30,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
public class WebPortPoller implements IServerStatePoller2 {
@@ -73,7 +74,10 @@
}
private static String getURL(IServer server) {
- String url = "http://"+server.getHost(); //$NON-NLS-1$
+ String host = server.getHost();
+ // v6_safe
+ String host2 = ServerUtil.formatPossibleIpv6Address(server.getHost());
+ String url = "http://"+host2; //$NON-NLS-1$
JBossServer jbs = ServerConverter.getJBossServer(server);
int port = jbs.getJBossWebPort();
url += ":" + port; //$NON-NLS-1$
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-25 09:51:28 UTC (rev 41408)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2012-05-25 10:07:23 UTC (rev 41409)
@@ -201,9 +201,10 @@
return null;
IWebModule webModule =(IWebModule)module.loadAdapter(IWebModule.class,null);
- String url = host;
+ String host2 = ServerUtil.formatPossibleIpv6Address(host);
+ String url = host2;
if( !url.startsWith("http://") && !url.startsWith("https://") ) { //$NON-NLS-1$ //$NON-NLS-2$
- url = "http://"+host; //$NON-NLS-1$
+ url = "http://"+host2; //$NON-NLS-1$
}
if (port != 80)
url += ":" + port; //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-05-25 09:51:28 UTC (rev 41408)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-05-25 10:07:23 UTC (rev 41409)
@@ -220,5 +220,16 @@
String encoded = URLEncoder.encode(secureKey, "UTF-8"); //$NON-NLS-1$
return root.node(encoded);
}
-
+ public static String formatPossibleIpv6Address(String address) {
+ if (address == null) {
+ return address;
+ }
+ if (!address.contains(":")) { //$NON-NLS-1$
+ return address;
+ }
+ if (address.startsWith("[") && address.endsWith("]")) { //$NON-NLS-1$ //$NON-NLS-2$
+ return address;
+ }
+ return "[" + address + "]"; //$NON-NLS-1$//$NON-NLS-2$
+ }
}
12 years, 7 months
JBoss Tools SVN: r41408 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-05-25 05:51:28 -0400 (Fri, 25 May 2012)
New Revision: 41408
Modified:
trunk/build/aggregate/site/site.xml
Log:
JBIDE-11738 add maven.jdt / endorsed libraries configurator
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2012-05-25 09:39:27 UTC (rev 41407)
+++ trunk/build/aggregate/site/site.xml 2012-05-25 09:51:28 UTC (rev 41408)
@@ -195,6 +195,10 @@
<feature url="features/org.jboss.tools.maven.sourcelookup.feature_0.0.0.jar" id="org.jboss.tools.maven.sourcelookup.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="MavenTools" />
+ </feature>
+ <feature url="features/org.jboss.tools.maven.jdt.feature_0.0.0.jar" id="org.jboss.tools.maven.jdt.feature" version="0.0.0">
+ <category name="AbridgedTools" />
+ <category name="MavenTools" />
</feature>
<!-- only in JBT and JBDS Extras -->
<feature url="features/org.jboss.tools.maven.jbosspackaging.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0">
@@ -356,6 +360,9 @@
<feature url="features/org.jboss.tools.maven.jpa.feature.source_0.0.0.jar" id="org.jboss.tools.maven.jpa.feature.source" version="0.0.0">
<category name="AllSources" />
</feature>
+ <feature url="features/org.jboss.tools.maven.jdt.feature.source_0.0.0.jar" id="org.jboss.tools.maven.jdt.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
<feature url="features/org.jboss.tools.maven.profiles.feature.source_0.0.0.jar" id="org.jboss.tools.maven.profiles.feature.source" version="0.0.0">
<category name="AllSources" />
</feature>
12 years, 7 months
JBoss Tools SVN: r41407 - trunk/build/aggregate/soa-site/site.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-05-25 05:39:27 -0400 (Fri, 25 May 2012)
New Revision: 41407
Modified:
trunk/build/aggregate/soa-site/site/site.xml
Log:
[JBDS-2165] Fixed zest dependency
Modified: trunk/build/aggregate/soa-site/site/site.xml
===================================================================
--- trunk/build/aggregate/soa-site/site/site.xml 2012-05-25 09:35:40 UTC (rev 41406)
+++ trunk/build/aggregate/soa-site/site/site.xml 2012-05-25 09:39:27 UTC (rev 41407)
@@ -40,7 +40,7 @@
<category name="SOATools" />
</feature>
<!-- ESB requires zest -->
- <feature url="features/org.eclipse.zest_0.0.0.jar" id="org.eclipse.feature" version="0.0.0"/>
+ <feature url="features/org.eclipse.zest_0.0.0.jar" id="org.eclipse.zest" version="0.0.0"/>
<feature url="features/org.jboss.tools.bpel.feature_0.0.0.jar" id="org.jboss.tools.bpel.feature" version="0.0.0">
<category name="SOATools" />
12 years, 7 months
JBoss Tools SVN: r41406 - in trunk: openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-05-25 05:35:40 -0400 (Fri, 25 May 2012)
New Revision: 41406
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobResultFuture.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
[JBIDE-11314] refreshing user after monitor was cancelled, preventing wizard from closing if monitor was cancelled
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobResultFuture.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobResultFuture.java 2012-05-25 07:00:55 UTC (rev 41405)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobResultFuture.java 2012-05-25 09:35:40 UTC (rev 41406)
@@ -46,6 +46,7 @@
|| !isRunning(job)) {
cancelled.set(true);
job.cancel();
+ job.getThread().interrupt();
}
return isRunning(job);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java 2012-05-25 07:00:55 UTC (rev 41405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java 2012-05-25 09:35:40 UTC (rev 41406)
@@ -38,6 +38,8 @@
*/
public class CreateApplicationJob extends AbstractDelegatingMonitorJob {
+ public static final int CLOSE_WIZARD = 2;
+
private UserDelegate user;
private String name;
private ICartridge cartridge;
@@ -65,9 +67,11 @@
} catch (OpenShiftTimeoutException e) {
this.application = refreshAndCreateApplication(monitor);
}
+
if (application == null) {
- return OpenShiftUIActivator.createCancelStatus(NLS.bind(
- "User cancelled creation of application {0}", name));
+ int errorCode = monitor.isCanceled() ? CLOSE_WIZARD : 0;
+ return new Status(IStatus.CANCEL, OpenShiftUIActivator.PLUGIN_ID, errorCode,
+ NLS.bind("User cancelled creation of application {0}", name), null);
} else {
return Status.OK_STATUS;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-05-25 07:00:55 UTC (rev 41405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-05-25 09:35:40 UTC (rev 41406)
@@ -145,9 +145,11 @@
if (!success) {
IStatus status = createApplication();
- if (JobUtils.isCancel(status)) {
+ if (JobUtils.isCancel(status)
+ && CreateApplicationJob.CLOSE_WIZARD == status.getCode()) {
getContainer().getShell().close();
} else if (!JobUtils.isOk(status)) {
+ safeRefreshUser();
return false;
}
@@ -238,6 +240,14 @@
});
}
+ private void safeRefreshUser() {
+ try {
+ wizardModel.getUser().refresh();
+ } catch (OpenShiftException e) {
+ OpenShiftUIActivator.log(e);
+ }
+ }
+
/**
* A workspace job that will create a new project or enable the selected
* project to be used with OpenShift.
12 years, 7 months
JBoss Tools SVN: r41405 - in trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test: view and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-05-25 03:00:55 -0400 (Fri, 25 May 2012)
New Revision: 41405
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
Log:
fixed the problem with finding SWTBotTree
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-05-25 07:00:24 UTC (rev 41404)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-05-25 07:00:55 UTC (rev 41405)
@@ -83,7 +83,9 @@
public boolean itemExists(String... path) {
try {
SWTBotTreeItem ti = explorer;
+ explorer.collapse();
for (String pathItem : path) {
+ ti.expand();
ti = ti.getNode(pathItem);
}
return true;
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-05-25 07:00:24 UTC (rev 41404)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-05-25 07:00:55 UTC (rev 41405)
@@ -87,6 +87,7 @@
public boolean itemExists(String... path) {
try {
+ bot.tree(0).getTreeItem(path[0]).collapse();
TreeHelper.expandNode(bot, path);
return true;
} catch (WidgetNotFoundException exc) {
12 years, 7 months