JBoss Tools SVN: r38569 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-09 11:45:48 -0500 (Thu, 09 Feb 2012)
New Revision: 38569
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java
Log:
added class header and author
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java 2012-02-09 16:41:17 UTC (rev 38568)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java 2012-02-09 16:45:48 UTC (rev 38569)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.viewer;
import com.openshift.express.client.IUser;
@@ -2,2 +12,5 @@
+/**
+ * @author Xavier Coulon
+ */
public class OpenShiftExpressConsoleContentCategory {
14 years, 2 months
JBoss Tools SVN: r38568 - trunk/central/plugins/org.jboss.tools.community.central/src.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-09 11:41:17 -0500 (Thu, 09 Feb 2012)
New Revision: 38568
Added:
trunk/central/plugins/org.jboss.tools.community.central/src/.gitignore
Log:
add missing (empty) src folder
Added: trunk/central/plugins/org.jboss.tools.community.central/src/.gitignore
===================================================================
14 years, 2 months
JBoss Tools SVN: r38567 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-09 11:40:18 -0500 (Thu, 09 Feb 2012)
New Revision: 38567
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
Log:
added class header and author
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-09 16:29:31 UTC (rev 38566)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-09 16:40:18 UTC (rev 38567)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.viewer;
import java.util.ArrayList;
@@ -18,6 +28,10 @@
import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
+/**
+ * @author Xavier Coulon
+ *
+ */
public class OpenShiftExpressConsoleContentProvider implements ITreeContentProvider {
private StructuredViewer viewer;
14 years, 2 months
JBoss Tools SVN: r38566 - trunk/central/plugins/org.jboss.tools.community.central.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-02-09 11:29:31 -0500 (Thu, 09 Feb 2012)
New Revision: 38566
Added:
trunk/central/plugins/org.jboss.tools.community.central/src/
Modified:
trunk/central/plugins/org.jboss.tools.community.central/.classpath
Log:
added blank src to make PDE/tycho happy
Modified: trunk/central/plugins/org.jboss.tools.community.central/.classpath
===================================================================
--- trunk/central/plugins/org.jboss.tools.community.central/.classpath 2012-02-09 16:12:26 UTC (rev 38565)
+++ trunk/central/plugins/org.jboss.tools.community.central/.classpath 2012-02-09 16:29:31 UTC (rev 38566)
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
14 years, 2 months
JBoss Tools SVN: r38565 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/viewer and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-09 11:12:26 -0500 (Thu, 09 Feb 2012)
New Revision: 38565
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/systemprocess.gif
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
Log:
OPEN - issue JBIDE-10528: Improve OpenShift UI
https://issues.jboss.org/browse/JBIDE-10528
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/systemprocess.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/systemprocess.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-09 16:07:42 UTC (rev 38564)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-09 16:12:26 UTC (rev 38565)
@@ -107,16 +107,8 @@
// Get the actual children, with the delay
loadingUsers.add(user);
getChildrenFor(user, true);
-
loadedUsers.add(user);
loadingUsers.remove(user);
-
- // refresh the parent object in the viewer when finished
- try {
- Thread.sleep(10000);
- } catch(InterruptedException ie) {
-
- }
refreshViewerObject(user);
monitor.done();
return Status.OK_STATUS;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-02-09 16:07:42 UTC (rev 38564)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-02-09 16:12:26 UTC (rev 38565)
@@ -51,6 +51,10 @@
if (element instanceof IEmbeddableCartridge) {
return OpenShiftUIActivator.getDefault().createImage("task-repository.gif");
}
+ if( element instanceof LoadingStub) {
+ return OpenShiftUIActivator.getDefault().createImage("systemprocess.gif");
+ }
+
return null;
}
14 years, 2 months
JBoss Tools SVN: r38564 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-09 11:07:42 -0500 (Thu, 09 Feb 2012)
New Revision: 38564
Added:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
JBIDE-10798 : use a new shared example descriptor for Beta1
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-02-09 16:07:42 UTC (rev 38564)
@@ -0,0 +1,327 @@
+<projects>
+
+ <project>
+ <category>Java EE 6 Quickstarts</category>
+ <name>jboss-javaee6-webapp</name>
+ <included-projects>jboss-javaee6-webapp</included-projects>
+ <shortDescription>Java EE Web Project</shortDescription>
+ <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.
+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.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.702</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.16.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,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>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-javaee6-webapp-archetype</archetypeArtifactId>
+ <archetypeVersion>7.0.2.CR2</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>
+ <!-- Temporary EE6 project - replace with Pete's new archetype when it's ready -->
+ <project>
+ <category>Java EE 6 Quickstarts</category>
+ <name>multi-javaee6-archetype</name>
+ <included-projects>multi-javaee6-archetype</included-projects>
+ <shortDescription>Java EE Project</shortDescription>
+ <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.702</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.16.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>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-javaee6-webapp-ear-archetype</archetypeArtifactId>
+ <archetypeVersion>7.0.2.CR2</archetypeVersion>
+ <!--
+ <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>
+ <!-- Temporary POH5 project - replace with Pete's new archetype when it's ready -->
+ <project>
+ <category>Java EE 6 Quickstarts</category>
+ <name>jboss-javaee6-poh5-archetype</name>
+ <included-projects>jboss-javaee6-poh5</included-projects>
+ <shortDescription>HTML5 Project</shortDescription>
+ <description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss AS 7 / EAP 6</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.702</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.M1</archetypeVersion>
+ <!--
+ <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>Java EE 6 Quickstarts</category>
+ <name>richfaces-archetype-simpleapp</name>
+ <included-projects>richfaces-archetype-simpleapp</included-projects>
+ <shortDescription>RichFaces Project</shortDescription>
+ <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.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.702</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.16.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>jee6</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.richfaces.archetypes</archetypeGroupId>
+ <archetypeArtifactId>richfaces-archetype-simpleapp</archetypeArtifactId>
+ <archetypeVersion>4.1.0.Final</archetypeVersion>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</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-version" value="4.1.0.Final" />
+ </properties>
+ -->
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/rf_logo.png" />
+ </project>
+ <!-- Spring MVC -->
+ <project>
+ <category>Java EE 6 Quickstarts</category>
+ <name>spring-mvc-webapp</name>
+ <included-projects>spring-mvc-webapp</included-projects>
+ <shortDescription>Spring MVC Project</shortDescription>
+ <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.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.702</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.16.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>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spring.archetypes</archetypeGroupId>
+ <archetypeArtifactId>spring-mvc-webapp</archetypeArtifactId>
+ <archetypeVersion>1.0.0.CR2</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>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/spring_wiz.gif" />
+ </project>
+ <!--
+ <project>
+ <category>Java EE 6 Quickstarts</category>
+ <name>gwt-webapp</name>
+ <included-projects>gwt-webapp</included-projects>
+ <shortDescription>GWT Web Project</shortDescription>
+ <description>An archetype that generates a starter GWT application</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.702</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.16.0)</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</property>
+ <property name="versions">[2.5,)</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>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.errai.archetypes</archetypeGroupId>
+ <archetypeArtifactId>****</archetypeArtifactId>
+ <archetypeVersion>1.0.0-SNAPSHOT</archetypeVersion>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/snapshots/</archetypeRepository>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>gwt-helloworld</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.gwt.helloworld</javaPackage>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/new-gdt-project.png" />
+ </project>
+ -->
+</projects>
14 years, 2 months
JBoss Tools SVN: r38563 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-02-09 10:47:53 -0500 (Thu, 09 Feb 2012)
New Revision: 38563
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java
Log:
added timeout to nextWithWait
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-02-09 15:47:09 UTC (rev 38562)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-02-09 15:47:53 UTC (rev 38563)
@@ -49,7 +49,7 @@
public SWTBotWizard nextWithWait() {
SWTBotShell activeShell = getActiveShell();
next();
- bot().waitUntil(new ShellIsActiveCondition(activeShell));
+ bot().waitUntil(new ShellIsActiveCondition(activeShell), TaskDuration.LONG.getTimeout());
return this;
}
14 years, 2 months
JBoss Tools SVN: r38562 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-02-09 10:47:09 -0500 (Thu, 09 Feb 2012)
New Revision: 38562
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java
Log:
changed the normal duration
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java 2012-02-09 15:36:34 UTC (rev 38561)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java 2012-02-09 15:47:09 UTC (rev 38562)
@@ -1,7 +1,7 @@
package org.jboss.tools.ui.bot.ext.condition;
public enum TaskDuration {
- SHORT(1 * 1000), NORMAL(10 * 1000), LONG(1 * 60 * 1000), VERY_LONG(10 * 60 * 1000);
+ SHORT(10 * 1000), NORMAL(30 * 1000), LONG(1 * 60 * 1000), VERY_LONG(10 * 60 * 1000);
private long timeout;
14 years, 2 months
JBoss Tools SVN: r38561 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-09 10:36:34 -0500 (Thu, 09 Feb 2012)
New Revision: 38561
Removed:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/WaitWhileBuildingElement.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsLabelProvider.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateCategory.java
Log:
Fixed - https://issues.jboss.org/browse/JBIDE-10836
AssertionFailedException: null argument when updating project configuration
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java 2012-02-09 15:25:29 UTC (rev 38560)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java 2012-02-09 15:36:34 UTC (rev 38561)
@@ -19,10 +19,11 @@
import java.util.Map;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.internal.ui.util.CoreUtility;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.TreeViewer;
@@ -34,7 +35,6 @@
import org.jboss.tools.ws.jaxrs.core.pubsub.Subscriber;
import org.jboss.tools.ws.jaxrs.ui.internal.utils.Logger;
-@SuppressWarnings("restriction")
public class UriMappingsContentProvider implements ITreeContentProvider, Subscriber { // ,
private TreeViewer viewer;
@@ -49,32 +49,36 @@
}
@Override
+ public Object[] getElements(Object inputElement) {
+ return getChildren(inputElement);
+ }
+
+ @Override
public Object[] getChildren(final Object parentElement) {
if (parentElement instanceof IProject) {
+ final IProject project = (IProject) parentElement;
+ if(!uriPathTemplateCategories.containsKey(project)) {
+ UriPathTemplateCategory uriPathTemplateCategory = new UriPathTemplateCategory(this, project);
+ uriPathTemplateCategories.put(project, uriPathTemplateCategory);
+ }
+ Logger.debug("Displaying the UriPathTemplateCategory for project '{}'", project.getName());
+ return new Object[] { uriPathTemplateCategories.get(project) };
+ }
+ if (parentElement instanceof UriPathTemplateCategory) {
+
long startTime = new Date().getTime();
- final IProject project = (IProject) parentElement;
+ final UriPathTemplateCategory uriPathTemplateCategory = (UriPathTemplateCategory) parentElement;
+ final IProject project = uriPathTemplateCategory.getProject();
try {
- if (!uriPathTemplateCategories.containsKey(project)) {
- if (JaxrsMetamodelLocator.get(project) == null) {
- Logger.debug("JAX-RS Metamodel needs to be built for project '" + project.getName() + "'");
- Job buildJob = CoreUtility.getBuildJob(project);
- buildJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
- buildJob.schedule();
- Logger.debug("Displaying a temporary node in the viewer while the metamodel is being built...");
- //return new Object[] { new WaitWhileBuildingElement() };
- }
- else {
- // edge case: if the metamodel was built but no category was initialized yet.
- Logger.debug("Adding a UriPathTemplateCategory for project {} (case #2)", project.getName());
- UriPathTemplateCategory uriPathTemplateCategory = new UriPathTemplateCategory(this, project);
- uriPathTemplateCategories.put(project, uriPathTemplateCategory);
- }
+ if (JaxrsMetamodelLocator.get(project) == null) {
+ launchLoadingMetamodelJob(uriPathTemplateCategory);
+ // return a stub object that says loading...
+ Logger.debug("Displaying the 'Loading...' stub for project '{}'", project.getName());
+ return new Object[]{new LoadingStub()};
}
-
- Logger.debug("Displaying the UriPathTemplateCategory for project '{}'", project.getName());
- return new Object[] { uriPathTemplateCategories.get(project) };
- } catch (CoreException e) {
- Logger.error("Failed to retrieve JAX-RS Metamodel in project '" + project.getName() + "'", e);
+ return uriPathTemplateCategory.getChildren();
+ } catch(CoreException e) {
+ Logger.error("Failed to retrieve JAX-RS Metamodel for project '" + project.getName() + "'", e);
} finally {
long endTime = new Date().getTime();
Logger.debug("JAX-RS Metamodel UI for project '" + project.getName() + "' refreshed in "
@@ -85,10 +89,37 @@
return ((ITreeContentProvider) parentElement).getChildren(parentElement);
}
Logger.debug("*** No children for parent of type '{}' ***", parentElement.getClass().getName());
-
+
return null;
}
+ private void launchLoadingMetamodelJob(final UriPathTemplateCategory uriPathTemplateCategory) {
+ final IProject project = uriPathTemplateCategory.getProject();
+ Job job = new Job("Loading JAX-RS metamodel for project '" + project.getName() + "'...") {
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ monitor.beginTask("Loading JAX-RS metamodel for project '" + project.getName() + "'...",
+ IProgressMonitor.UNKNOWN);
+ monitor.worked(1);
+
+ refreshViewerObject(uriPathTemplateCategory);
+ monitor.done();
+ return Status.OK_STATUS;
+ }
+ };
+ job.setPriority(Job.LONG);
+ job.schedule();
+ }
+
+ private void refreshViewerObject(final Object object) {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ viewer.refresh(object);
+ }
+ });
+ }
+
@Override
public Object getParent(Object element) {
return null;
@@ -96,10 +127,9 @@
@Override
public boolean hasChildren(Object element) {
- if(element instanceof IProject) {
+ if (element instanceof IProject) {
return true;
- } else
- if (element instanceof ITreeContentProvider) {
+ } else if (element instanceof ITreeContentProvider) {
return ((ITreeContentProvider) element).hasChildren(element);
}
Logger.debug("Element {} has not children", element.getClass().getName());
@@ -107,11 +137,6 @@
}
@Override
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
this.viewer = (TreeViewer) viewer;
}
@@ -158,7 +183,8 @@
public void run() {
if (viewer != null) {
TreePath[] treePaths = viewer.getExpandedTreePaths();
- Logger.debug("*** Refreshing the viewer at target level: {} (viewer busy: {}) ***", target, viewer.isBusy());
+ Logger.debug("*** Refreshing the viewer at target level: {} (viewer busy: {}) ***", target,
+ viewer.isBusy());
viewer.refresh();
viewer.setExpandedTreePaths(treePaths);
Logger.debug("*** Refreshing the viewer... done ***");
@@ -176,5 +202,10 @@
public String getId() {
return "UI";
}
+
+ public static class LoadingStub {
+ public LoadingStub() {
+ }
+ }
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsLabelProvider.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsLabelProvider.java 2012-02-09 15:25:29 UTC (rev 38560)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsLabelProvider.java 2012-02-09 15:36:34 UTC (rev 38561)
@@ -22,6 +22,7 @@
import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsEndpoint;
import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsResourceMethod;
import org.jboss.tools.ws.jaxrs.ui.JBossJaxrsUIPlugin;
+import org.jboss.tools.ws.jaxrs.ui.cnf.UriMappingsContentProvider.LoadingStub;
import org.jboss.tools.ws.jaxrs.ui.internal.utils.Logger;
/** @author xcoulon */
@@ -53,9 +54,9 @@
}
} else if (element instanceof UriPathTemplateMethodMappingElement) {
return JBossJaxrsUIPlugin.getDefault().createImage("servlet_mapping.gif");
- } else if (element instanceof WaitWhileBuildingElement) {
+ } else if (element instanceof LoadingStub) {
return JBossJaxrsUIPlugin.getDefault().createImage("systemprocess.gif");
- }
+ }
return null;
}
@@ -163,8 +164,8 @@
.append("(...)");
return new StyledString(sb.toString());
}
- if (element instanceof WaitWhileBuildingElement) {
- String message = "Building RESTful Web Services...";
+ if (element instanceof LoadingStub) {
+ String message = "Loading...";
StyledString styledString = new StyledString(message);
styledString.setStyle(0, message.length(), StyledString.DECORATIONS_STYLER);
return new StyledString(message);
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateCategory.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateCategory.java 2012-02-09 15:25:29 UTC (rev 38560)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateCategory.java 2012-02-09 15:36:34 UTC (rev 38561)
@@ -74,6 +74,13 @@
return project;
}
+ /**
+ * @return the project
+ */
+ public final IProject getProject() {
+ return project;
+ }
+
@Override
public boolean hasChildren(Object element) {
try {
@@ -120,4 +127,8 @@
parent.refreshContent(project);
}
+ public Object[] getChildren() {
+ return getChildren(this);
+ }
+
}
Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/WaitWhileBuildingElement.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/WaitWhileBuildingElement.java 2012-02-09 15:25:29 UTC (rev 38560)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/WaitWhileBuildingElement.java 2012-02-09 15:36:34 UTC (rev 38561)
@@ -1,15 +0,0 @@
-/**
- *
- */
-package org.jboss.tools.ws.jaxrs.ui.cnf;
-
-
-/**
- * ElementKind displayed while the project's metamodel is built in background.
- *
- * @author xcoulon
- *
- */
-public class WaitWhileBuildingElement {
-
-}
14 years, 2 months
JBoss Tools SVN: r38560 - trunk/bpel/features/org.jboss.tools.bpel.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-09 10:25:29 -0500 (Thu, 09 Feb 2012)
New Revision: 38560
Modified:
trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml
Log:
add missing org.eclipse.bpel.common.feature to org.jboss.tools.bpel.feature/feature.xml
Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2012-02-09 15:23:04 UTC (rev 38559)
+++ trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2012-02-09 15:25:29 UTC (rev 38560)
@@ -61,6 +61,7 @@
</requires>
<includes id="org.eclipse.bpel.feature" version="0.8.0" match="compatible" />
+ <includes id="org.eclipse.bpel.common.feature" version="0.8.0" match="compatible" />
<includes id="org.eclipse.bpel.apache.ode.runtime.feature" version="0.8.0" match="compatible" />
<plugin id="org.jboss.tools.bpel.runtimes" download-size="0" install-size="0" version="0.0.0" unpack="false" />
14 years, 2 months