JBoss Tools SVN: r41700 - branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-06-04 18:13:14 -0400 (Mon, 04 Jun 2012)
New Revision: 41700
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-12079 only report error if folder is not found and you need to deploy something
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-06-04 21:54:47 UTC (rev 41699)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-06-04 22:13:14 UTC (rev 41700)
@@ -62,22 +62,6 @@
OpenShiftUIActivator.PLUGIN_ID,
NLS.bind(ExpressMessages.publishFailMissingProject, behaviour.getServer().getName(), destProjName)));
}
-
- String destinationFolder = ExpressServerUtils.getExpressDeployFolder(behaviour.getServer());
- IContainer destFolder = "".equals(destinationFolder) ? magicProject : (IContainer)magicProject.findMember(new Path(destinationFolder));
- if( destFolder == null || !destFolder.isAccessible()) {
- StringBuffer missingPath = new StringBuffer("");
- if(destFolder==null) {
- missingPath.append(magicProject.getName());
- missingPath.append("/");
- missingPath.append(destinationFolder);
- } else {
- missingPath.append(destFolder.getName());
- }
- throw new CoreException(new Status(IStatus.ERROR,
- OpenShiftUIActivator.PLUGIN_ID,
- NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), missingPath)));
- }
}
@Override
@@ -135,6 +119,21 @@
String destinationFolder = ExpressServerUtils.getExpressDeployFolder(behaviour.getServer());
IContainer destFolder = "".equals(destinationFolder) ? destProj : (IContainer)destProj.findMember(new Path(destinationFolder));
+
+ if( destFolder == null || !destFolder.isAccessible()) {
+ StringBuffer missingPath = new StringBuffer("");
+ if(destFolder==null) {
+ missingPath.append(destProj.getName());
+ missingPath.append("/");
+ missingPath.append(destinationFolder);
+ } else {
+ missingPath.append(destFolder.getName());
+ }
+ throw new CoreException(new Status(IStatus.ERROR,
+ OpenShiftUIActivator.PLUGIN_ID,
+ NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), missingPath)));
+ }
+
IPath dest = destFolder.getLocation();
if( module.length == 0 ) return IServer.PUBLISH_STATE_NONE;
13 years, 4 months
JBoss Tools SVN: r41699 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-06-04 17:54:47 -0400 (Mon, 04 Jun 2012)
New Revision: 41699
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-12079 only report error if folder is not found and you need to deploy something
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-06-04 20:40:11 UTC (rev 41698)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-06-04 21:54:47 UTC (rev 41699)
@@ -62,22 +62,6 @@
OpenShiftUIActivator.PLUGIN_ID,
NLS.bind(ExpressMessages.publishFailMissingProject, behaviour.getServer().getName(), destProjName)));
}
-
- String destinationFolder = ExpressServerUtils.getExpressDeployFolder(behaviour.getServer());
- IContainer destFolder = "".equals(destinationFolder) ? magicProject : (IContainer)magicProject.findMember(new Path(destinationFolder));
- if( destFolder == null || !destFolder.isAccessible()) {
- StringBuffer missingPath = new StringBuffer("");
- if(destFolder==null) {
- missingPath.append(magicProject.getName());
- missingPath.append("/");
- missingPath.append(destinationFolder);
- } else {
- missingPath.append(destFolder.getName());
- }
- throw new CoreException(new Status(IStatus.ERROR,
- OpenShiftUIActivator.PLUGIN_ID,
- NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), missingPath)));
- }
}
@Override
@@ -135,6 +119,21 @@
String destinationFolder = ExpressServerUtils.getExpressDeployFolder(behaviour.getServer());
IContainer destFolder = "".equals(destinationFolder) ? destProj : (IContainer)destProj.findMember(new Path(destinationFolder));
+
+ if( destFolder == null || !destFolder.isAccessible()) {
+ StringBuffer missingPath = new StringBuffer("");
+ if(destFolder==null) {
+ missingPath.append(destProj.getName());
+ missingPath.append("/");
+ missingPath.append(destinationFolder);
+ } else {
+ missingPath.append(destFolder.getName());
+ }
+ throw new CoreException(new Status(IStatus.ERROR,
+ OpenShiftUIActivator.PLUGIN_ID,
+ NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), missingPath)));
+ }
+
IPath dest = destFolder.getLocation();
if( module.length == 0 ) return IServer.PUBLISH_STATE_NONE;
13 years, 4 months
JBoss Tools SVN: r41697 - branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-04 16:40:01 -0400 (Mon, 04 Jun 2012)
New Revision: 41697
Modified:
branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
JBDS-2189 remove jslint from Central
Modified: branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-06-04 20:39:57 UTC (rev 41696)
+++ branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-06-04 20:40:01 UTC (rev 41697)
@@ -328,7 +328,7 @@
url="http://findbugs.sourceforge.net/">
</overview>
</connectorDescriptor>
- <connectorDescriptor
+ <!-- JBDS-2189 remove <connectorDescriptor
categoryId="org.jboss.tools.central.discovery.testing"
groupId="org.jboss.tools.central.discovery.testing.local"
description="Tool support for JSLint"
@@ -349,7 +349,7 @@
<overview
url="http://www.jslint.com/">
</overview>
- </connectorDescriptor>
+ </connectorDescriptor> -->
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.testing"
groupId="org.jboss.tools.central.discovery.testing.local"
13 years, 4 months
JBoss Tools SVN: r41696 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-04 16:39:57 -0400 (Mon, 04 Jun 2012)
New Revision: 41696
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
JBDS-2189 remove jslint from Central
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-06-04 19:34:24 UTC (rev 41695)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-06-04 20:39:57 UTC (rev 41696)
@@ -328,7 +328,7 @@
url="http://findbugs.sourceforge.net/">
</overview>
</connectorDescriptor>
- <connectorDescriptor
+ <!-- JBDS-2189 remove <connectorDescriptor
categoryId="org.jboss.tools.central.discovery.testing"
groupId="org.jboss.tools.central.discovery.testing.local"
description="Tool support for JSLint"
@@ -349,7 +349,7 @@
<overview
url="http://www.jslint.com/">
</overview>
- </connectorDescriptor>
+ </connectorDescriptor> -->
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.testing"
groupId="org.jboss.tools.central.discovery.testing.local"
13 years, 4 months
JBoss Tools SVN: r41694 - trunk/download.jboss.org/jbosstools/updates/indigo/SR2.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-04 15:34:16 -0400 (Mon, 04 Jun 2012)
New Revision: 41694
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
Log:
add http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a... (JBDS-2188)
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-06-04 19:33:19 UTC (rev 41693)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-06-04 19:34:16 UTC (rev 41694)
@@ -3,9 +3,9 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1338490873000'/>
+<property name='p2.timestamp' value='1338838210000'/>
</properties>
-<children size='14'>
+<children size='15'>
<child location='../../requirements/indigo/201202240900-SR2/'/>
<child location='../../requirements/birt/3.7.2.v20120214/'/>
<child location='../../requirements/bpmn2-modeler/201202231559/'/>
@@ -18,8 +18,9 @@
<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
<child location='../../requirements/m2eclipse/20120531-1100/'/>
+<child location='../../requirements/m2eclipse/m2e-apt-1.0.0-2012-06-04_15-08-51-H14/'/>
+
<child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
-
<child location='../../requirements/orbit/R20120119162704/'/>
<child location='../../requirements/swtbot/2.0.5/'/>
<child location='../../requirements/webtools/3.3.2-20120210195245/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml 2012-06-04 19:33:19 UTC (rev 41693)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml 2012-06-04 19:34:16 UTC (rev 41694)
@@ -3,9 +3,9 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1338490883000'/>
+<property name='p2.timestamp' value='1338838210000'/>
</properties>
-<children size='14'>
+<children size='15'>
<child location='../../requirements/indigo/201202240900-SR2/'/>
<child location='../../requirements/birt/3.7.2.v20120214/'/>
<child location='../../requirements/bpmn2-modeler/201202231559/'/>
@@ -18,8 +18,9 @@
<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
<child location='../../requirements/m2eclipse/20120531-1100/'/>
+<child location='../../requirements/m2eclipse/m2e-apt-1.0.0-2012-06-04_15-08-51-H14/'/>
+
<child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
-
<child location='../../requirements/orbit/R20120119162704/'/>
<child location='../../requirements/swtbot/2.0.5/'/>
<child location='../../requirements/webtools/3.3.2-20120210195245/'/>
13 years, 4 months
JBoss Tools SVN: r41692 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-06-04 15:08:18 -0400 (Mon, 04 Jun 2012)
New Revision: 41692
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/CocoaUIEnhancer.java
Log:
https://issues.jboss.org/browse/JBIDE-12091 : Wrong properties of Mac Os menu - "SWT" instead of "BrowserSim"
- applied patch created by Ilya Buziuk with some minor changes
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-06-04 18:37:20 UTC (rev 41691)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-06-04 19:08:18 UTC (rev 41692)
@@ -89,6 +89,12 @@
private ResizableSkinSizeAdvisor sizeAdvisor;
public static void main(String[] args) {
+ //CocoaUIEnhancer handles connection between the About, Preferences and Quit menus in MAC OS X
+ CocoaUIEnhancer cocoaUIEnhancer = null;
+ if (PlatformUtil.OS_MACOSX.equals(PlatformUtil.getOs())) {
+ cocoaUIEnhancer = new CocoaUIEnhancer(Messages.BrowserSim_BROWSER_SIM);
+ cocoaUIEnhancer.initializeMacOSMenuBar();
+ }
String homeUrl;
if (args.length > 0) {
String lastArg = args[args.length - 1];
@@ -118,8 +124,8 @@
// set event handlers for Mac OS X Menu-bar
- if (PlatformUtil.OS_MACOSX.equals(PlatformUtil.getOs())) {
- browserSim.addMacOsMenuApplicationHandler();
+ if (cocoaUIEnhancer != null) {
+ browserSim.addMacOsMenuApplicationHandler(cocoaUIEnhancer);
}
@@ -785,8 +791,7 @@
}
- private void addMacOsMenuApplicationHandler() {
- CocoaUIEnhancer enhancer = new CocoaUIEnhancer(Messages.BrowserSim_BROWSER_SIM);
+ private void addMacOsMenuApplicationHandler(CocoaUIEnhancer enhancer) {
Listener quitListener = new Listener() {
@Override
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/CocoaUIEnhancer.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/CocoaUIEnhancer.java 2012-06-04 18:37:20 UTC (rev 41691)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/CocoaUIEnhancer.java 2012-06-04 19:08:18 UTC (rev 41692)
@@ -1,3 +1,11 @@
+/*******************************************************************************
+ * 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
+ *
+ * Initial implementation:
+ * http://www.transparentech.com/opensource/cocoauienhancer
+ ******************************************************************************/
package org.jboss.tools.vpe.browsersim.ui;
import java.lang.reflect.InvocationTargetException;
@@ -3,5 +11,4 @@
import java.lang.reflect.Method;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.internal.C;
@@ -53,6 +60,13 @@
public CocoaUIEnhancer( String appName ) {
this.appName = appName;
}
+ /**
+ * Must be invoked before a Display is created!
+ */
+ public void initializeMacOSMenuBar(){
+ System.setProperty("com.apple.mrj.application.apple.menu.about.name", appName);//$NON-NLS-1$
+
+ }
/**
* Hook the given Listener to the Mac OS X application Quit menu and the IActions to the About
@@ -167,9 +181,8 @@
invoke( nsmenuCls, appMenu, "itemAtIndex", new Object[] { wrapPointer( kAboutMenuItem ) } );
/* yradtsevich: The following lines in the original source are
- * replaced by the call of System.getProperty, which does the same job.
+ * replaced by the call of initializeMacOSMenuBar(), which does the same job.
* See https://issues.jboss.org/browse/JBIDE-11048 */
- System.setProperty("com.apple.mrj.application.apple.menu.about.name", appName);//$NON-NLS-1$
// if ( appName != null ) {
// Object nsStr = invoke( nsstringCls, "stringWith", new Object[] { "About " + appName } );
// invoke( nsmenuitemCls, aboutMenuItem, "setTitle", new Object[] { nsStr } );
13 years, 4 months
JBoss Tools SVN: r41691 - trunk/documentation/whatsnew/openshift.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-06-04 14:37:20 -0400 (Mon, 04 Jun 2012)
New Revision: 41691
Modified:
trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.CR1.html
Log:
[JBIDE-11950] writing N&N for openshift
Modified: trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.CR1.html 2012-06-04 18:19:06 UTC (rev 41690)
+++ trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.CR1.html 2012-06-04 18:37:20 UTC (rev 41691)
@@ -88,7 +88,10 @@
<b>Gears and scalable applications</b>
</td>
<td valign="top">
- OpenShift gears constrain the resources an application may consume.
+ OpenShift gears constrain the resources an application may consume. A small (standard) gear offers 512MB of RAM and 1GB of disk storage.
+ You may leverage more RAM and disk space by choosing a large gear. Standard user may currently only choose small gears though.
+ OpenShift may now also scale applications. It will then bundle several gears and offer even more resources to your application. JBoss Tools
+ now offers you both options at creation time. You may choose among available gears and enable scaling when you create your application.
<p><img src="images/gears-and-scaling.png" alt="gear and scaling"/></p>
<p>
<small>
13 years, 4 months