JBoss Tools SVN: r35662 - in branches/dead/hibernatetools-multiversion2/plugins: org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-10-14 10:23:25 -0400 (Fri, 14 Oct 2011)
New Revision: 35662
Modified:
branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java
branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/QueryExecutor.java
branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/QueryExecutor.java
Log:
Handle Throwable instead of Exception as incompatible libraries versions (when ConsoleConfiguration and user libraries has different versions) throw Exceptions which actually subclasses of Error
Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java
===================================================================
--- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-10-14 14:21:07 UTC (rev 35661)
+++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-10-14 14:23:25 UTC (rev 35662)
@@ -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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.hibernate3_5;
import java.net.URL;
@@ -24,6 +34,11 @@
import org.hibernate.console.preferences.PreferencesClassPathUtils;
import org.hibernate.eclipse.libs.FakeDelegatingDriver;
+/**
+ *
+ * @author Dmitry Geraskov
+ *
+ */
public class HibernateExtension3_5 implements HibernateExtension {
private ConsoleConfigClassLoader classLoader = null;
@@ -51,10 +66,14 @@
try {
try {
session = sessionFactory.openSession();
- } catch (Exception e){
+ return QueryExecutor.executeHQLQuery(session, hql, queryParameters);
+ } catch (Throwable e){
+ //Incompatible library versions could throw subclasses of Error, like AbstractMethodError
+ //may be there is a sense to say to user that the reason is probably a wrong CC version
+ //(when catch a subclass of Error)
return new QueryResultImpl(e);
}
- return QueryExecutor.executeHQLQuery(session, hql, queryParameters);
+
} finally {
if (session != null && session.isOpen()){
try {
@@ -73,10 +92,10 @@
try {
try {
session = sessionFactory.openSession();
+ return QueryExecutor.executeCriteriaQuery(session, criteriaCode, model);
} catch (Exception e){
return new QueryResultImpl(e);
}
- return QueryExecutor.executeCriteriaQuery(session, criteriaCode, model);
} finally {
if (session != null && session.isOpen()){
try {
Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/QueryExecutor.java
===================================================================
--- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/QueryExecutor.java 2011-10-14 14:21:07 UTC (rev 35661)
+++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/QueryExecutor.java 2011-10-14 14:23:25 UTC (rev 35662)
@@ -48,16 +48,15 @@
list = new ArrayList<Object>();
setupParameters(query, queryParameters);
long startTime = System.currentTimeMillis();
- Iterator<?> iter = query.list().iterator(); // need to be user-controllable to toggle between iterate, scroll etc.
- queryTime = System.currentTimeMillis() - startTime;
- while (iter.hasNext() ) {
- Object element = iter.next();
- list.add(element);
- }
-
QueryResultImpl result = new QueryResultImpl(list,
queryTime);
- try{
+ try {
+ Iterator<?> iter = query.list().iterator(); // need to be user-controllable to toggle between iterate, scroll etc.
+ queryTime = System.currentTimeMillis() - startTime;
+ while (iter.hasNext() ) {
+ Object element = iter.next();
+ list.add(element);
+ }
result.setPathNames(getHQLPathNames(query));
} catch (HibernateException e){
result.addException(e);
Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
===================================================================
--- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-10-14 14:21:07 UTC (rev 35661)
+++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-10-14 14:23:25 UTC (rev 35662)
@@ -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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.hibernate4_0;
import java.net.URL;
@@ -29,6 +39,11 @@
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
+/**
+ *
+ * @author Dmitry Geraskov
+ *
+ */
public class HibernateExtension4_0 implements HibernateExtension {
private ConsoleConfigClassLoader classLoader = null;
@@ -60,10 +75,13 @@
try {
try {
session = sessionFactory.openSession();
- } catch (Exception e){
+ return QueryExecutor.executeHQLQuery(session, hql, queryParameters);
+ } catch (Throwable e){
+ //Incompatible library versions could throw subclasses of Error, like AbstractMethodError
+ //may be there is a sense to say to user that the reason is probably a wrong CC version
+ //(when catch a subclass of Error)
return new QueryResultImpl(e);
}
- return QueryExecutor.executeHQLQuery(session, hql, queryParameters);
} finally {
if (session != null && session.isOpen()){
try {
@@ -82,10 +100,10 @@
try {
try {
session = sessionFactory.openSession();
+ return QueryExecutor.executeCriteriaQuery(session, criteriaCode, model);
} catch (Exception e){
return new QueryResultImpl(e);
}
- return QueryExecutor.executeCriteriaQuery(session, criteriaCode, model);
} finally {
if (session != null && session.isOpen()){
try {
Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/QueryExecutor.java
===================================================================
--- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/QueryExecutor.java 2011-10-14 14:21:07 UTC (rev 35661)
+++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/QueryExecutor.java 2011-10-14 14:23:25 UTC (rev 35662)
@@ -48,16 +48,15 @@
list = new ArrayList<Object>();
setupParameters(query, queryParameters);
long startTime = System.currentTimeMillis();
- Iterator<?> iter = query.list().iterator(); // need to be user-controllable to toggle between iterate, scroll etc.
- queryTime = System.currentTimeMillis() - startTime;
- while (iter.hasNext() ) {
- Object element = iter.next();
- list.add(element);
- }
-
QueryResultImpl result = new QueryResultImpl(list,
queryTime);
- try{
+ try {
+ Iterator<?> iter = query.list().iterator(); // need to be user-controllable to toggle between iterate, scroll etc.
+ queryTime = System.currentTimeMillis() - startTime;
+ while (iter.hasNext() ) {
+ Object element = iter.next();
+ list.add(element);
+ }
result.setPathNames(getHQLPathNames(query));
} catch (HibernateException e){
result.addException(e);
13 years, 3 months
JBoss Tools SVN: r35661 - in branches/dead/hibernatetools-multiversion2/plugins: org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-10-14 10:21:07 -0400 (Fri, 14 Oct 2011)
New Revision: 35661
Modified:
branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5Plugin.java
branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0Plugin.java
Log:
Added license
Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5Plugin.java
===================================================================
--- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5Plugin.java 2011-10-14 14:20:09 UTC (rev 35660)
+++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5Plugin.java 2011-10-14 14:21:07 UTC (rev 35661)
@@ -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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.hibernate3_5;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -4,6 +14,8 @@
import org.osgi.framework.BundleContext;
/**
+ *
+ * @author Dmitry Geraskov
* The activator class controls the plug-in life cycle
*/
public class HibernateExtension3_5Plugin extends AbstractUIPlugin {
Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0Plugin.java
===================================================================
--- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0Plugin.java 2011-10-14 14:20:09 UTC (rev 35660)
+++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0Plugin.java 2011-10-14 14:21:07 UTC (rev 35661)
@@ -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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.hibernate4_0;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -4,6 +14,7 @@
import org.osgi.framework.BundleContext;
/**
+ * @author Dmitry Geraskov
* The activator class controls the plug-in life cycle
*/
public class HibernateExtension4_0Plugin extends AbstractUIPlugin {
13 years, 3 months
JBoss Tools SVN: r35660 - branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-10-14 10:20:09 -0400 (Fri, 14 Oct 2011)
New Revision: 35660
Modified:
branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
Log:
Set hibernate version to some not existing value to force it initialization in case of ConsoleConfiguration has not the value set (backward compatibility)
Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
===================================================================
--- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2011-10-14 14:08:39 UTC (rev 35659)
+++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2011-10-14 14:20:09 UTC (rev 35660)
@@ -64,7 +64,7 @@
private SessionFactory sessionFactory;
//****************************** EXTENSION **********************
- private String hibernateVersion;
+ private String hibernateVersion = "==<None>=="; //set to some unused value //$NON-NLS-1$
private HibernateExtension extension;
13 years, 3 months
JBoss Tools SVN: r35659 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/publishers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-14 10:08:39 -0400 (Fri, 14 Oct 2011)
New Revision: 35659
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-9836 - add basic support for web fragments
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-14 13:53:20 UTC (rev 35658)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-14 14:08:39 UTC (rev 35659)
@@ -243,16 +243,17 @@
public static String getSuffix(String type) {
// TODO
// VirtualReferenceUtilities.INSTANCE. has utility methods to help!!
-
String suffix = null;
if( IWTPConstants.FACET_EAR.equals(type))
suffix = IWTPConstants.EXT_EAR;
else if( IWTPConstants.FACET_WEB.equals(type) || IWTPConstants.FACET_STATIC_WEB.equals(type))
suffix = IWTPConstants.EXT_WAR;
+ else if( IWTPConstants.FACET_WEB_FRAGMENT.equals(type))
+ suffix = IWTPConstants.EXT_JAR;
+ else if( IWTPConstants.FACET_UTILITY.equals(type))
+ suffix = IWTPConstants.EXT_JAR;
else if( IWTPConstants.FACET_CONNECTOR.equals(type))
suffix = IWTPConstants.EXT_RAR;
- else if( IWTPConstants.FACET_UTILITY.equals(type))
- suffix = IWTPConstants.EXT_JAR;
else if( IWTPConstants.FACET_ESB.equals(type))
suffix = IWTPConstants.EXT_ESB;
else if( "jboss.package".equals(type)) //$NON-NLS-1$
@@ -308,6 +309,8 @@
return true;
} else if( moduleTypeId.equals(IWTPConstants.FACET_APP_CLIENT)) {
return true;
+ } else if( moduleTypeId.equals(IWTPConstants.FACET_WEB_FRAGMENT)) {
+ return true;
}
return false;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2011-10-14 13:53:20 UTC (rev 35658)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2011-10-14 14:08:39 UTC (rev 35659)
@@ -16,6 +16,7 @@
public static final String FACET_JST_JAVA = "jst.java"; //$NON-NLS-1$
public static final String FACET_WEB = "jst.web";//$NON-NLS-1$
public static final String FACET_STATIC_WEB = "wst.web";//$NON-NLS-1$
+ public static final String FACET_WEB_FRAGMENT = "jst.webfragment"; //$NON-NLS-1$
public static final String FACET_EJB = "jst.ejb";//$NON-NLS-1$
public static final String FACET_EAR = "jst.ear";//$NON-NLS-1$
public static final String FACET_UTILITY = "jst.utility";//$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-10-14 13:53:20 UTC (rev 35658)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-10-14 14:08:39 UTC (rev 35659)
@@ -207,27 +207,13 @@
name="%jboss.version.32.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.32"
version="3.2">
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1"/>
- <moduleType
- types="jst.appclient"
- versions="5.0"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1"/>
+ <moduleType types="jst.appclient" versions="5.0"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
</runtimeType>
<runtimeType
vendor="%providerName"
@@ -236,42 +222,18 @@
name="%jboss.version.40.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.40"
version="4.0">
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4"/>
- <moduleType
- types="jst.appclient"
- versions="5.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4"/>
+ <moduleType types="jst.appclient" versions="5.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
</runtimeType>
<runtimeType
vendor="%providerName"
@@ -280,39 +242,17 @@
name="%jboss.version.42.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.42"
version="4.2">
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5"/>
- <moduleType
- types="jst.appclient"
- versions="5.0"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5"/>
+ <moduleType types="jst.appclient" versions="5.0"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4,4.5,4.6,4.7"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
</runtimeType>
<runtimeType
vendor="%providerName"
@@ -321,47 +261,19 @@
name="%jboss.version.50.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.50"
version="5.0">
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5"/>
- <moduleType
- types="jst.appclient"
- versions="5.0"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
- <moduleType
- types="jbt.bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="bpel.module"
- versions="1.1, 2.0">
- </moduleType>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5"/>
+ <moduleType types="jst.appclient" versions="5.0"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4,4.5,4.6,4.7"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
+ <moduleType types="jbt.bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="bpel.module" versions="1.1, 2.0"/>
</runtimeType>
<runtimeType
vendor="%providerName"
@@ -370,47 +282,19 @@
name="%jboss.version.51.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.51"
version="5.1">
- <moduleType
- types="jst.appclient"
- versions="5.0"/>
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
- <moduleType
- types="jbt.bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="bpel.module"
- versions="1.1, 2.0">
- </moduleType>
+ <moduleType types="jst.appclient" versions="5.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
+ <moduleType types="jbt.bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="bpel.module" versions="1.1, 2.0"/>
</runtimeType>
<runtimeType
vendor="%providerName"
@@ -419,47 +303,19 @@
name="%jboss.version.60.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.60"
version="6.0">
- <moduleType
- types="jst.appclient"
- versions="5.0, 6.0"/>
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0, 3.1"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0, 6.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5, 1.6"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
- <moduleType
- types="jbt.bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="bpel.module"
- versions="1.1, 2.0">
- </moduleType>
+ <moduleType types="jst.appclient" versions="5.0, 6.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0, 3.1"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0, 6.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5, 1.6"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
+ <moduleType types="jbt.bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="bpel.module" versions="1.1, 2.0"/>
</runtimeType>
@@ -470,52 +326,20 @@
name="%jboss.version.70.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.70"
version="7.0">
- <moduleType
- types="jst.appclient"
- versions="5.0, 6.0"/>
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0, 3.1"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0, 6.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5, 1.6"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
- <moduleType
- types="jbt.bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="jboss.osgi"
- versions="1.0">
- </moduleType>
-
+ <moduleType types="jst.appclient" versions="5.0, 6.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0, 3.1"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0, 6.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5, 1.6"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
+ <moduleType types="jbt.bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="jboss.osgi" versions="1.0"/>
</runtimeType>
@@ -526,39 +350,17 @@
name="%jboss.eap.version.43.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.eap.43"
version="4.3">
- <moduleType
- types="jst.appclient"
- versions="5.0"/>
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
+ <moduleType types="jst.appclient" versions="5.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4,4.5,4.6,4.7"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
</runtimeType>
<runtimeType
@@ -568,47 +370,19 @@
name="%jboss.eap.version.50.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.eap.50"
version="5.0">
- <moduleType
- types="jst.appclient"
- versions="5.0"/>
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
- <moduleType
- types="jbt.bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="bpel.module"
- versions="1.1, 2.0">
- </moduleType>
+ <moduleType types="jst.appclient" versions="5.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
+ <moduleType types="jbt.bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="bpel.module" versions="1.1, 2.0"/>
</runtimeType>
<runtimeType
@@ -618,51 +392,20 @@
name="%jboss.eap.version.60.runtime.name"
id="org.jboss.ide.eclipse.as.runtime.eap.60"
version="6.0">
- <moduleType
- types="jst.appclient"
- versions="5.0, 6.0"/>
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0, 3.1"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0, 6.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5, 1.6"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
- <moduleType
- types="jbt.bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="jboss.osgi"
- versions="1.0">
- </moduleType>
+ <moduleType types="jst.appclient" versions="5.0, 6.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0, 3.1"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0, 6.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5, 1.6"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
+ <moduleType types="jbt.bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="jboss.osgi" versions="1.0"/>
</runtimeType>
@@ -674,51 +417,20 @@
name="%deploy.runtime.name"
vendor="%basicProviderName"
version="1.0">
- <moduleType
- types="jst.appclient"
- versions="1.2,1.3,1.4,5.0,6.0"/>
- <moduleType
- types="wst.web"
- versions="1.0,1.2,1.3,1.4"/>
- <moduleType
- types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5,3.0"/>
- <moduleType
- types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0,3.1"/>
- <moduleType
- types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0,6.0"/>
- <moduleType
- types="jst.connector"
- versions="1.0, 1.5,1.6"/>
- <moduleType
- types="jst.utility"
- versions="1.0"/>
- <moduleType
- types="jboss.package"
- versions="1.0"/>
- <moduleType
- types="jboss.singlefile"
- versions="1.0"/>
- <moduleType
- types="jst.jboss.esb"
- versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
- <moduleType
- types="jst.jboss.sar"
- versions="1.0"/>
- <moduleType
- types="jbt.bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="jbt.bpel.module"
- versions="1.1, 2.0">
- </moduleType>
- <moduleType
- types="jbt.egit"
- versions="1.0">
- </moduleType>
+ <moduleType types="jst.appclient" versions="1.2,1.3,1.4,5.0,6.0"/>
+ <moduleType types="wst.web" versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5,3.0"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1, 3.0,3.1"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0,6.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5,1.6"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile" versions="1.0"/>
+ <moduleType types="jst.jboss.esb" versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
+ <moduleType types="jbt.bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="bpel.module" versions="1.1, 2.0"/>
+ <moduleType types="jbt.egit" versions="1.0"/>
</runtimeType>
</extension>
@@ -980,6 +692,7 @@
<facet id="jst.ejb" version="2.0,2.1,3.0,3.1"/>
<facet id="jst.ear" version="1.2,1.3,1.4,5.0,6.0"/>
<facet id="jst.appclient" version="1.2,1.3,1.4,5.0,6.0"/>
+ <facet id="jst.webfragment" version="3.0"/>
</supported>
</extension>
@@ -1105,6 +818,7 @@
<facet id="jst.ejb" version="2.0,2.1,3.0,3.1"/>
<facet id="jst.ear" version="1.2,1.3,1.4,5.0,6.0"/>
<facet id="jst.appclient" version="1.2,1.3,1.4,5.0,6.0"/>
+ <facet id="jst.webfragment" version="3.0"/>
</supported>
</extension>
13 years, 3 months
JBoss Tools SVN: r35658 - in trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central: model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-10-14 09:53:20 -0400 (Fri, 14 Oct 2011)
New Revision: 35658
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/NewsToolTip.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java
Log:
JBIDE-9838 minor fixes to make the date take up even less space.
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-10-14 13:33:29 UTC (rev 35657)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-10-14 13:53:20 UTC (rev 35658)
@@ -828,7 +828,7 @@
formText.setColor("author", JFaceColors.getHyperlinkText(getDisplay()));
formText.setImage("image", getNewsImage());
if (entry.getDescription() != null && !entry.getDescription().isEmpty()) {
- ToolTip toolTip = new NewsToolTip(formText, entry.getDescription());
+ ToolTip toolTip = new NewsToolTip(formText, entry.getDate() + " " + entry.getDescription());
toolTip.activate();
}
formText.addHyperlinkListener(new HyperlinkAdapter() {
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/NewsToolTip.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/NewsToolTip.java 2011-10-14 13:33:29 UTC (rev 35657)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/NewsToolTip.java 2011-10-14 13:53:20 UTC (rev 35658)
@@ -100,7 +100,7 @@
super(formText);
this.toolText = "<html>" +
"<head>" +
- "<title>Aggregated feed of all JBoss feeds</title>" +
+ "<title>JBoss</title>" +
"<style>" +
"html, body { font-size: 12px;font-family: Arial, Helvetica, sans-serif; }" +
"h1, h2, h3, h4, h5, h6 { font-size: 14px;font-weight:bold;font-family: Arial, Helvetica, sans-serif; }" +
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java 2011-10-14 13:33:29 UTC (rev 35657)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java 2011-10-14 13:53:20 UTC (rev 35658)
@@ -79,12 +79,12 @@
} else {
buffer.append(title);
}
- buffer.append("<br/>");
+ //buffer.append("<br/>");
boolean cr = false;
if (date != null) {
- buffer.append("<span font=\"default\">");
+ /*buffer.append("<span font=\"default\">");
buffer.append("posted ");
- buffer.append("</span>");
+ buffer.append("</span>");*/
buffer.append("<b>");
PrettyTime prettyTime = new PrettyTime(new Date());
buffer.append(" " + prettyTime.format(date));
13 years, 3 months
JBoss Tools SVN: r35657 - trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-10-14 09:33:29 -0400 (Fri, 14 Oct 2011)
New Revision: 35657
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
Log:
JBIDE-9913 NPE on start and publish of servers
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-10-14 12:21:15 UTC (rev 35656)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-10-14 13:33:29 UTC (rev 35657)
@@ -45,9 +45,12 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerUtil;
+import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBean;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
+import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
import org.jboss.tools.runtime.as.detector.IJBossRuntimePluginConstants;
import org.jboss.tools.runtime.as.detector.Messages;
import org.jboss.tools.runtime.as.detector.RuntimeAsActivator;
@@ -282,10 +285,15 @@
}
}
IServerType serverType = ServerCore.findServerType(JBOSS_AS_TYPE_ID[index]);
+
+ //IServer server = ServerCreationUtils.createServer2(runtime, serverType, name, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
IServerWorkingCopy server = serverType.createServer(null, null, runtime, progressMonitor);
+ server.setRuntime(runtime);
server.setHost(JBOSS_AS_HOST);
server.setName(name);
+ server.setServerConfiguration(null);
+ server.setAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
if (index != JBOSS_AS7_INDEX) {
// JBossServer.DEPLOY_DIRECTORY
13 years, 3 months
JBoss Tools SVN: r35656 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-14 08:21:15 -0400 (Fri, 14 Oct 2011)
New Revision: 35656
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-9913 - need to handle null-set behaviour mode as local
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-10-14 12:21:02 UTC (rev 35655)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-10-14 12:21:15 UTC (rev 35656)
@@ -169,11 +169,11 @@
}
public static IServer createServer(IRuntime runtime, String serverID) throws CoreException {
- return ServerCreationUtils.createServer2(runtime, serverID);
+ return ServerCreationUtils.createServer2(runtime, serverID, serverID, "openshift");
}
public static IServer createServer(IRuntime runtime, IServerType serverType, String serverName) throws CoreException {
- return ServerCreationUtils.createServer2(runtime, serverType, serverName);
+ return ServerCreationUtils.createServer2(runtime, serverType, serverName, "openshift");
}
}
13 years, 3 months
JBoss Tools SVN: r35655 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-14 08:21:02 -0400 (Fri, 14 Oct 2011)
New Revision: 35655
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-9913 - need to handle null-set behaviour mode as local
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java 2011-10-14 10:20:36 UTC (rev 35654)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java 2011-10-14 12:21:02 UTC (rev 35655)
@@ -15,11 +15,15 @@
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.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerUtil;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
@@ -37,13 +41,14 @@
for( Iterator<IJBossLaunchDelegate> i = getSetupParticipants(server).iterator(); i.hasNext(); ) {
i.next().setupLaunchConfiguration(workingCopy, server);
}
- }
+ }
protected IJBossLaunchDelegate getDelegate(ILaunchConfiguration configuration) throws CoreException {
IServer server = ServerUtil.getServer(configuration);
DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server);
- String currentMode = DeploymentPreferenceLoader.getCurrentDeploymentMethodTypeId(beh.getServer());
- //return getLaunchDelegates(server).get(currentMode);
+ String currentMode = DeploymentPreferenceLoader.getCurrentDeploymentMethodTypeId(beh.getServer(), LocalPublishMethod.LOCAL_PUBLISH_METHOD);
+ if( currentMode == null )
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server's mode (local/rse/etc) is unset or missing.")); //$NON-NLS-1$
return BehaviourModel.getModel().getLaunchDelegate(server, currentMode);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2011-10-14 10:20:36 UTC (rev 35654)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2011-10-14 12:21:02 UTC (rev 35655)
@@ -5,8 +5,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeType;
@@ -18,6 +16,7 @@
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy;
import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
@@ -66,14 +65,21 @@
IServerType serverType = ServerCore.findServerType(serverTypeId);
return createServer2(currentRuntime, serverType, serverName);
}
+ public static IServer createServer2(IRuntime currentRuntime, String serverTypeId, String serverName, String mode) throws CoreException {
+ IServerType serverType = ServerCore.findServerType(serverTypeId);
+ return createServer2(currentRuntime, serverType, serverName, mode);
+ }
-
public static IServer createServer2(IRuntime currentRuntime, IServerType serverType, String serverName) throws CoreException {
+ return createServer2(currentRuntime, serverType, serverName, "local"); //$NON-NLS-1$
+ }
+ public static IServer createServer2(IRuntime currentRuntime, IServerType serverType, String serverName, String mode) throws CoreException {
IServerWorkingCopy serverWC = serverType.createServer(null, null,
new NullProgressMonitor());
serverWC.setRuntime(currentRuntime);
serverWC.setName(serverName);
serverWC.setServerConfiguration(null);
+ serverWC.setAttribute(IDeployableServer.SERVER_MODE, mode);
return serverWC.save(true, new NullProgressMonitor());
}
13 years, 3 months
JBoss Tools SVN: r35654 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test: src/org/jboss/tools/ws/ui/bot/test/eap and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-10-14 06:20:36 -0400 (Fri, 14 Oct 2011)
New Revision: 35654
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.project
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
Log:
WS bot test correction + small workaround
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.project
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.project 2011-10-14 09:54:35 UTC (rev 35653)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.project 2011-10-14 10:20:36 UTC (rev 35654)
@@ -43,16 +43,4 @@
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
- <linkedResources>
- <link>
- <name>lib-src</name>
- <type>2</type>
- <location>/home/jjankovi/Dokumenty/Trunk-svn/trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src</location>
- </link>
- <link>
- <name>lib-src-1</name>
- <type>2</type>
- <location>/home/jjankovi/Dokumenty/Trunk-svn/trunk/tests/plugins/org.jboss.tools.tests/src</location>
- </link>
- </linkedResources>
</projectDescription>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-10-14 09:54:35 UTC (rev 35653)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromJavaTest.java 2011-10-14 10:20:36 UTC (rev 35654)
@@ -87,10 +87,6 @@
return "TestWSClientProject";
}
- protected String getClientEarProjectName() {
- return getWsClientProjectName() + "EAR";
- }
-
@Override
protected String getWsPackage() {
return "test.ws";
@@ -119,7 +115,7 @@
} catch (CoreException e) {
L.log(Level.WARNING, e.getMessage(), e);
}
- bot.sleep(500);
+ bot.sleep(TIME_500MS);
bottomUpJbossWebService(EAPFromJavaTest.class.getResourceAsStream("/resources/jbossws/Echo.java.ws"));
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(getWsProjectName());
IFile f = project.getFile("WebContent/WEB-INF/web.xml");
@@ -148,13 +144,14 @@
w.bot().textWithLabel("File name:").setText("index");
w.bot().textWithLabel("Enter or select the parent folder:").setText(getWsClientProjectName() + "/WebContent");
w.finish();
- bot.sleep(5000);
+ bot.sleep(TIME_5S);
bot.activeShell().bot().button("Skip").click();
- bot.sleep(5000);
+ bot.sleep(TIME_5S);
SWTBotEclipseEditor st = bot.editorByTitle("index.jsp").toTextEditor();
st.selectRange(0, 0, st.getText().length());
st.setText(readStream(EAPFromJavaTest.class.getResourceAsStream("/resources/jbossws/index.jsp.ws")));
st.saveAndClose();
+ bot.sleep(TIME_1S*2);
runProject(getWsClientProjectName());
String pageContent = getPage("http://localhost:8080/" + getWsClientProjectName() + "/index.jsp", 15000);
L.info(pageContent);
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-10-14 09:54:35 UTC (rev 35653)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-10-14 10:20:36 UTC (rev 35654)
@@ -122,6 +122,13 @@
.getProject(getWsProjectName());
IFile f = project.getFile("src/" + getWsPackage().replace(".", "/")
+ "/AreaServiceImpl.java");
+ /*
+ * workaround when package is not typed
+ */
+ if (f == null) {
+ f = project.getFile("src/" + "org.tempuri.areaservice"
+ + "/AreaServiceImpl.java");
+ }
String content = readFile(f);
Assert.assertNotNull(content);
Assert.assertTrue(content
@@ -244,7 +251,7 @@
}
}
if (!libraryFound)
- throw new Exception("No runtime library has been found");
+ throw new RuntimeException("No runtime library has been found");
}
private SWTBotMenu nodeContextMenu(final SWTBotTree tree,
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-10-14 09:54:35 UTC (rev 35653)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-10-14 10:20:36 UTC (rev 35654)
@@ -36,7 +36,6 @@
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.JavaEEEnterpriseApplicationProject;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.WebServicesWSDL;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.jboss.tools.ws.ui.bot.test.jbt.SampleWSTest;
import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewFileWizardAction;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.DynamicWebProjectWizard;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WebServiceClientWizard;
@@ -187,7 +186,7 @@
wsw.setClientSlider(Slider_Level.NO_CLIENT);
}
if (pkg != null && pkg.trim().length() > 0) {
- wsw.next();
+ wsw.next();
wsw.setPackageName(pkg);
}
wsw.finish();
13 years, 3 months
JBoss Tools SVN: r35653 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/icons.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-14 05:54:35 -0400 (Fri, 14 Oct 2011)
New Revision: 35653
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/icons/openshift-logo-white-icon.png
Log:
[JBIDE-9793] resized the icon to 16x16 (was: 32x32)
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/icons/openshift-logo-white-icon.png
===================================================================
(Binary files differ)
13 years, 3 months