JBoss Tools SVN: r36113 - workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2011-11-01 12:05:53 -0400 (Tue, 01 Nov 2011)
New Revision: 36113
Modified:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- BrowserSimLauncher adapted to run also on Mac OS X
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-01 15:50:40 UTC (rev 36112)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-01 16:05:53 UTC (rev 36113)
@@ -22,14 +22,22 @@
*/
public class BrowserSimLauncher {
public static void launchBrowserSim(String initialUrl) {
+ String pathSeparator = System.getProperty("path.separator");
+
String classPath = getBundleLocation("org.jboss.tools.browsersim") + "bin/"
- + ';' + getBundleLocation("org.jboss.tools.browsersim.webkit") + "bin/"
- + ';' + getBundleLocation("org.eclipse.swt")
- + ';' + getBundleLocation("org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM);
+ + pathSeparator + getBundleLocation("org.jboss.tools.browsersim.webkit") + "bin/"
+ + pathSeparator + getBundleLocation("org.eclipse.swt")
+ + pathSeparator + getBundleLocation("org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM);
String javaCommand = System.getProperty("java.home") + "/bin/java";
List<String> commandElements = new ArrayList<String>();
commandElements.add(javaCommand);
+ if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+ commandElements.add("-XstartOnFirstThread");
+ if (Platform.ARCH_X86.equals(Platform.getOSArch())) {
+ commandElements.add("-d32");
+ }
+ }
commandElements.add("-Dosgi.os=" + Platform.getOS());
commandElements.add("-Dosgi.arch=" + Platform.getOSArch());
if (Platform.getWS() != null) {
@@ -51,8 +59,8 @@
private static String getBundleLocation(String symbolicName) {
String locationId = Platform.getBundle(symbolicName).getLocation();
- if (locationId.startsWith("reference:file:/")) {
- return locationId.substring("reference:file:/".length());
+ if (locationId.startsWith("reference:file:")) {
+ return locationId.substring("reference:file:".length());
}
return locationId;
}
13 years, 1 month
JBoss Tools SVN: r36112 - in workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite: features and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2011-11-01 11:50:40 -0400 (Tue, 01 Nov 2011)
New Revision: 36112
Added:
workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/features/org.jboss.tools.maven.ee6.classpath.feature_1.0.1.201111011649.jar
workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath.ui_1.0.1.201111011649.jar
workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath_1.0.1.201111011649.jar
Removed:
workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/features/org.jboss.tools.maven.ee6.classpath.feature_1.0.1.201110311621.jar
workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath.ui_1.0.1.201110311621.jar
workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath_1.0.1.201110311621.jar
Modified:
workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/artifacts.jar
workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/content.jar
workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/site.xml
Log:
JBoss EE6 Classpath
Modified: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/features/org.jboss.tools.maven.ee6.classpath.feature_1.0.1.201110311621.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/features/org.jboss.tools.maven.ee6.classpath.feature_1.0.1.201111011649.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/features/org.jboss.tools.maven.ee6.classpath.feature_1.0.1.201111011649.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath.ui_1.0.1.201110311621.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath.ui_1.0.1.201111011649.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath.ui_1.0.1.201111011649.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath_1.0.1.201110311621.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath_1.0.1.201111011649.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/plugins/org.jboss.tools.maven.ee6.classpath_1.0.1.201111011649.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/site.xml 2011-11-01 15:31:13 UTC (rev 36111)
+++ workspace/snjeza/org.jboss.tools.maven.ee6.classpath.updatesite/site.xml 2011-11-01 15:50:40 UTC (rev 36112)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.maven.ee6.classpath.feature_1.0.1.201110311621.jar" id="org.jboss.tools.maven.ee6.classpath.feature" version="1.0.1.201110311621">
+ <feature url="features/org.jboss.tools.maven.ee6.classpath.feature_1.0.1.201111011649.jar" id="org.jboss.tools.maven.ee6.classpath.feature" version="1.0.1.201111011649">
<category name="org.jboss.tools.maven.ee6.classpath"/>
</feature>
<category-def name="org.jboss.tools.maven.ee6.classpath" label="EE6 Classpath Patch"/>
13 years, 1 month
JBoss Tools SVN: r36111 - in workspace/yradtsevich/browsersim/swt-webkit-browsersim: org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application and 8 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2011-11-01 11:31:13 -0400 (Tue, 01 Nov 2011)
New Revision: 36111
Added:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/editors/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/editors/BrowserSimEditorLauncher.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/RunBrowserSimHandler.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java
Removed:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/SampleHandler.java
Modified:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application/Application.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/MANIFEST.MF
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/plugin.xml
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/Activator.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/PlatformUtil.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86_64.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- added BrowserSimEditorLauncher to launch BrowserSim on selected html file
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-11-01 11:46:09 UTC (rev 36110)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -11,7 +11,10 @@
package org.jboss.tools.browsersim;
import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.eclipse.swt.SWT;
@@ -49,6 +52,7 @@
* @author Yahor Radtsevich (yradtsevich)
*/
public class BrowserSim implements Runnable {
+ private static final String DEFAULT_URL = "http://www.w3schools.com/js/tryit_view.asp?filename=try_nav_useragent";
private AbstractWebKitBrowser browser;
private Display display;
private Shell shell;
@@ -56,13 +60,28 @@
private Label statusLabel;
private ProgressBar progressBar;
private List<MenuItem> deviceMenuItems = new ArrayList<MenuItem>();
+ private String initialUrl;
public static void main(String[] args) {
- new BrowserSim(new Display()).run();
+ String initialUrl;
+ if (args.length > 0) {
+ String lastArg = args[args.length - 1];
+ try {
+ new URI(lastArg); // validate URL
+ initialUrl = lastArg;
+ } catch (URISyntaxException e) {
+ initialUrl = DEFAULT_URL;
+ }
+ } else {
+ initialUrl = DEFAULT_URL;
+ }
+
+ new BrowserSim(new Display(), initialUrl).run();
}
- public BrowserSim(Display display) {
+ public BrowserSim(Display display, String initialUrl) {
this.display = display;
+ this.initialUrl = initialUrl;
}
@Override
@@ -156,7 +175,7 @@
setDevice(DevicesManager.getInstance().getDevices().get(0));
}
shell.open();
- browser.setUrl("http://www.w3schools.com/js/tryit_view.asp?filename=try_nav_useragent");
+ browser.setUrl(initialUrl);
while (!shell.isDisposed()) {
if (!display.readAndDispatch())
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application/Application.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application/Application.java 2011-11-01 11:46:09 UTC (rev 36110)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.application/src/org/jboss/tools/browsersim/application/Application.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -24,7 +24,7 @@
@Override
public Object start(IApplicationContext context) throws Exception {
Display display = PlatformUI.createDisplay();
- new BrowserSim(display).run();
+ new BrowserSim(display, "http://www.w3schools.com/js/tryit_view.asp?filename=try_nav_useragent").run();
return IApplication.EXIT_OK;
}
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/MANIFEST.MF
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/MANIFEST.MF 2011-11-01 11:46:09 UTC (rev 36110)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/META-INF/MANIFEST.MF 2011-11-01 15:31:13 UTC (rev 36111)
@@ -6,6 +6,10 @@
Bundle-Activator: org.jboss.tools.browsersim.eclipse.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.jboss.tools.browsersim.webkit;bundle-version="1.0.0"
+ org.jboss.tools.browsersim.webkit;bundle-version="1.0.0",
+ org.eclipse.core.resources,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/plugin.xml
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/plugin.xml 2011-11-01 11:46:09 UTC (rev 36110)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/plugin.xml 2011-11-01 15:31:13 UTC (rev 36111)
@@ -1,30 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
-
<extension
point="org.eclipse.ui.commands">
<category
- name="Sample Category"
+ name="BrowserSim"
id="org.jboss.tools.browsersim.eclipse.commands.category">
</category>
<command
- name="Sample Command"
+ name="Run BrowserSim"
categoryId="org.jboss.tools.browsersim.eclipse.commands.category"
- id="org.jboss.tools.browsersim.eclipse.commands.sampleCommand">
+ id="org.jboss.tools.browsersim.eclipse.commands.runBrowserSim">
</command>
</extension>
<extension
point="org.eclipse.ui.handlers">
<handler
- commandId="org.jboss.tools.browsersim.eclipse.commands.sampleCommand"
- class="org.jboss.tools.browsersim.eclipse.handlers.SampleHandler">
+ commandId="org.jboss.tools.browsersim.eclipse.commands.runBrowserSim"
+ class="org.jboss.tools.browsersim.eclipse.handlers.RunBrowserSimHandler">
</handler>
</extension>
<extension
point="org.eclipse.ui.bindings">
<key
- commandId="org.jboss.tools.browsersim.eclipse.commands.sampleCommand"
+ commandId="org.jboss.tools.browsersim.eclipse.commands.runBrowserSim"
contextId="org.eclipse.ui.contexts.window"
sequence="M1+6"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
@@ -33,30 +32,26 @@
<extension
point="org.eclipse.ui.menus">
<menuContribution
- locationURI="menu:org.eclipse.ui.main.menu?after=additions">
- <menu
- label="Sample Menu"
- mnemonic="M"
- id="org.jboss.tools.browsersim.eclipse.menus.sampleMenu">
- <command
- commandId="org.jboss.tools.browsersim.eclipse.commands.sampleCommand"
- mnemonic="S"
- id="org.jboss.tools.browsersim.eclipse.menus.sampleCommand">
- </command>
- </menu>
- </menuContribution>
- <menuContribution
locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
<toolbar
id="org.jboss.tools.browsersim.eclipse.toolbars.sampleToolbar">
<command
- commandId="org.jboss.tools.browsersim.eclipse.commands.sampleCommand"
+ commandId="org.jboss.tools.browsersim.eclipse.commands.runBrowserSim"
icon="icons/sample.gif"
- tooltip="Say hello world"
- id="org.jboss.tools.browsersim.eclipse.toolbars.sampleCommand">
+ tooltip="Run BrowserSim"
+ id="org.jboss.tools.browsersim.eclipse.toolbars.runBrowserSim">
</command>
</toolbar>
</menuContribution>
</extension>
-
+ <extension
+ point="org.eclipse.ui.editors">
+ <editor
+ extensions="html"
+ icon="icons/sample.gif"
+ id="org.jboss.tools.browsersim.eclipse.editors.BrowserSimLauncher"
+ launcher="org.jboss.tools.browsersim.eclipse.editors.BrowserSimEditorLauncher"
+ name="BrowserSim">
+ </editor>
+ </extension>
</plugin>
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/Activator.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/Activator.java 2011-11-01 11:46:09 UTC (rev 36110)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/Activator.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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.browsersim.eclipse;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -6,6 +16,8 @@
/**
* The activator class controls the plug-in life cycle
+ *
+ * @author "Yahor Radtsevich (yradtsevich)"
*/
public class Activator extends AbstractUIPlugin {
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/editors/BrowserSimEditorLauncher.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/editors/BrowserSimEditorLauncher.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/editors/BrowserSimEditorLauncher.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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.browsersim.eclipse.editors;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.ui.IEditorLauncher;
+import org.jboss.tools.browsersim.eclipse.util.BrowserSimLauncher;
+
+/**
+ * @author "Yahor Radtsevich (yradtsevich)"
+ */
+public class BrowserSimEditorLauncher implements IEditorLauncher {
+
+ @Override
+ public void open(IPath file) {
+ BrowserSimLauncher.launchBrowserSim(file.toFile().toURI().toASCIIString()); // XXX: NPE
+ }
+}
Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/RunBrowserSimHandler.java (from rev 36082, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/SampleHandler.java)
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/RunBrowserSimHandler.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/RunBrowserSimHandler.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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.browsersim.eclipse.handlers;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.jboss.tools.browsersim.eclipse.util.BrowserSimLauncher;
+
+/**
+ * @author "Yahor Radtsevich (yradtsevich)"
+ */
+public class RunBrowserSimHandler extends AbstractHandler {
+ /**
+ * The constructor.
+ */
+ public RunBrowserSimHandler() {
+ }
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ BrowserSimLauncher.launchBrowserSim(null);
+ //Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event).getShell();
+ return null;
+ }
+}
Deleted: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/SampleHandler.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/SampleHandler.java 2011-11-01 11:46:09 UTC (rev 36110)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/handlers/SampleHandler.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -1,72 +0,0 @@
-package org.jboss.tools.browsersim.eclipse.handlers;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.jboss.tools.browsersim.webkit.PlatformUtil;
-
-/**
- * Our sample handler extends AbstractHandler, an IHandler base class.
- * @see org.eclipse.core.commands.IHandler
- * @see org.eclipse.core.commands.AbstractHandler
- */
-public class SampleHandler extends AbstractHandler {
- /**
- * The constructor.
- */
- public SampleHandler() {
- }
-
- /**
- * the command has been executed, so extract extract the needed information
- * from the application context.
- */
- public Object execute(ExecutionEvent event) throws ExecutionException {
- try {
- String classPath = getBundleLocation("org.jboss.tools.browsersim") + "bin/"
- + ';' + getBundleLocation("org.jboss.tools.browsersim.webkit") + "bin/"
- + ';' + getBundleLocation("org.eclipse.swt")
- + ';' + getBundleLocation("org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM);
- String javaCommand = System.getProperty("java.home") + "/bin/java";
-
- List<String> commandElements = new ArrayList<String>();
- commandElements.add(javaCommand);
- commandElements.add("-Dosgi.os=" + Platform.getOS());
- commandElements.add("-Dosgi.arch=" + Platform.getOSArch());
- if (Platform.getWS() != null) {
- commandElements.add("-Dosgi.ws=" + Platform.getWS());
- }
- commandElements.add("-cp");
- commandElements.add(classPath);
- commandElements.add("org.jboss.tools.browsersim.BrowserSim");
-
- Process child = Runtime.getRuntime().exec(commandElements.toArray(new String[0]));
-
- } catch (Throwable e) {
- e.printStackTrace();
- }
- //Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event).getShell();
- return null;
- }
-
- private String getBundleLocation(String symbolicName) {
- String locationId = Platform.getBundle(symbolicName).getLocation();
- if (locationId.startsWith("reference:file:/")) {
- return locationId.substring("reference:file:/".length());
- }
- return locationId;
- }
-}
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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.browsersim.eclipse.util;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.browsersim.webkit.PlatformUtil;
+
+/**
+ * @author "Yahor Radtsevich (yradtsevich)"
+ */
+public class BrowserSimLauncher {
+ public static void launchBrowserSim(String initialUrl) {
+ String classPath = getBundleLocation("org.jboss.tools.browsersim") + "bin/"
+ + ';' + getBundleLocation("org.jboss.tools.browsersim.webkit") + "bin/"
+ + ';' + getBundleLocation("org.eclipse.swt")
+ + ';' + getBundleLocation("org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM);
+ String javaCommand = System.getProperty("java.home") + "/bin/java";
+
+ List<String> commandElements = new ArrayList<String>();
+ commandElements.add(javaCommand);
+ commandElements.add("-Dosgi.os=" + Platform.getOS());
+ commandElements.add("-Dosgi.arch=" + Platform.getOSArch());
+ if (Platform.getWS() != null) {
+ commandElements.add("-Dosgi.ws=" + Platform.getWS());
+ }
+ commandElements.add("-cp");
+ commandElements.add(classPath);
+ commandElements.add("org.jboss.tools.browsersim.BrowserSim");
+ if (initialUrl != null) {
+ commandElements.add(initialUrl);
+ }
+
+ try {
+ Process child = Runtime.getRuntime().exec(commandElements.toArray(new String[0]));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private static String getBundleLocation(String symbolicName) {
+ String locationId = Platform.getBundle(symbolicName).getLocation();
+ if (locationId.startsWith("reference:file:/")) {
+ return locationId.substring("reference:file:/".length());
+ }
+ return locationId;
+ }
+}
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/PlatformUtil.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/PlatformUtil.java 2011-11-01 11:46:09 UTC (rev 36110)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/PlatformUtil.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -18,7 +18,6 @@
public static final String CURRENT_PLATFORM;
static {
String ws = System.getProperty("osgi.ws");
- System.out.println(ws);
ws = (ws == null) ? "" : ws;
String os = System.getProperty("osgi.os");
os = (os == null) ? "" : os;
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java 2011-11-01 11:46:09 UTC (rev 36110)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -71,6 +71,7 @@
}
}
+ // this.webBrowser.webView
private int /*long*/ getThis_webBrowser_webView() throws NoSuchFieldException,
IllegalAccessException {
Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86_64.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86_64.java 2011-11-01 11:46:09 UTC (rev 36110)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/internal/WebKitBrowser_gtk_linux_x86_64.java 2011-11-01 15:31:13 UTC (rev 36111)
@@ -71,6 +71,7 @@
}
}
+ // this.webBrowser.webView
private long getThis_webBrowser_webView() throws NoSuchFieldException,
IllegalAccessException {
Field webBrowserField = Browser.class.getDeclaredField("webBrowser");
13 years, 1 month
JBoss Tools SVN: r36110 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context: java and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2011-11-01 07:46:09 -0400 (Tue, 01 Nov 2011)
New Revision: 36110
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscriminatorColumnImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTableImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondaryTableImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.java
Log:
https://issues.jboss.org/browse/JBIDE-10077
NPEs when try to create some error markers
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010-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,
@@ -76,7 +76,7 @@
targetEntityName, targetTable.getName(), propName);
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, relationshipReference);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -63,7 +63,7 @@
return ns.columnName(getSpecifiedName());
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
@@ -82,7 +82,7 @@
return ns.propertyToColumnName(super.buildDefaultName());
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
@@ -108,7 +108,7 @@
return ns.tableName(getSpecifiedTable());
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscriminatorColumnImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscriminatorColumnImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscriminatorColumnImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -65,7 +65,7 @@
return ns.columnName(getSpecifiedName());
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009-2010 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -252,7 +252,7 @@
return name ;
} catch (Exception e) {
IMessage m =HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -101,7 +101,7 @@
return ns.columnName(getSpecifiedName());
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
@@ -134,7 +134,7 @@
return ns.columnName(this.specifiedReferencedColumnName);
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTableImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTableImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTableImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -64,7 +64,7 @@
return ns.tableName(getSpecifiedName());
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondaryTableImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondaryTableImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondaryTableImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -70,7 +70,7 @@
return ns.tableName(getSpecifiedName());
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -75,7 +75,7 @@
return ns.tableName(getSpecifiedName());
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
@@ -90,7 +90,7 @@
return ns.classToTableName(getDefaultName());
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -48,7 +48,7 @@
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(
IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -61,7 +61,7 @@
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(
IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
@@ -99,7 +99,7 @@
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(
IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -198,7 +198,7 @@
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(
IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION,null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -52,7 +52,7 @@
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(
IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -79,7 +79,7 @@
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(
IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
@@ -113,7 +113,7 @@
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(
IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -66,7 +66,7 @@
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(
IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.java 2011-11-01 10:51:47 UTC (rev 36109)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.java 2011-11-01 11:46:09 UTC (rev 36110)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
+ * Copyright (c) 2009-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,
@@ -109,7 +109,7 @@
} catch (Exception e) {
IMessage m = HibernateJpaValidationMessage.buildMessage(
IMessage.HIGH_SEVERITY,
- Messages.NAMING_STRATEGY_EXCEPTION, null);
+ Messages.NAMING_STRATEGY_EXCEPTION, this);
HibernateJptPlugin.logException(m.getText(), e);
}
}
13 years, 1 month
JBoss Tools SVN: r36109 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2011-11-01 06:51:47 -0400 (Tue, 01 Nov 2011)
New Revision: 36109
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsAnnotations.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsCore.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsJpa.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
Log:
https://issues.jboss.org/browse/JBIDE-10073
As the same result list is used we need to remember previous failures/errors counts
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsAnnotations.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsAnnotations.java 2011-11-01 10:22:03 UTC (rev 36108)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsAnnotations.java 2011-11-01 10:51:47 UTC (rev 36109)
@@ -73,11 +73,13 @@
assertTrue(useSelRes);
testProject.restartTestFolders();
executions = 0;
+ int prev_failCount = result.failureCount();
+ int prev_errCount = result.errorCount();
allTestsRunForProject();
if (Customization.USE_CONSOLE_OUTPUT) {
System.out.println("====================================================="); //$NON-NLS-1$
- System.out.print(result.errorCount() + ConsoleTestMessages.HibernateAllMappingTests_errors + " \t"); //$NON-NLS-1$
- System.out.print(result.failureCount() + ConsoleTestMessages.HibernateAllMappingTests_fails + "\t"); //$NON-NLS-1$
+ System.out.print(result.errorCount() - prev_errCount + ConsoleTestMessages.HibernateAllMappingTests_errors + " \t"); //$NON-NLS-1$
+ System.out.print(result.failureCount() - prev_failCount + ConsoleTestMessages.HibernateAllMappingTests_fails + "\t"); //$NON-NLS-1$
System.out.print((System.currentTimeMillis() - start_time) / 1000 + ConsoleTestMessages.HibernateAllMappingTests_seconds + "\t" ); //$NON-NLS-1$
System.out.println(executions + ConsoleTestMessages.HibernateAllMappingTests_packages_tested );
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsCore.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsCore.java 2011-11-01 10:22:03 UTC (rev 36108)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsCore.java 2011-11-01 10:51:47 UTC (rev 36109)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Copyright (c) 2007-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,
@@ -51,13 +51,15 @@
// 2) +++
testProject.restartTestFolders();
executions = 0;
+ int prev_failCount = result.failureCount();
+ int prev_errCount = result.errorCount();
while (testProject.setupNextTestFolder()) {
allTestsRunForProject();
}
if (Customization.USE_CONSOLE_OUTPUT) {
System.out.println("====================================================="); //$NON-NLS-1$
- System.out.print(result.errorCount() + ConsoleTestMessages.HibernateAllMappingTests_errors + " \t"); //$NON-NLS-1$
- System.out.print(result.failureCount() + ConsoleTestMessages.HibernateAllMappingTests_fails + "\t"); //$NON-NLS-1$
+ System.out.print(result.errorCount() - prev_errCount + ConsoleTestMessages.HibernateAllMappingTests_errors + " \t"); //$NON-NLS-1$
+ System.out.print(result.failureCount() - prev_failCount + ConsoleTestMessages.HibernateAllMappingTests_fails + "\t"); //$NON-NLS-1$
System.out.print((System.currentTimeMillis() - start_time) / 1000 + ConsoleTestMessages.HibernateAllMappingTests_seconds + "\t" ); //$NON-NLS-1$
System.out.println(executions + ConsoleTestMessages.HibernateAllMappingTests_packages_tested );
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsJpa.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsJpa.java 2011-11-01 10:22:03 UTC (rev 36108)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsJpa.java 2011-11-01 10:51:47 UTC (rev 36109)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Copyright (c) 2007-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,
@@ -67,11 +67,13 @@
assertTrue(useSelRes);
testProject.restartTestFolders();
executions = 0;
+ int prev_failCount = result.failureCount();
+ int prev_errCount = result.errorCount();
allTestsRunForProject();
if (Customization.USE_CONSOLE_OUTPUT) {
System.out.println("====================================================="); //$NON-NLS-1$
- System.out.print(result.errorCount() + ConsoleTestMessages.HibernateAllMappingTests_errors + " \t"); //$NON-NLS-1$
- System.out.print(result.failureCount() + ConsoleTestMessages.HibernateAllMappingTests_fails + "\t"); //$NON-NLS-1$
+ System.out.print(result.errorCount() - prev_failCount + ConsoleTestMessages.HibernateAllMappingTests_errors + " \t"); //$NON-NLS-1$
+ System.out.print(result.failureCount() - prev_errCount + ConsoleTestMessages.HibernateAllMappingTests_fails + "\t"); //$NON-NLS-1$
System.out.print((System.currentTimeMillis() - start_time) / 1000 + ConsoleTestMessages.HibernateAllMappingTests_seconds + "\t" ); //$NON-NLS-1$
System.out.println(executions + ConsoleTestMessages.HibernateAllMappingTests_packages_tested );
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2011-11-01 10:22:03 UTC (rev 36108)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2011-11-01 10:51:47 UTC (rev 36109)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-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,
@@ -76,6 +76,8 @@
if (!highlighted) {
String out = NLS.bind(ConsoleTestMessages.OpenMappingFileTest_highlighted_region_for_property_is_empty_package,
new Object[]{compositeProperty.getNodeName(), testPackage.getElementName()});
+ if (Customization.USE_CONSOLE_OUTPUT)
+ System.err.println(out);
fail(out);
}
Object[] compProperties = propertyWorkbenchAdapter.getChildren(compositeProperty);
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2011-11-01 10:22:03 UTC (rev 36108)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2011-11-01 10:51:47 UTC (rev 36109)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-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,
@@ -85,6 +85,8 @@
boolean highlighted = Utils.hasSelection(editor);
if (!highlighted) {
String out = NLS.bind(ConsoleTestMessages.OpenSourceFileTest_highlighted_region_for_is_empty, selection);
+ if (Customization.USE_CONSOLE_OUTPUT)
+ System.err.println(out);
fail(out);
}
} catch (PartInitException e) {
13 years, 1 month
JBoss Tools SVN: r36108 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui/actions and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-11-01 06:22:03 -0400 (Tue, 01 Nov 2011)
New Revision: 36108
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties
Log:
JBIDE-9995 - trunk - add messagebox for 'make deployable'
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-11-01 09:45:38 UTC (rev 36107)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-11-01 10:22:03 UTC (rev 36108)
@@ -54,7 +54,8 @@
org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.200",
org.jboss.ide.eclipse.as.wtp.core;bundle-version="2.3.0",
- org.eclipse.jst.common.project.facet.core;bundle-version="1.4.200"
+ org.eclipse.jst.common.project.facet.core;bundle-version="1.4.200",
+ org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.ide.eclipse.as.ui,
org.jboss.ide.eclipse.as.ui.dialogs,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2011-11-01 09:45:38 UTC (rev 36107)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2011-11-01 10:22:03 UTC (rev 36108)
@@ -22,8 +22,10 @@
package org.jboss.ide.eclipse.as.ui.actions;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -48,13 +50,17 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.PublishServerJob;
import org.eclipse.wst.server.ui.internal.ImageResource;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
@@ -135,7 +141,20 @@
IStructuredSelection sel2 = (IStructuredSelection)selection;
Object[] objs = sel2.toArray();
IModule[] modules = new IModule[objs.length];
+ HashSet<IProject> alreadyDeployable = new HashSet<IProject>();
for( int i = 0; i < objs.length; i++ ) {
+ IProject p = ((IResource)objs[i]).getProject();
+ IModule[] mods = ServerUtil.getModules(p);
+ if( mods != null && mods.length > 0 && ModuleCoreNature.isFlexibleProject(p))
+ alreadyDeployable.add(p);
+ }
+
+ if( alreadyDeployable.size() > 0 ) {
+ if( !showAreYouSureDialog(alreadyDeployable))
+ return;
+ }
+
+ for( int i = 0; i < objs.length; i++ ) {
SingleDeployableFactory.makeDeployable(((IResource)objs[i]).getFullPath());
modules[i] = SingleDeployableFactory.findModule(((IResource)objs[i]).getFullPath());
}
@@ -143,6 +162,23 @@
tryToPublish();
}
+ private boolean showAreYouSureDialog(HashSet<IProject> set) {
+ Iterator<IProject> i = set.iterator();
+ String projs = ""; //$NON-NLS-1$
+ while(i.hasNext())
+ projs += i.next().getName() + ", "; //$NON-NLS-1$
+ projs = projs.substring(0, projs.length() - 2);
+
+ int style = SWT.APPLICATION_MODAL | SWT.OK | SWT.CANCEL;
+ MessageBox messageBox = new MessageBox(Display.getCurrent().getActiveShell(), style);
+ messageBox.setText(ServerActionMessages.DeployActionMessageBoxTitle);
+ messageBox.setMessage(ServerActionMessages.DeployActionMessageBoxMsg);
+ if (messageBox.open() == SWT.OK) {
+ return true;
+ }
+ return false;
+ }
+
protected void makeUndeployable() {
IStructuredSelection sel2 = (IStructuredSelection)selection;
Object[] objs = sel2.toArray();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java 2011-11-01 09:45:38 UTC (rev 36107)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java 2011-11-01 10:22:03 UTC (rev 36108)
@@ -20,4 +20,6 @@
public static String CHANGE_TIME_STAMP_DEFAULT;
public static String ChangeTimeStampActionDelegate_cannot_unregister;
public static String ChangeTimeStampActionDelegate_could_not_register_project;
+ public static String DeployActionMessageBoxTitle;
+ public static String DeployActionMessageBoxMsg;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties 2011-11-01 09:45:38 UTC (rev 36107)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties 2011-11-01 10:22:03 UTC (rev 36108)
@@ -9,3 +9,5 @@
CHANGE_TIME_STAMP_DEFAULT=Restart Module
ChangeTimeStampActionDelegate_cannot_unregister=Cannot unregister project {0} from server {1}
ChangeTimeStampActionDelegate_could_not_register_project=Could not register project {0}
+DeployActionMessageBoxTitle=Really mark these resources as deployable?
+DeployActionMessageBoxMsg=The selection's enclosing projects are already able to be deployed to servers. Marking the selected resources as deployable may be neither necessary nor desired. \n\nYou may prefer to right-click the project and select \n "run as -> run on server"
13 years, 1 month
JBoss Tools SVN: r36107 - in trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src: jpa/springframework/samples/petclinic and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2011-11-01 05:45:38 -0400 (Tue, 01 Nov 2011)
New Revision: 36107
Removed:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Clinic.java
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/META-INF/orm.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/BaseSuperclass.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Owner.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Pet.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/TestIdClass.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Vet.java
Log:
https://issues.jboss.org/browse/JBIDE-10073
Fix compile errors in test mapping
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/META-INF/orm.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/META-INF/orm.xml 2011-11-01 02:23:36 UTC (rev 36106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/META-INF/orm.xml 2011-11-01 09:45:38 UTC (rev 36107)
@@ -15,15 +15,15 @@
<mapped-superclass class="BaseSuperclass" access="FIELD">
<attributes>
- <embedded-id name="embeddedId">
+ <embedded-id name="embeddedId" >
</embedded-id>
<!-- id name="simpleId">
<generated-value strategy="IDENTITY"/>
</id-->
</attributes>
</mapped-superclass>
-
- <mapped-superclass class="BaseEntity">
+
+ <mapped-superclass class="BaseEntity" access="FIELD">
<attributes>
<id name="id">
<generated-value strategy="IDENTITY"/>
@@ -50,17 +50,7 @@
</basic>
</attributes>
</mapped-superclass>
-
- <entity class="TestIdClass" access="FIELD">
- <attributes>
- <!-- id name="id">
- <generated-value strategy="IDENTITY"/>
- </id-->
- <embedded-id name="id">
- </embedded-id>
- </attributes>
- </entity>
-
+
<entity class="SuperOffspring" access="FIELD">
<table name="SUPEROFFSPRING"/>
<attributes>
@@ -69,7 +59,7 @@
</basic>
</attributes>
</entity>
-
+
<entity class="Vet">
<table name="VETS"/>
<attributes>
@@ -147,5 +137,12 @@
</many-to-one>
</attributes>
</entity>
+
+
+ <embeddable class="TestIdClass" access="FIELD">
+ <attributes>
+ <basic name="id"/>
+ </attributes>
+ </embeddable>
</entity-mappings>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/BaseSuperclass.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/BaseSuperclass.java 2011-11-01 02:23:36 UTC (rev 36106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/BaseSuperclass.java 2011-11-01 09:45:38 UTC (rev 36107)
@@ -8,15 +8,15 @@
public class BaseSuperclass {
@EmbeddedId
- protected Object embeddedId;
+ protected TestIdClass embeddedId;
//@Id
//protected Integer simpleId;
- public Object getTestId() {
+ public Object getEmbeddedId() {
return embeddedId;
}
- public void setTestId(Object embeddedId) {
+ public void setEmbeddedId(TestIdClass embeddedId) {
this.embeddedId = embeddedId;
}
Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Clinic.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Clinic.java 2011-11-01 02:23:36 UTC (rev 36106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Clinic.java 2011-11-01 09:45:38 UTC (rev 36107)
@@ -1,82 +0,0 @@
-package jpa.springframework.samples.petclinic;
-
-import java.util.Collection;
-
-import org.springframework.dao.DataAccessException;
-
-/**
- * The high-level PetClinic business interface.
- *
- * <p>This is basically a data access object.
- * PetClinic doesn't have a dedicated business facade.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Sam Brannen
- */
-public interface Clinic {
-
- /**
- * Retrieve all <code>Vet</code>s from the data store.
- * @return a <code>Collection</code> of <code>Vet</code>s
- */
- Collection<Vet> getVets() throws DataAccessException;
-
- /**
- * Retrieve all <code>PetType</code>s from the data store.
- * @return a <code>Collection</code> of <code>PetType</code>s
- */
- Collection<PetType> getPetTypes() throws DataAccessException;
-
- /**
- * Retrieve <code>Owner</code>s from the data store by last name,
- * returning all owners whose last name <i>starts</i> with the given name.
- * @param lastName Value to search for
- * @return a <code>Collection</code> of matching <code>Owner</code>s
- * (or an empty <code>Collection</code> if none found)
- */
- Collection<Owner> findOwners(String lastName) throws DataAccessException;
-
- /**
- * Retrieve an <code>Owner</code> from the data store by id.
- * @param id the id to search for
- * @return the <code>Owner</code> if found
- * @throws org.springframework.dao.DataRetrievalFailureException if not found
- */
- Owner loadOwner(int id) throws DataAccessException;
-
- /**
- * Retrieve a <code>Pet</code> from the data store by id.
- * @param id the id to search for
- * @return the <code>Pet</code> if found
- * @throws org.springframework.dao.DataRetrievalFailureException if not found
- */
- Pet loadPet(int id) throws DataAccessException;
-
- /**
- * Save an <code>Owner</code> to the data store, either inserting or updating it.
- * @param owner the <code>Owner</code> to save
- * @see BaseEntity#isNew
- */
- void storeOwner(Owner owner) throws DataAccessException;
-
- /**
- * Save a <code>Pet</code> to the data store, either inserting or updating it.
- * @param pet the <code>Pet</code> to save
- * @see BaseEntity#isNew
- */
- void storePet(Pet pet) throws DataAccessException;
-
- /**
- * Save a <code>Visit</code> to the data store, either inserting or updating it.
- * @param visit the <code>Visit</code> to save
- * @see BaseEntity#isNew
- */
- void storeVisit(Visit visit) throws DataAccessException;
-
- /**
- * Deletes a <code>Pet</code> from the data store.
- */
- void deletePet(int id) throws DataAccessException;
-
-}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Owner.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Owner.java 2011-11-01 02:23:36 UTC (rev 36106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Owner.java 2011-11-01 09:45:38 UTC (rev 36107)
@@ -5,11 +5,6 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
-import org.springframework.beans.support.MutableSortDefinition;
-import org.springframework.beans.support.PropertyComparator;
-import org.springframework.core.style.ToStringCreator;
-
/**
* Simple JavaBean domain object representing an owner.
*
@@ -65,7 +60,7 @@
public List<Pet> getPets() {
List<Pet> sortedPets = new ArrayList<Pet>(getPetsInternal());
- PropertyComparator.sort(sortedPets, new MutableSortDefinition("name", true, true));
+ //PropertyComparator.sort(sortedPets, new MutableSortDefinition("name", true, true));
return Collections.unmodifiableList(sortedPets);
}
@@ -104,24 +99,5 @@
return null;
}
- @Override
- public String toString() {
- return new ToStringCreator(this)
-
- .append("id", this.getId())
-
- .append("new", this.isNew())
-
- .append("lastName", this.getLastName())
-
- .append("firstName", this.getFirstName())
-
- .append("address", this.address)
-
- .append("city", this.city)
-
- .append("telephone", this.telephone)
-
- .toString();
- }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Pet.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Pet.java 2011-11-01 02:23:36 UTC (rev 36106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Pet.java 2011-11-01 09:45:38 UTC (rev 36107)
@@ -7,8 +7,6 @@
import java.util.List;
import java.util.Set;
-import org.springframework.beans.support.MutableSortDefinition;
-import org.springframework.beans.support.PropertyComparator;
/**
* Simple JavaBean business object representing a pet.
@@ -75,7 +73,7 @@
public List<Visit> getVisits() {
List<Visit> sortedVisits = new ArrayList<Visit>(getVisitsInternal());
- PropertyComparator.sort(sortedVisits, new MutableSortDefinition("date", false, false));
+ //PropertyComparator.sort(sortedVisits, new MutableSortDefinition("date", false, false));
return Collections.unmodifiableList(sortedVisits);
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/TestIdClass.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/TestIdClass.java 2011-11-01 02:23:36 UTC (rev 36106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/TestIdClass.java 2011-11-01 09:45:38 UTC (rev 36107)
@@ -1,24 +1,18 @@
package jpa.springframework.samples.petclinic;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import javax.persistence.*;
-@Entity
+@Embeddable
public class TestIdClass {
- //@Id
- //protected Integer id;
- @EmbeddedId
- protected Object id;
+ @Column
+ protected Integer id;
- //public Integer getId() {
- public Object getId() {
- return id;
+ public Integer getId() {
+ return this.id;
}
- //public void setId(Integer id) {
- public void setId(Object id) {
+ public void setId(Integer id) {
this.id = id;
}
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Vet.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Vet.java 2011-11-01 02:23:36 UTC (rev 36106)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/jpa/springframework/samples/petclinic/Vet.java 2011-11-01 09:45:38 UTC (rev 36107)
@@ -7,9 +7,6 @@
import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
-import org.springframework.beans.support.MutableSortDefinition;
-import org.springframework.beans.support.PropertyComparator;
-
/**
* Simple JavaBean domain object representing a veterinarian.
*
@@ -37,7 +34,7 @@
@XmlElement
public List<Specialty> getSpecialties() {
List<Specialty> sortedSpecs = new ArrayList<Specialty>(getSpecialtiesInternal());
- PropertyComparator.sort(sortedSpecs, new MutableSortDefinition("name", true, true));
+ //PropertyComparator.sort(sortedSpecs, new MutableSortDefinition("name", true, true));
return Collections.unmodifiableList(sortedSpecs);
}
13 years, 1 month
JBoss Tools SVN: r36106 - in trunk/build/aggregate: site and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-10-31 22:23:36 -0400 (Mon, 31 Oct 2011)
New Revision: 36106
Modified:
trunk/build/aggregate/bottests-site/site/build.xml
trunk/build/aggregate/bottests-site/site/index.html
trunk/build/aggregate/bottests-site/site/pom.xml
trunk/build/aggregate/bottests-site/site/site.xsl
trunk/build/aggregate/site/build.xml
trunk/build/aggregate/site/index.html
trunk/build/aggregate/site/jbosstools-directory.xml
trunk/build/aggregate/site/site.xsl
trunk/build/aggregate/soa-site/build.xml
trunk/build/aggregate/soa-site/index.html
trunk/build/aggregate/soa-site/site.xsl
trunk/build/aggregate/webtools-site/build.xml
trunk/build/aggregate/webtools-site/index.html
trunk/build/aggregate/webtools-site/pom.xml
trunk/build/aggregate/webtools-site/site.xsl
Log:
JBIDE-10047
Modified: trunk/build/aggregate/bottests-site/site/build.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/build.xml 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/bottests-site/site/build.xml 2011-11-01 02:23:36 UTC (rev 36106)
@@ -31,6 +31,8 @@
<property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" />
<property file="${aggregateSite.properties}" />
+ <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml"/>
+
<target name="init">
<ant antfile="${build.xml}" target="init" />
<taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -401,7 +403,7 @@
</target>
<target name="pack.zip">
- <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.* index.html, web/*.css, README*" />
+ <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.*, ${web.content.files}" />
</target>
<target name="check.target">
@@ -477,7 +479,7 @@
</copy>
<copy todir="${update.site.source.dir}">
- <fileset dir="${output.dir}" includes="index.html, **/*.css, README*" />
+ <fileset dir="${output.dir}" includes="${web.content.files}" />
</copy>
</target>
@@ -495,10 +497,17 @@
<!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch -->
- <target name="collect.zips" description="collect zips from the sites we aggregated">
+ <target name="collect.zips" description="collect zips from the sites we aggregated" unless="collect.zips.skip">
<property name="aggregate.zips.dir" value="${output.dir}/zips" />
<delete dir="${aggregate.zips.dir}" quiet="true" />
<mkdir dir="${aggregate.zips.dir}" />
+ <if>
+ <isset property="inputRepo" />
+ <then>
+ <var name="inputRepos" value="1" />
+ <var name="inputRepo1" value="${inputRepo}" />
+ </then>
+ </if>
<for list="${inputRepos}" delimiter=", " keepgoing="true" param="repoNum">
<sequential>
<var name="repo" value="${inputRepo@{repoNum}}" />
@@ -572,7 +581,7 @@
<target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums">
<property name="aggregate.zips.dir" value="${output.dir}/zips" />
-
+ <mkdir dir="${aggregate.zips.dir}"/>
<!-- load file properties (name, size, md5sum) -->
<if>
<available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" />
Modified: trunk/build/aggregate/bottests-site/site/index.html
===================================================================
--- trunk/build/aggregate/bottests-site/site/index.html 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/bottests-site/site/index.html 2011-11-01 02:23:36 UTC (rev 36106)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - Bot Tests - Nightly Build Update Site: 3.3_trunk.bottests.2011-12-12_19-10-45-H6970</title>
+<title>JBoss Tools - Bot Tests - Nightly Build Update Site</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -24,22 +24,50 @@
<h2 class="title">JBoss Tools - Bot Tests - Nightly Build Update Site</h2>
<table width="100%">
<tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build: 3.3_trunk.bottests.2011-12-12_19-10-45-H6970</span></td>
+ <td class="sub-header" width="100%"><span>Latest Build</span></td>
</tr>
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
- Update Site for JBoss Tools - Bot Tests. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
- </tr>
+ Update Site for JBoss Tools - Bot Tests.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
@@ -50,18 +78,8 @@
</ul>
</td>
</tr>
+ -->
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
</table>
</td>
<td>      </td>
@@ -69,7 +87,7 @@
<tr>
<td></td>
<td>
- <br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br><table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0">
+ <table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0">
<tr style="background-color:#DDDDDD">
<th style="font-size:small">Feature</th>
<th style="font-size:small">Version</th>
@@ -79,15 +97,15 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.bot.test.feature_3.1.0.v20110920-1309-H6970-M4.jar" style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td>
- <td><span style="font-size:x-small">3.1.0.v20110920-1309-H6970-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.bot.test.feature_3.1.0.v20111101-0205-Beta1.jar" style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td>
+ <td><span style="font-size:x-small">3.1.0.v20111101-0205-Beta1</span></td>
<td><span style="font-size:x-small">
|
JBoss Tools bot.tests Nightly Build Update Site</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.test.feature_3.2.0.v20110916-0001-M4.jar" style="font-size:x-small">org.jboss.tools.test.feature</a></td>
- <td><span style="font-size:x-small">3.2.0.v20110916-0001-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.test.feature_3.2.0.v20111101-0124-H459-Beta1.jar" style="font-size:x-small">org.jboss.tools.test.feature</a></td>
+ <td><span style="font-size:x-small">3.2.0.v20111101-0124-H459-Beta1</span></td>
<td><span style="font-size:x-small">
|
JBoss Tools bot.tests Nightly Build Update Site</span></td>
@@ -98,13 +116,17 @@
<th colspan="1" style="font-size:small"></th>
</tr>
<tr style="background-color:#EEEEEE">
- <td class="rowLine"><a href="site.xml" style="font-size:x-small">site.xml</a>
+ <td class="rowLine" colspan="1"><a href="site.xml" style="font-size:x-small">site.xml</a>
::
<a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
::
<a href="content.jar" style="font-size:x-small">content.jar</a></td>
- <td class="rowLine"></td>
- <td class="rowLine"></td>
+ <td class="rowLine" colspan="1">
+ ::
+ <a href="plugins/" style="font-size:x-small">plugins</a>
+ ::
+ <a href="features/" style="font-size:x-small">features</a></td>
+ <td class="rowLine" colspan="1"></td>
</tr>
</table><br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br>
</td>
Modified: trunk/build/aggregate/bottests-site/site/pom.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/pom.xml 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-11-01 02:23:36 UTC (rev 36106)
@@ -12,10 +12,6 @@
<name>JBoss Tools - Bot Tests Site</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
-
- <!-- to build against locally built sources, use: mvn clean install to build
- against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/,
- use: mvn clean install -Pjbosstools-nightly-staging-composite -->
<build>
<plugins>
<plugin>
@@ -31,6 +27,8 @@
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
<ant antfile="build.xml">
+ <property name="inputRepo"
+ value="${jbosstools-nightly-staging-composite}" />
<property name="JBT_VERSION" value="${JBT_VERSION}" />
<property name="BUILD_ALIAS" value="${BUILD_ALIAS}" />
</ant>
@@ -83,11 +81,9 @@
</build>
<repositories>
- <!-- add more inputRepo# here, ref'd above; need variables so that these
- can be referred to in Ant script later -->
<repository>
- <id>jbosstools-requirements-composite-mirror</id>
- <url>http://download.jboss.org/jbosstools/updates/indigo/SR1/</url>
+ <id>jbosstools-nightly-staging-composite</id>
+ <url>${jbosstools-nightly-staging-composite}</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -96,5 +92,16 @@
<enabled>true</enabled>
</releases>
</repository>
+ <repository>
+ <id>jboss-requirements-composite-mirror</id>
+ <url>${jboss-requirements-composite-mirror}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
</project>
Modified: trunk/build/aggregate/bottests-site/site/site.xsl
===================================================================
--- trunk/build/aggregate/bottests-site/site/site.xsl 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/bottests-site/site/site.xsl 2011-11-01 02:23:36 UTC (rev 36106)
@@ -4,7 +4,6 @@
extension-element-prefixes="saxon">
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
- <br />
<table cellspacing="2" cellpadding="0" border="0">
<xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/site/build.xml 2011-11-01 02:23:36 UTC (rev 36106)
@@ -593,7 +593,7 @@
<target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums">
<property name="aggregate.zips.dir" value="${output.dir}/zips" />
-
+ <mkdir dir="${aggregate.zips.dir}"/>
<!-- load file properties (name, size, md5sum) -->
<if>
<available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" />
Modified: trunk/build/aggregate/site/index.html
===================================================================
--- trunk/build/aggregate/site/index.html 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/site/index.html 2011-11-01 02:23:36 UTC (rev 36106)
@@ -30,16 +30,44 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
- Update Site for JBoss Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
- </tr>
+ Update Site for JBoss Tools.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
@@ -49,18 +77,8 @@
</ul>
</td>
</tr>
+ -->
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
</table>
</td>
<td>      </td>
@@ -68,7 +86,7 @@
<tr>
<td></td>
<td>
- <br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br><table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0">
+ <table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0">
<tr style="background-color:#DDDDDD">
<th style="font-size:small">Feature</th>
<th style="font-size:small">Version</th>
@@ -78,8 +96,8 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20111026-1840-H499-Beta1.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
- <td><span style="font-size:x-small">3.2.1.v20111026-1840-H499-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20111029-0912-H507-Beta1.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20111029-0912-H507-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -87,8 +105,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111026-1921-H803-Beta1.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20111026-1921-H803-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111031-1808-H814-Beta1.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111031-1808-H814-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -96,8 +114,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.freemarker.feature_1.2.0.v20111026-2057-H467-Beta1.jar" style="font-size:x-small">org.jboss.ide.eclipse.freemarker.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111026-2057-H467-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.freemarker.feature_1.2.0.v20111031-2006-H476-Beta1.jar" style="font-size:x-small">org.jboss.ide.eclipse.freemarker.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111031-2006-H476-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -105,15 +123,15 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.birt.feature_1.3.0.v20111026-2045-H500-Beta1.jar" style="font-size:x-small">org.jboss.tools.birt.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-2045-H500-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.birt.feature_1.3.0.v20111101-0100-H509-Beta1.jar" style="font-size:x-small">org.jboss.tools.birt.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111101-0100-H509-Beta1</span></td>
<td><span style="font-size:x-small">
|
ReportTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.cdi.feature_1.2.0.v20111026-1851-H641-Beta1.jar" style="font-size:x-small">org.jboss.tools.cdi.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111026-1851-H641-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.cdi.feature_1.2.0.v20111029-0958-H652-Beta1.jar" style="font-size:x-small">org.jboss.tools.cdi.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111029-0958-H652-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -123,8 +141,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.cdi.seam.feature_1.2.0.v20111026-1851-H641-Beta1.jar" style="font-size:x-small">org.jboss.tools.cdi.seam.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111026-1851-H641-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.cdi.seam.feature_1.2.0.v20111029-0958-H652-Beta1.jar" style="font-size:x-small">org.jboss.tools.cdi.seam.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111029-0958-H652-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -134,52 +152,52 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.central.discovery.feature_1.0.0.v20111026-1519-H27-Beta1.jar" style="font-size:x-small">org.jboss.tools.central.discovery.feature</a></td>
- <td><span style="font-size:x-small">1.0.0.v20111026-1519-H27-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.central.discovery.feature_1.0.0.v20111029-1920-H30-Beta1.jar" style="font-size:x-small">org.jboss.tools.central.discovery.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20111029-1920-H30-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.central.feature_1.0.0.v20111026-1519-H27-Beta1.jar" style="font-size:x-small">org.jboss.tools.central.feature</a></td>
- <td><span style="font-size:x-small">1.0.0.v20111026-1519-H27-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.central.feature_1.0.0.v20111029-1920-H30-Beta1.jar" style="font-size:x-small">org.jboss.tools.central.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20111029-1920-H30-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.core.feature_3.3.0.v20111026-0837-H529-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.core.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-0837-H529-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.core.feature_3.3.0.v20111029-0844-H538-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.core.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111029-0844-H538-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.feature_3.3.0.v20111026-0837-H529-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-0837-H529-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.feature_3.3.0.v20111029-0844-H538-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111029-0844-H538-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.jdt.feature_3.3.0.v20111026-2014-H531-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.jdt.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-2014-H531-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.jdt.feature_3.3.0.v20111101-0200-H540-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.jdt.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111101-0200-H540-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.text.ext.feature_3.3.0.v20111026-0837-H529-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.text.ext.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-0837-H529-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.text.ext.feature_3.3.0.v20111029-0844-H538-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.text.ext.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111029-0844-H538-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.ui.feature_3.3.0.v20111026-0837-H529-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.ui.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-0837-H529-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.ui.feature_3.3.0.v20111029-0844-H538-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.ui.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111029-0844-H538-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.verification.feature_3.3.0.v20111026-0837-H529-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.verification.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-0837-H529-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.verification.feature_3.3.0.v20111029-0844-H538-Beta1.jar" style="font-size:x-small">org.jboss.tools.common.verification.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111029-0844-H538-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.community.project.examples.feature_1.2.1.v20111026-1421-H452-Beta1.jar" style="font-size:x-small">org.jboss.tools.community.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.2.1.v20111026-1421-H452-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.community.project.examples.feature_1.2.1.v20111029-1852-H457-Beta1.jar" style="font-size:x-small">org.jboss.tools.community.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.2.1.v20111029-1852-H457-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -187,29 +205,29 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.deltacloud.feature_1.0.1.v20111026-1817-H710-Beta1.jar" style="font-size:x-small">org.jboss.tools.deltacloud.feature</a></td>
- <td><span style="font-size:x-small">1.0.1.v20111026-1817-H710-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.deltacloud.feature_1.0.1.v20111031-1823-H721-Beta1.jar" style="font-size:x-small">org.jboss.tools.deltacloud.feature</a></td>
+ <td><span style="font-size:x-small">1.0.1.v20111031-1823-H721-Beta1</span></td>
<td><span style="font-size:x-small">
|
CloudTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.forge.feature_1.0.0.v20111026-2040-H331-Beta1.jar" style="font-size:x-small">org.jboss.tools.forge.feature</a></td>
- <td><span style="font-size:x-small">1.0.0.v20111026-2040-H331-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.forge.feature_1.0.0.v20111029-0912-H339-Beta1.jar" style="font-size:x-small">org.jboss.tools.forge.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20111029-0912-H339-Beta1</span></td>
<td><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.gwt.feature_1.0.2.v20111026-2050-H285-Beta1.jar" style="font-size:x-small">org.jboss.tools.gwt.feature</a></td>
- <td><span style="font-size:x-small">1.0.2.v20111026-2050-H285-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.gwt.feature_1.0.2.v20111101-0030-H295-Beta1.jar" style="font-size:x-small">org.jboss.tools.gwt.feature</a></td>
+ <td><span style="font-size:x-small">1.0.2.v20111101-0030-H295-Beta1</span></td>
<td><span style="font-size:x-small">
|
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20111026-0922-H462-Beta1.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111026-0922-H462-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20111029-0912-H472-Beta1.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111029-0912-H472-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -217,8 +235,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jsf.feature_3.3.0.v20111026-1049-H491-Beta1.jar" style="font-size:x-small">org.jboss.tools.jsf.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-1049-H491-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jsf.feature_3.3.0.v20111031-0554-H500-Beta1.jar" style="font-size:x-small">org.jboss.tools.jsf.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111031-0554-H500-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -226,8 +244,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jst.feature_3.3.0.v20111026-0938-H592-Beta1.jar" style="font-size:x-small">org.jboss.tools.jst.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-0938-H592-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jst.feature_3.3.0.v20111029-0925-H604-Beta1.jar" style="font-size:x-small">org.jboss.tools.jst.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111029-0925-H604-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -235,71 +253,71 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.cdi.feature_1.3.0.v20111026-1832-H455-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.cdi.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1832-H455-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.cdi.feature_1.3.0.v20111029-1916-H458-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.cdi.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1916-H458-Beta1</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.feature_1.3.0.v20111026-1832-H455-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1832-H455-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.feature_1.3.0.v20111029-1916-H458-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1916-H458-Beta1</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.hibernate.feature_1.3.0.v20111026-1832-H455-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.hibernate.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1832-H455-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.hibernate.feature_1.3.0.v20111029-1916-H458-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.hibernate.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1916-H458-Beta1</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.jaxrs.feature_1.3.0.v20111026-1832-H455-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.jaxrs.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1832-H455-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jaxrs.feature_1.3.0.v20111029-1916-H458-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.jaxrs.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1916-H458-Beta1</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.jbosspackaging.feature_1.3.0.v20111026-1832-H455-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.jbosspackaging.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1832-H455-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jbosspackaging.feature_1.3.0.v20111029-1916-H458-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.jbosspackaging.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1916-H458-Beta1</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.jsf.feature_1.3.0.v20111026-1832-H455-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.jsf.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1832-H455-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jsf.feature_1.3.0.v20111029-1916-H458-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.jsf.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1916-H458-Beta1</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.portlet.feature_1.3.0.v20111026-1832-H455-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.portlet.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1832-H455-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.portlet.feature_1.3.0.v20111029-1916-H458-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.portlet.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1916-H458-Beta1</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.project.examples.feature_1.3.0.v20111026-1832-H455-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1832-H455-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.project.examples.feature_1.3.0.v20111029-1916-H458-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1916-H458-Beta1</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.seam.feature_1.3.0.v20111026-1832-H455-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.seam.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1832-H455-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.seam.feature_1.3.0.v20111029-1916-H458-Beta1.jar" style="font-size:x-small">org.jboss.tools.maven.seam.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1916-H458-Beta1</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.openshift.egit.integration.feature_2.3.0.v20111026-1014-H6-Beta1.jar" style="font-size:x-small">org.jboss.tools.openshift.egit.integration.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20111026-1014-H6-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.openshift.egit.integration.feature_2.3.0.v20111031-1932-H16-Beta1.jar" style="font-size:x-small">org.jboss.tools.openshift.egit.integration.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111031-1932-H16-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -307,8 +325,8 @@
CloudTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.openshift.express.feature_2.3.0.v20111026-1014-H6-Beta1.jar" style="font-size:x-small">org.jboss.tools.openshift.express.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20111026-1014-H6-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.openshift.express.feature_2.3.0.v20111031-1932-H16-Beta1.jar" style="font-size:x-small">org.jboss.tools.openshift.express.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111031-1932-H16-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -316,8 +334,8 @@
CloudTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.portlet.feature_1.2.0.v20111026-1353-H393-Beta1.jar" style="font-size:x-small">org.jboss.tools.portlet.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111026-1353-H393-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.portlet.feature_1.2.0.v20111029-1842-H397-Beta1.jar" style="font-size:x-small">org.jboss.tools.portlet.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111029-1842-H397-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -325,8 +343,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.project.examples.feature_1.2.1.v20111026-1421-H452-Beta1.jar" style="font-size:x-small">org.jboss.tools.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.2.1.v20111026-1421-H452-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.project.examples.feature_1.2.1.v20111029-1852-H457-Beta1.jar" style="font-size:x-small">org.jboss.tools.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.2.1.v20111029-1852-H457-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -334,8 +352,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.richfaces.feature_3.3.0.v20111026-1049-H491-Beta1.jar" style="font-size:x-small">org.jboss.tools.richfaces.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-1049-H491-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.richfaces.feature_3.3.0.v20111031-0554-H500-Beta1.jar" style="font-size:x-small">org.jboss.tools.richfaces.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111031-0554-H500-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -343,36 +361,36 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.as.detector.feature_1.3.0.v20111026-1502-H461-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.as.detector.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1502-H461-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.as.detector.feature_1.3.0.v20111029-1910-H464-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.as.detector.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1910-H464-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.core.feature_1.3.0.v20111026-1502-H461-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1502-H461-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.core.feature_1.3.0.v20111029-1910-H464-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1910-H464-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.feature_1.3.0.v20111026-1502-H461-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1502-H461-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.feature_1.3.0.v20111029-1910-H464-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1910-H464-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.seam.detector.feature_1.3.0.v20111026-1502-H461-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.seam.detector.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1502-H461-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.seam.detector.feature_1.3.0.v20111029-1910-H464-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.seam.detector.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1910-H464-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.seam.feature_3.3.0.v20111026-1205-H637-Beta1.jar" style="font-size:x-small">org.jboss.tools.seam.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-1205-H637-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.seam.feature_3.3.0.v20111031-0650-H643-Beta1.jar" style="font-size:x-small">org.jboss.tools.seam.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111031-0650-H643-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -380,8 +398,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.struts.feature_3.3.0.v20111026-1037-H404-Beta1.jar" style="font-size:x-small">org.jboss.tools.struts.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-1037-H404-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.struts.feature_3.3.0.v20111029-1557-H411-Beta1.jar" style="font-size:x-small">org.jboss.tools.struts.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111029-1557-H411-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -389,15 +407,15 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.usage.feature_1.1.0.v20111026-2033-H430-Beta1.jar" style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
- <td><span style="font-size:x-small">1.1.0.v20111026-2033-H430-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.usage.feature_1.1.0.v20111031-1957-H438-Beta1.jar" style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.v20111031-1957-H438-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.vpe.feature_3.3.0.v20111026-1005-H567-Beta1.jar" style="font-size:x-small">org.jboss.tools.vpe.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-1005-H567-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.vpe.feature_3.3.0.v20111029-0234-H577-Beta1.jar" style="font-size:x-small">org.jboss.tools.vpe.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111029-0234-H577-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -405,8 +423,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.ws.feature_1.2.2.v20111026-1024-H584-Beta1.jar" style="font-size:x-small">org.jboss.tools.ws.feature</a></td>
- <td><span style="font-size:x-small">1.2.2.v20111026-1024-H584-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.ws.feature_1.2.2.v20111029-0232-H591-Beta1.jar" style="font-size:x-small">org.jboss.tools.ws.feature</a></td>
+ <td><span style="font-size:x-small">1.2.2.v20111029-0232-H591-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -414,8 +432,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.ws.jaxrs.feature_1.2.2.v20111026-1024-H584-Beta1.jar" style="font-size:x-small">org.jboss.tools.ws.jaxrs.feature</a></td>
- <td><span style="font-size:x-small">1.2.2.v20111026-1024-H584-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.ws.jaxrs.feature_1.2.2.v20111029-0232-H591-Beta1.jar" style="font-size:x-small">org.jboss.tools.ws.jaxrs.feature</a></td>
+ <td><span style="font-size:x-small">1.2.2.v20111029-0232-H591-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -423,8 +441,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.xulrunner.feature_3.3.0.v20111026-1005-H567-Beta1.jar" style="font-size:x-small">org.jboss.tools.xulrunner.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111026-1005-H567-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.xulrunner.feature_3.3.0.v20111031-1858-H579-Beta1.jar" style="font-size:x-small">org.jboss.tools.xulrunner.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111031-1858-H579-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:#DDDDDD">
@@ -436,8 +454,8 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.hibernate.eclipse.feature_3.4.0.v20111026-0951-H530-Beta1.jar" style="font-size:x-small">org.hibernate.eclipse.feature</a></td>
- <td><span style="font-size:x-small">3.4.0.v20111026-0951-H530-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.hibernate.eclipse.feature_3.4.0.v20111031-1930-H540-Beta1.jar" style="font-size:x-small">org.hibernate.eclipse.feature</a></td>
+ <td><span style="font-size:x-small">3.4.0.v20111031-1930-H540-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
Modified: trunk/build/aggregate/site/jbosstools-directory.xml
===================================================================
--- trunk/build/aggregate/site/jbosstools-directory.xml 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/site/jbosstools-directory.xml 2011-11-01 02:23:36 UTC (rev 36106)
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
-<entry url="plugins/org.jboss.tools.central.discovery_1.0.0.v20111026-1519-H27-Beta1.jar" permitCategories="true"/>
+<entry url="plugins/org.jboss.tools.central.discovery_1.0.0.v20111029-1920-H30-Beta1.jar" permitCategories="true"/>
</directory>
Modified: trunk/build/aggregate/site/site.xsl
===================================================================
--- trunk/build/aggregate/site/site.xsl 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/site/site.xsl 2011-11-01 02:23:36 UTC (rev 36106)
@@ -4,7 +4,6 @@
extension-element-prefixes="saxon">
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
- <br />
<table cellspacing="2" cellpadding="0" border="0">
<xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
Modified: trunk/build/aggregate/soa-site/build.xml
===================================================================
--- trunk/build/aggregate/soa-site/build.xml 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/soa-site/build.xml 2011-11-01 02:23:36 UTC (rev 36106)
@@ -580,7 +580,7 @@
<target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums">
<property name="aggregate.zips.dir" value="${output.dir}/zips" />
-
+ <mkdir dir="${aggregate.zips.dir}"/>
<!-- load file properties (name, size, md5sum) -->
<if>
<available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" />
Modified: trunk/build/aggregate/soa-site/index.html
===================================================================
--- trunk/build/aggregate/soa-site/index.html 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/soa-site/index.html 2011-11-01 02:23:36 UTC (rev 36106)
@@ -30,16 +30,44 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
- Update Site for JBoss Tools - SOA Tooling. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
- </tr>
+ Update Site for JBoss Tools - SOA Tooling.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
@@ -49,18 +77,8 @@
</ul>
</td>
</tr>
+ -->
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
</table>
</td>
<td>      </td>
@@ -68,7 +86,7 @@
<tr>
<td></td>
<td>
- <br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br><table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0">
+ <table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0">
<tr style="background-color:#DDDDDD">
<th style="font-size:small">Feature</th>
<th style="font-size:small">Version</th>
@@ -78,22 +96,24 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.savara.tools.feature_2.0.0.v20111026-0225-H266-M5.jar" style="font-size:x-small">org.jboss.savara.tools.feature</a></td>
- <td><span style="font-size:x-small">2.0.0.v20111026-0225-H266-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.savara.tools.feature_2.0.0.v20111029-0232-H268-M5.jar" style="font-size:x-small">org.jboss.savara.tools.feature</a></td>
+ <td><span style="font-size:x-small">2.0.0.v20111029-0232-H268-M5</span></td>
<td><span style="font-size:x-small">
|
SOATools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.bpel.feature_1.1.0.v20111026-0927-H494-Beta1.jar" style="font-size:x-small">org.jboss.tools.bpel.feature</a></td>
- <td><span style="font-size:x-small">1.1.0.v20111026-0927-H494-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.esb.feature_1.5.0.v20111031-1835-H539-Beta1.jar" style="font-size:x-small">org.jboss.tools.esb.feature</a></td>
+ <td><span style="font-size:x-small">1.5.0.v20111031-1835-H539-Beta1</span></td>
<td><span style="font-size:x-small">
|
+ AbridgedTools</span><span style="font-size:x-small">
+ |
SOATools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.esb.feature_1.5.0.v20111026-1012-H529-Beta1.jar" style="font-size:x-small">org.jboss.tools.esb.feature</a></td>
- <td><span style="font-size:x-small">1.5.0.v20111026-1012-H529-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jbpm.common.feature_4.4.0.v20111029-0927-H494-Beta1.jar" style="font-size:x-small">org.jboss.tools.jbpm.common.feature</a></td>
+ <td><span style="font-size:x-small">4.4.0.v20111029-0927-H494-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -101,8 +121,8 @@
SOATools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jbpm.common.feature_4.4.0.v20111026-0933-H487-Beta1.jar" style="font-size:x-small">org.jboss.tools.jbpm.common.feature</a></td>
- <td><span style="font-size:x-small">4.4.0.v20111026-0933-H487-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jbpm.convert.feature_1.0.0.v20111029-0927-H494-Beta1.jar" style="font-size:x-small">org.jboss.tools.jbpm.convert.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20111029-0927-H494-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -110,8 +130,8 @@
SOATools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jbpm.convert.feature_1.0.0.v20111026-0933-H487-Beta1.jar" style="font-size:x-small">org.jboss.tools.jbpm.convert.feature</a></td>
- <td><span style="font-size:x-small">1.0.0.v20111026-0933-H487-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jbpm3.feature_3.2.1.v20111029-0927-H494-Beta1.jar" style="font-size:x-small">org.jboss.tools.jbpm3.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20111029-0927-H494-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -119,8 +139,8 @@
SOATools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jbpm3.feature_3.2.1.v20111026-0933-H487-Beta1.jar" style="font-size:x-small">org.jboss.tools.jbpm3.feature</a></td>
- <td><span style="font-size:x-small">3.2.1.v20111026-0933-H487-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jbpm4.feature_4.0.0.v20111029-0927-H494-Beta1.jar" style="font-size:x-small">org.jboss.tools.jbpm4.feature</a></td>
+ <td><span style="font-size:x-small">4.0.0.v20111029-0927-H494-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -128,63 +148,54 @@
SOATools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jbpm4.feature_4.0.0.v20111026-0933-H487-Beta1.jar" style="font-size:x-small">org.jboss.tools.jbpm4.feature</a></td>
- <td><span style="font-size:x-small">4.0.0.v20111026-0933-H487-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.modeshape.rest.feature_1.1.0.v20111031-2004-H421-Beta1.jar" style="font-size:x-small">org.jboss.tools.modeshape.rest.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.v20111031-2004-H421-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
|
- SOATools</span></td>
+ GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.modeshape.rest.feature_1.1.0.v20111026-2048-H413-Beta1.jar" style="font-size:x-small">org.jboss.tools.modeshape.rest.feature</a></td>
- <td><span style="font-size:x-small">1.1.0.v20111026-2048-H413-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.core.feature_1.3.0.v20111029-1910-H464-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1910-H464-Beta1</span></td>
<td><span style="font-size:x-small">
|
- AbridgedTools</span><span style="font-size:x-small">
- |
- GeneralTools</span></td>
+ AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.core.feature_1.3.0.v20111026-1502-H461-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1502-H461-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.drools.detector.feature_1.3.0.v20111029-1910-H464-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.drools.detector.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1910-H464-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.drools.detector.feature_1.3.0.v20111026-1502-H461-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.drools.detector.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1502-H461-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.esb.detector.feature_1.3.0.v20111029-1910-H464-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.esb.detector.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1910-H464-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.esb.detector.feature_1.3.0.v20111026-1502-H461-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.esb.detector.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1502-H461-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.feature_1.3.0.v20111029-1910-H464-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1910-H464-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.feature_1.3.0.v20111026-1502-H461-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1502-H461-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.runtime.jbpm.detector.feature_1.3.0.v20111029-1910-H464-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.jbpm.detector.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-1910-H464-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.runtime.jbpm.detector.feature_1.3.0.v20111026-1502-H461-Beta1.jar" style="font-size:x-small">org.jboss.tools.runtime.jbpm.detector.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-1502-H461-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.smooks.feature_1.3.0.v20111029-0922-H479-Beta1.jar" style="font-size:x-small">org.jboss.tools.smooks.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111029-0922-H479-Beta1</span></td>
<td><span style="font-size:x-small">
|
- AbridgedTools</span></td>
- </tr>
- <tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.smooks.feature_1.3.0.v20111026-0938-H467-Beta1.jar" style="font-size:x-small">org.jboss.tools.smooks.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111026-0938-H467-Beta1</span></td>
- <td><span style="font-size:x-small">
- |
AbridgedTools</span><span style="font-size:x-small">
|
SOATools</span><span style="font-size:x-small">
@@ -193,9 +204,9 @@
|
GeneralTools</span></td>
</tr>
- <tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.usage.feature_1.1.0.v20111026-2033-H430-Beta1.jar" style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
- <td><span style="font-size:x-small">1.1.0.v20111026-2033-H430-Beta1</span></td>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.usage.feature_1.1.0.v20111031-1957-H438-Beta1.jar" style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.v20111031-1957-H438-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
@@ -238,36 +249,36 @@
SOATools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.pi4soa.core.feature_3.1.1.v20111026-0200-H165-Beta1.jar" style="font-size:x-small">org.pi4soa.core.feature</a></td>
- <td><span style="font-size:x-small">3.1.1.v20111026-0200-H165-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.pi4soa.core.feature_3.1.1.v20111029-0151-H169-Beta1.jar" style="font-size:x-small">org.pi4soa.core.feature</a></td>
+ <td><span style="font-size:x-small">3.1.1.v20111029-0151-H169-Beta1</span></td>
<td><span style="font-size:x-small">
|
SOATools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.savara.tools.feature_2.0.0.v20111026-0225-H266-M5.jar" style="font-size:x-small">org.savara.tools.feature</a></td>
- <td><span style="font-size:x-small">2.0.0.v20111026-0225-H266-M5</span></td>
+ <td class="rowLine"><a href="features/org.savara.tools.feature_2.0.0.v20111029-0232-H268-M5.jar" style="font-size:x-small">org.savara.tools.feature</a></td>
+ <td><span style="font-size:x-small">2.0.0.v20111029-0232-H268-M5</span></td>
<td><span style="font-size:x-small">
|
SOATools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.teiid.datatools.connectivity.feature_7.6.0.v20111026-2039-H738-Beta1.jar" style="font-size:x-small">org.teiid.datatools.connectivity.feature</a></td>
- <td><span style="font-size:x-small">7.6.0.v20111026-2039-H738-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.teiid.datatools.connectivity.feature_7.6.0.v20111031-2008-H748-Beta1.jar" style="font-size:x-small">org.teiid.datatools.connectivity.feature</a></td>
+ <td><span style="font-size:x-small">7.6.0.v20111031-2008-H748-Beta1</span></td>
<td><span style="font-size:x-small">
|
DataTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.teiid.designer.feature_7.6.0.v20111026-2039-H738-Beta1.jar" style="font-size:x-small">org.teiid.designer.feature</a></td>
- <td><span style="font-size:x-small">7.6.0.v20111026-2039-H738-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.teiid.designer.feature_7.6.0.v20111031-2008-H748-Beta1.jar" style="font-size:x-small">org.teiid.designer.feature</a></td>
+ <td><span style="font-size:x-small">7.6.0.v20111031-2008-H748-Beta1</span></td>
<td><span style="font-size:x-small">
|
DataTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.teiid.designer.runtime.feature_7.6.0.v20111026-2039-H738-Beta1.jar" style="font-size:x-small">org.teiid.designer.runtime.feature</a></td>
- <td><span style="font-size:x-small">7.6.0.v20111026-2039-H738-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.teiid.designer.runtime.feature_7.6.0.v20111031-2008-H748-Beta1.jar" style="font-size:x-small">org.teiid.designer.runtime.feature</a></td>
+ <td><span style="font-size:x-small">7.6.0.v20111031-2008-H748-Beta1</span></td>
<td><span style="font-size:x-small">
|
DataTools</span></td>
Modified: trunk/build/aggregate/soa-site/site.xsl
===================================================================
--- trunk/build/aggregate/soa-site/site.xsl 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/soa-site/site.xsl 2011-11-01 02:23:36 UTC (rev 36106)
@@ -4,7 +4,6 @@
extension-element-prefixes="saxon">
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
- <br />
<table cellspacing="2" cellpadding="0" border="0">
<xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
Modified: trunk/build/aggregate/webtools-site/build.xml
===================================================================
--- trunk/build/aggregate/webtools-site/build.xml 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/webtools-site/build.xml 2011-11-01 02:23:36 UTC (rev 36106)
@@ -31,6 +31,8 @@
<property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" />
<property file="${aggregateSite.properties}" />
+ <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml"/>
+
<target name="init">
<ant antfile="${build.xml}" target="init" />
<taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -401,7 +403,7 @@
</target>
<target name="pack.zip">
- <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.* index.html, web/*.css, README*" />
+ <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.*, ${web.content.files}" />
</target>
<target name="check.target">
@@ -477,7 +479,7 @@
</copy>
<copy todir="${update.site.source.dir}">
- <fileset dir="${output.dir}" includes="index.html, **/*.css, README*" />
+ <fileset dir="${output.dir}" includes="${web.content.files}" />
</copy>
</target>
@@ -495,10 +497,17 @@
<!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch -->
- <target name="collect.zips" description="collect zips from the sites we aggregated">
+ <target name="collect.zips" description="collect zips from the sites we aggregated" unless="collect.zips.skip">
<property name="aggregate.zips.dir" value="${output.dir}/zips" />
<delete dir="${aggregate.zips.dir}" quiet="true" />
<mkdir dir="${aggregate.zips.dir}" />
+ <if>
+ <isset property="inputRepo" />
+ <then>
+ <var name="inputRepos" value="1" />
+ <var name="inputRepo1" value="${inputRepo}" />
+ </then>
+ </if>
<for list="${inputRepos}" delimiter=", " keepgoing="true" param="repoNum">
<sequential>
<var name="repo" value="${inputRepo@{repoNum}}" />
@@ -572,7 +581,7 @@
<target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums">
<property name="aggregate.zips.dir" value="${output.dir}/zips" />
-
+ <mkdir dir="${aggregate.zips.dir}"/>
<!-- load file properties (name, size, md5sum) -->
<if>
<available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" />
Modified: trunk/build/aggregate/webtools-site/index.html
===================================================================
--- trunk/build/aggregate/webtools-site/index.html 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/webtools-site/index.html 2011-11-01 02:23:36 UTC (rev 36106)
@@ -6,69 +6,103 @@
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
-<center>
-<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0" width="920" class="bodyText">
- <tr>
- <td colspan="3"><img
- src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
- </tr>
- <tr>
- <td>      </td>
- <td>      </td>
- <td>      </td>
- </tr>
- <tr>
- <td>      </td>
- <td>
- <h2 class="title">JBoss Tools - Web Tools - Nightly Build Update Site</h2>
- <table width="100%">
- <tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build</span></td>
+ <center>
+ <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
+ <tr>
+ <td colspan="3"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
</tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">This is the <b>Nightly Build</b>
- Update Site for JBoss Tools - Web Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
+ <tr>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
</tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">JBoss Tools - Web Tools - Nightly Build Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build</span></td>
+ </tr>
- <tr class="dark-row" style="height: 90px">
- <td class="bodyText">
- <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
-Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
- </p>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>Nightly Build</b>
+ Update Site for JBoss Tools - Web Tools.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
- <ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR1">JBoss Tools Requirements - Composite Mirror - Indigo SR1</a></li>
- <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">
+ <b class="bodyText" style="color: red;">NOTE:</b>
+ Some features (such as BIRT, Maven, or GWT) require additional
+ third-party prerequisites not available from Eclipse.org or
+ JBoss.org. These can be installed from the following composite
+ update site mirror, which should be added automatically when
+ you add the JBoss Tools update site to your Eclipse's list of
+ Available Software Sites. To verify which sites are enabled,
+ open
+ <code>
+ <strong>Window > Preferences
+ > Install/Update > Available Software Sites</strong>
+ </code>
+ . To add sites, Click the
+ <code>
+ <strong>Add...</strong>
+ </code>
+ button, then right-click the link(s) below, copy the link(s),
+ and paste them into Eclipse one by one as needed.
+ </p>
+
+ <ul>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR1">JBoss Tools Requirements - Composite Mirror - Indigo SR1</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li>
</ul>
</td>
</tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
+ -->
+ </table>
</td>
+ <td>      </td>
</tr>
- </table>
- </td>
- <td>      </td>
- </tr>
- <tr>
- <td></td>
+ <tr>
+ <td></td>
<td>
- <br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br><table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0">
+ <table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0">
<tr style="background-color:#DDDDDD">
<th style="font-size:small">Feature</th>
<th style="font-size:small">Version</th>
@@ -78,8 +112,8 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111007-2226-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20111007-2226-M4</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111031-1808-H814-Beta1.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111031-1808-H814-Beta1</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
@@ -162,7 +196,7 @@
</tr>
</table>
</td>
- </tr>
-</table>
-</center>
+ </tr>
+ </table>
+ </center>
</html>
Modified: trunk/build/aggregate/webtools-site/pom.xml
===================================================================
--- trunk/build/aggregate/webtools-site/pom.xml 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/webtools-site/pom.xml 2011-11-01 02:23:36 UTC (rev 36106)
@@ -12,10 +12,6 @@
<name>JBoss Tools - Web Tools Site</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
-
- <!-- to build against locally built sources, use: mvn clean install to build
- against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/,
- use: mvn clean install -Pjbosstools-nightly-staging-composite -->
<build>
<plugins>
<plugin>
@@ -31,6 +27,8 @@
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
<ant antfile="build.xml">
+ <property name="inputRepo"
+ value="${jbosstools-nightly-staging-composite}" />
<property name="JBT_VERSION" value="${JBT_VERSION}" />
<property name="BUILD_ALIAS" value="${BUILD_ALIAS}" />
</ant>
@@ -83,11 +81,9 @@
</build>
<repositories>
- <!-- add more inputRepo# here, ref'd above; need variables so that these
- can be referred to in Ant script later -->
<repository>
- <id>jbosstools-requirements-composite-mirror</id>
- <url>http://download.jboss.org/jbosstools/updates/indigo/SR1/</url>
+ <id>jbosstools-nightly-staging-composite</id>
+ <url>${jbosstools-nightly-staging-composite}</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -96,5 +92,16 @@
<enabled>true</enabled>
</releases>
</repository>
+ <repository>
+ <id>jboss-requirements-composite-mirror</id>
+ <url>${jboss-requirements-composite-mirror}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
</project>
Modified: trunk/build/aggregate/webtools-site/site.xsl
===================================================================
--- trunk/build/aggregate/webtools-site/site.xsl 2011-11-01 02:23:03 UTC (rev 36105)
+++ trunk/build/aggregate/webtools-site/site.xsl 2011-11-01 02:23:36 UTC (rev 36106)
@@ -4,7 +4,6 @@
extension-element-prefixes="saxon">
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
- <br />
<table cellspacing="2" cellpadding="0" border="0">
<xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
13 years, 1 month
JBoss Tools SVN: r36105 - in branches/jbosstools-3.3.0.M4/build/aggregate: site and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-10-31 22:23:03 -0400 (Mon, 31 Oct 2011)
New Revision: 36105
Modified:
branches/jbosstools-3.3.0.M4/build/aggregate/bottests-site/site/site.xsl
branches/jbosstools-3.3.0.M4/build/aggregate/site/site.xsl
branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/site.xsl
branches/jbosstools-3.3.0.M4/build/aggregate/webtools-site/site.xsl
Log:
JBIDE-10047 remove extra break from before the generated feature listing
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/bottests-site/site/site.xsl
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/bottests-site/site/site.xsl 2011-11-01 01:23:42 UTC (rev 36104)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/bottests-site/site/site.xsl 2011-11-01 02:23:03 UTC (rev 36105)
@@ -4,7 +4,6 @@
extension-element-prefixes="saxon">
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
- <br />
<table cellspacing="2" cellpadding="0" border="0">
<xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/site/site.xsl
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/site/site.xsl 2011-11-01 01:23:42 UTC (rev 36104)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/site/site.xsl 2011-11-01 02:23:03 UTC (rev 36105)
@@ -4,7 +4,6 @@
extension-element-prefixes="saxon">
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
- <br />
<table cellspacing="2" cellpadding="0" border="0">
<xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/site.xsl
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/site.xsl 2011-11-01 01:23:42 UTC (rev 36104)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/site.xsl 2011-11-01 02:23:03 UTC (rev 36105)
@@ -4,7 +4,6 @@
extension-element-prefixes="saxon">
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
- <br />
<table cellspacing="2" cellpadding="0" border="0">
<xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/webtools-site/site.xsl
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/webtools-site/site.xsl 2011-11-01 01:23:42 UTC (rev 36104)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/webtools-site/site.xsl 2011-11-01 02:23:03 UTC (rev 36105)
@@ -4,7 +4,6 @@
extension-element-prefixes="saxon">
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
- <br />
<table cellspacing="2" cellpadding="0" border="0">
<xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
13 years, 1 month
JBoss Tools SVN: r36104 - in branches/jbosstools-3.3.0.M4/build/aggregate: site and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-10-31 21:23:42 -0400 (Mon, 31 Oct 2011)
New Revision: 36104
Modified:
branches/jbosstools-3.3.0.M4/build/aggregate/bottests-site/site/index-template.html
branches/jbosstools-3.3.0.M4/build/aggregate/site/index-template.html
branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/index-template.html
branches/jbosstools-3.3.0.M4/build/aggregate/webtools-site/index-template.html
Log:
JBIDE-10047 add instructions for installation; remove links to 3rd party sites (no longer needed)
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/bottests-site/site/index-template.html
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/bottests-site/site/index-template.html 2011-11-01 01:23:36 UTC (rev 36103)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/bottests-site/site/index-template.html 2011-11-01 01:23:42 UTC (rev 36104)
@@ -30,16 +30,44 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools - Bot Tests. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
- </tr>
+ Update Site for JBoss Tools - Bot Tests.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
@@ -50,18 +78,8 @@
</ul>
</td>
</tr>
+ -->
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
</table>
</td>
<td>      </td>
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/site/index-template.html
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/site/index-template.html 2011-11-01 01:23:36 UTC (rev 36103)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/site/index-template.html 2011-11-01 01:23:42 UTC (rev 36104)
@@ -30,16 +30,44 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
- </tr>
+ Update Site for JBoss Tools.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
@@ -49,18 +77,8 @@
</ul>
</td>
</tr>
+ -->
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
</table>
</td>
<td>      </td>
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/index-template.html
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/index-template.html 2011-11-01 01:23:36 UTC (rev 36103)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/soa-site/index-template.html 2011-11-01 01:23:42 UTC (rev 36104)
@@ -30,16 +30,44 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools - SOA Tooling. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
- </tr>
+ Update Site for JBoss Tools - SOA Tooling.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
<tr class="dark-row" style="height: 90px">
<td class="bodyText">
<p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
</p>
@@ -49,18 +77,8 @@
</ul>
</td>
</tr>
+ -->
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
</table>
</td>
<td>      </td>
Modified: branches/jbosstools-3.3.0.M4/build/aggregate/webtools-site/index-template.html
===================================================================
--- branches/jbosstools-3.3.0.M4/build/aggregate/webtools-site/index-template.html 2011-11-01 01:23:36 UTC (rev 36103)
+++ branches/jbosstools-3.3.0.M4/build/aggregate/webtools-site/index-template.html 2011-11-01 01:23:42 UTC (rev 36104)
@@ -6,67 +6,101 @@
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
-<center>
-<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0" width="920" class="bodyText">
- <tr>
- <td colspan="3"><img
- src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
- </tr>
- <tr>
- <td>      </td>
- <td>      </td>
- <td>      </td>
- </tr>
- <tr>
- <td>      </td>
- <td>
- <h2 class="title">JBoss Tools - Web Tools - ${update.site.description} Update Site</h2>
- <table width="100%">
- <tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>
+ <center>
+ <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
+ <tr>
+ <td colspan="3"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
</tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools - Web Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">Installation
- Instructions</a>.</p>
- </td>
+ <tr>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
</tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">JBoss Tools - Web Tools - ${update.site.description} Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>
+ </tr>
- <tr class="dark-row" style="height: 90px">
- <td class="bodyText">
- <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
-<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
-Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
- </p>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>${update.site.description}</b>
+ Update Site for JBoss Tools - Web Tools.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
- <ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR1">JBoss Tools Requirements - Composite Mirror - Indigo SR1</a></li>
- <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li>
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+
+ <!--
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">
+ <b class="bodyText" style="color: red;">NOTE:</b>
+ Some features (such as BIRT, Maven, or GWT) require additional
+ third-party prerequisites not available from Eclipse.org or
+ JBoss.org. These can be installed from the following composite
+ update site mirror, which should be added automatically when
+ you add the JBoss Tools update site to your Eclipse's list of
+ Available Software Sites. To verify which sites are enabled,
+ open
+ <code>
+ <strong>Window > Preferences
+ > Install/Update > Available Software Sites</strong>
+ </code>
+ . To add sites, Click the
+ <code>
+ <strong>Add...</strong>
+ </code>
+ button, then right-click the link(s) below, copy the link(s),
+ and paste them into Eclipse one by one as needed.
+ </p>
+
+ <ul>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR1">JBoss Tools Requirements - Composite Mirror - Indigo SR1</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li>
</ul>
</td>
</tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">You can also download JBoss Tools as
- individual zips for offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br/>
- If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
+ -->
+ </table>
</td>
+ <td>      </td>
</tr>
- </table>
- </td>
- <td>      </td>
- </tr>
- <tr>
- <td></td>
+ <tr>
+ <td></td>
<td>
${site.contents}
</td>
@@ -128,7 +162,7 @@
</tr>
</table>
</td>
- </tr>
-</table>
-</center>
+ </tr>
+ </table>
+ </center>
</html>
13 years, 1 month