Author: yradtsevich Date: 2011-11-30 12:39:25 -0500 (Wed, 30 Nov 2011) New Revision: 36793 Modified: trunk/vpe/features/org.jboss.tools.vpe.browsersim.feature/ trunk/vpe/features/org.jboss.tools.vpe.browsersim.feature/pom.xml trunk/vpe/features/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/icons/sample.gif trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF trunk/vpe/plugins/pom.xml trunk/vpe/site/site.xml trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test/ Log: https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps - added BrowserSim plugins to the building process - added support of running plugins from jars - created new icons Property changes on: trunk/vpe/features/org.jboss.tools.vpe.browsersim.feature ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/vpe/features/org.jboss.tools.vpe.browsersim.feature/pom.xml =================================================================== --- trunk/vpe/features/org.jboss.tools.vpe.browsersim.feature/pom.xml 2011-11-30 17:27:02 UTC (rev 36792) +++ trunk/vpe/features/org.jboss.tools.vpe.browsersim.feature/pom.xml 2011-11-30 17:39:25 UTC (rev 36793) @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools.vpe.browsersim</groupId> + <groupId>org.jboss.tools.vpe</groupId> <artifactId>features</artifactId> <version>3.3.0-SNAPSHOT</version> </parent> Modified: trunk/vpe/features/pom.xml =================================================================== --- trunk/vpe/features/pom.xml 2011-11-30 17:27:02 UTC (rev 36792) +++ trunk/vpe/features/pom.xml 2011-11-30 17:39:25 UTC (rev 36793) @@ -15,5 +15,6 @@ <module>org.jboss.tools.vpe.feature</module> <module>org.jboss.tools.vpe.test.feature</module> <module>org.jboss.tools.xulrunner.feature</module> + <module>org.jboss.tools.vpe.browsersim.feature</module> </modules> </project> Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim ___________________________________________________________________ Modified: svn:ignore - bin + bin target Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF 2011-11-30 17:27:02 UTC (rev 36792) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF 2011-11-30 17:39:25 UTC (rev 36793) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: BrowserSim Bundle-SymbolicName: org.jboss.tools.vpe.browsersim;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.swt;bundle-version="3.7.0", org.jboss.tools.vpe.browsersim.browser;bundle-version="1.0.0" Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser ___________________________________________________________________ Modified: svn:ignore - bin + bin target Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2011-11-30 17:27:02 UTC (rev 36792) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2011-11-30 17:39:25 UTC (rev 36793) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: WebKit Bundle-SymbolicName: org.jboss.tools.vpe.browsersim.browser;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-ExtensibleAPI: true Export-Package: org.jboss.tools.vpe.browsersim.browser Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse ___________________________________________________________________ Modified: svn:ignore - bin + bin target Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2011-11-30 17:27:02 UTC (rev 36792) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2011-11-30 17:39:25 UTC (rev 36793) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: BrowserSim Eclipse Plug-in Bundle-SymbolicName: org.jboss.tools.vpe.browsersim.eclipse;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-Activator: org.jboss.tools.vpe.browsersim.eclipse.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/icons/sample.gif =================================================================== (Binary files differ) Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml 2011-11-30 17:27:02 UTC (rev 36792) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/plugin.xml 2011-11-30 17:39:25 UTC (rev 36793) @@ -20,7 +20,7 @@ class="org.jboss.tools.vpe.browsersim.eclipse.handlers.RunBrowserSimHandler"> </handler> </extension> - <extension + <!--extension point="org.eclipse.ui.bindings"> <key commandId="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim" @@ -28,7 +28,7 @@ sequence="M1+6" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"> </key> - </extension> + </extension--> <extension point="org.eclipse.ui.menus"> <menuContribution Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-30 17:27:02 UTC (rev 36792) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-30 17:39:25 UTC (rev 36793) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.browsersim.eclipse.util; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -26,8 +27,8 @@ public static void launchBrowserSim(String initialUrl) { String pathSeparator = System.getProperty("path.separator"); - String classPath = getBundleLocation("org.jboss.tools.vpe.browsersim") + "bin/" - + pathSeparator + getBundleLocation("org.jboss.tools.vpe.browsersim.browser") + "bin/" + String classPath = getBundleLocation("org.jboss.tools.vpe.browsersim") + + pathSeparator + getBundleLocation("org.jboss.tools.vpe.browsersim.browser") + pathSeparator + getBundleLocation("org.eclipse.swt") + pathSeparator + getBundleLocation("org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM); String javaCommand = System.getProperty("java.home") + "/bin/java"; @@ -86,9 +87,20 @@ private static String getBundleLocation(String symbolicName) { String locationId = Platform.getBundle(symbolicName).getLocation(); + File bundleLocation; if (locationId.startsWith("reference:file:")) { - return locationId.substring("reference:file:".length()); + bundleLocation = new File(locationId.substring("reference:file:".length())); + } else { + bundleLocation = new File(locationId); } - return locationId; + + if (bundleLocation.isDirectory()) { + File binDirectory = new File(bundleLocation, "bin"); + if (binDirectory.isDirectory()) { + bundleLocation = binDirectory; + } + } + + return bundleLocation.getAbsolutePath(); } } Modified: trunk/vpe/plugins/pom.xml =================================================================== --- trunk/vpe/plugins/pom.xml 2011-11-30 17:27:02 UTC (rev 36792) +++ trunk/vpe/plugins/pom.xml 2011-11-30 17:39:25 UTC (rev 36793) @@ -22,5 +22,8 @@ <module>org.jboss.tools.vpe.xulrunner</module> <module>org.jboss.tools.xulrunner</module> <module>org.jboss.tools.xulrunner.initializer</module> + <module>org.jboss.tools.vpe.browsersim.eclipse</module> + <module>org.jboss.tools.vpe.browsersim.browser</module> + <module>org.jboss.tools.vpe.browsersim</module> </modules> </project> Modified: trunk/vpe/site/site.xml =================================================================== --- trunk/vpe/site/site.xml 2011-11-30 17:27:02 UTC (rev 36792) +++ trunk/vpe/site/site.xml 2011-11-30 17:39:25 UTC (rev 36793) @@ -2,6 +2,7 @@ <site> <description>To install these features, point Eclipse at this site.</description> <!-- JBoss Tools vpe Nightly Build Update Site --> + <!--VPE--> <category-def label="JBoss Tools vpe Nightly Build Update Site" name="JBoss Tools vpe Nightly Build Update Site"> <description>JBoss Tools vpe Nightly Build Update Site: contains all features in this build.</description> </category-def> @@ -11,6 +12,14 @@ <feature url="features/org.jboss.tools.vpe.test.feature_0.0.0.jar" id="org.jboss.tools.vpe.test.feature" version="0.0.0"> <category name="JBoss Tools VPE Test Nightly Build Update Site"/> </feature> + + <!--BrowserSim--> + <feature url="features/org.jboss.tools.vpe.browsersim.feature_0.0.0.jar" id="org.jboss.tools.vpe.browsersim.feature" version="0.0.0"> + <category name="JBoss Tools vpe Nightly Build Update Site"/> + </feature> + <!--feature url="features/org.jboss.tools.vpe.test.feature_0.0.0.jar" id="org.jboss.tools.vpe.browsersim.test.feature" version="0.0.0"> + <category name="JBoss Tools BrowserSim Test Nightly Build Update Site"/> + </feature--> <!-- include but leave uncategorized --> <feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0"> Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.browsersim.browser.test ___________________________________________________________________ Modified: svn:ignore - bin + bin target