JBoss Tools SVN: r42435 - branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-06 04:46:01 -0400 (Fri, 06 Jul 2012)
New Revision: 42435
Modified:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java
Log:
JBIDE-12216 to maintenance
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java 2012-07-06 08:08:20 UTC (rev 42434)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java 2012-07-06 08:46:01 UTC (rev 42435)
@@ -112,9 +112,11 @@
}
public boolean accept(IServer server) {
- return (server.getServerType() != null &&
+ boolean preconditions = (server.getServerType() != null &&
server.loadAdapter(JBossServer.class, new NullProgressMonitor()) != null
&& server.getServerState() == IServer.STATE_STARTED);
+ IConnectionWrapper connection = JBossJMXConnectionProviderModel.getDefault().getConnection(server);
+ return preconditions && connection.isConnected();
}
public void perform(final IServer server) {
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r42434 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-06 04:08:20 -0400 (Fri, 06 Jul 2012)
New Revision: 42434
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
Log:
/JBIDE-11858 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java 2012-07-06 08:08:03 UTC (rev 42433)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java 2012-07-06 08:08:20 UTC (rev 42434)
@@ -18,8 +18,14 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.ui.views.server.extensions.XPathTreeContentProvider.ServerWrapper;
+import org.jboss.tools.as.wst.server.ui.xpl.ServerToolTip;
public class FilesetContentProvider implements ITreeContentProvider {
private static final String FILESET_KEY = "org.jboss.ide.eclipse.as.ui.views.server.providers.FilesetViewProvider.PropertyKey"; //$NON-NLS-1$
@@ -199,7 +205,25 @@
public void dispose() {
}
+ private ServerToolTip tooltip = null;
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ if( tooltip != null )
+ tooltip.deactivate();
+ tooltip = new ServerToolTip(((TreeViewer)viewer).getTree()) {
+
+ @Override
+ protected boolean isMyType(Object selected) {
+ return selected instanceof ServerWrapper;
+ }
+ @Override
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+ sText.setText("Quickly access files matching a given pattern in your server installation."); //$NON-NLS-1$
+ }
+ };
+ tooltip.setShift(new Point(15, 8));
+ tooltip.setPopupDelay(500); // in ms
+ tooltip.setHideOnMouseDown(true);
+ tooltip.activate();
}
private IPath[] findPaths(Fileset fs) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2012-07-06 08:08:03 UTC (rev 42433)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2012-07-06 08:08:20 UTC (rev 42434)
@@ -8,15 +8,20 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathCategory;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult;
+import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
-import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.tools.as.wst.server.ui.xpl.ServerToolTip;
public class XPathTreeContentProvider implements ITreeContentProvider {
@@ -130,7 +135,26 @@
public void dispose() {
}
+ private ServerToolTip tooltip = null;
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ if( tooltip != null )
+ tooltip.deactivate();
+
this.viewer = viewer;
+ tooltip = new ServerToolTip(((TreeViewer)viewer).getTree()) {
+
+ @Override
+ protected boolean isMyType(Object selected) {
+ return selected instanceof ServerWrapper;
+ }
+ @Override
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+ sText.setText("Quickly modify xpath values in your server installation.");
+ }
+ };
+ tooltip.setShift(new Point(15, 8));
+ tooltip.setPopupDelay(500); // in ms
+ tooltip.setHideOnMouseDown(true);
+ tooltip.activate();
}
}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2012-07-06 08:08:03 UTC (rev 42433)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2012-07-06 08:08:20 UTC (rev 42434)
@@ -5,14 +5,15 @@
import java.util.Arrays;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathCategory;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult;
+import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
-import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -25,7 +26,13 @@
ImageDescriptor des = ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/XMLFile.gif")); //$NON-NLS-1$
rootImage = des.createImage();
}
-
+// public boolean useNativeToolTip(Object object) {
+// return true;
+// }
+// public String getToolTipText(Object element) {
+// return "BLAAAAAAAH";
+// }
+
public Image getImage(Object element) {
if( element instanceof ServerWrapper )
return rootImage;
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-07-06 08:08:20 UTC (rev 42434)
@@ -0,0 +1,245 @@
+/**********************************************************************
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - Initial API and implementation
+ **********************************************************************/
+package org.jboss.tools.as.wst.server.ui.xpl;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import org.eclipse.jface.internal.text.html.HTML2TextReader;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.ui.IServerModule;
+import org.eclipse.wst.server.ui.internal.provisional.IServerToolTip;
+
+public abstract class ServerToolTip extends ToolTip {
+ protected Hashtable<String,ArrayList<IServerToolTip>> toolTipProviders = new Hashtable<String,ArrayList<IServerToolTip>>();
+ protected static Shell CURRENT_TOOLTIP;
+ protected Label hintLabel;
+ protected Tree tree;
+ protected int x;
+ protected int y;
+
+ public ServerToolTip(final Tree tree) {
+ super(tree);
+
+ this.tree = tree;
+
+ tree.addMouseMoveListener(new MouseMoveListener() {
+ public void mouseMove(MouseEvent e) {
+ x = e.x;
+ y = e.y;
+ }
+ });
+
+ tree.addKeyListener(new KeyListener() {
+ public void keyPressed(KeyEvent e) {
+ if (e == null)
+ return;
+
+ if (e.keyCode == SWT.ESC) {
+ if (CURRENT_TOOLTIP != null) {
+ CURRENT_TOOLTIP.dispose();
+ CURRENT_TOOLTIP = null;
+ }
+ activate();
+ }
+ if (e.keyCode == SWT.F6) {
+ if (CURRENT_TOOLTIP == null) {
+ deactivate();
+ hide();
+ createFocusedTooltip(tree);
+ }
+ }
+ }
+ public void keyReleased(KeyEvent e){
+ // nothing to do
+ }
+ });
+ }
+
+ public void createFocusedTooltip(final Control control) {
+ final Shell stickyTooltip = new Shell(control.getShell(), SWT.ON_TOP | SWT.TOOL
+ | SWT.NO_FOCUS);
+ stickyTooltip.setLayout(new FillLayout());
+ stickyTooltip.setBackground(stickyTooltip.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+ control.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ Event event = new Event();
+ event.x = x;
+ event.y = y;
+ event.widget = tree;
+
+ createToolTipContentArea(event, stickyTooltip);
+ stickyTooltip.pack();
+
+ stickyTooltip.setLocation(stickyTooltip.getDisplay().getCursorLocation());
+ hintLabel.setText("Press 'ESC' to Hide.");
+ stickyTooltip.setVisible(true);
+// Eventually we want to add a listener that checks if
+// the mouseDown event is occurring outside of the bounds of the tooltip
+// if it is, then hide the tooltip
+// addListener(stickyTooltip);
+ }
+ });
+ CURRENT_TOOLTIP = stickyTooltip;
+ }
+
+ @Override
+ protected Object getToolTipArea(Event event) {
+ Object o = tree.getItem(new Point(event.x,event.y));
+ return o;
+ }
+
+ protected boolean shouldCreateToolTip(Event event) {
+ if (tree.getItem(new Point(event.x, event.y)) == null)
+ return false;
+ /* JBT: Added this check */
+ Object o = tree.getItem(new Point(event.x, event.y));
+ if( o instanceof TreeItem && !isMyType(((TreeItem)o).getData()))
+ return false;
+ return super.shouldCreateToolTip(event);
+ }
+
+ /*
+ * JBT: Added a method
+ */
+ protected abstract boolean isMyType(Object selected);
+
+ protected Composite createToolTipContentArea(Event event, Composite parent) {
+ Object o = tree.getItem(new Point(event.x, event.y));
+ if (o == null)
+ return null;
+
+ FillLayout layout = (FillLayout)parent.getLayout();
+ layout.type = SWT.VERTICAL;
+ parent.setLayout(layout);
+ parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+ // set the default text for the tooltip
+ StyledText sText = new StyledText(parent, SWT.NONE);
+ sText.setEditable(false);
+ sText.setBackground(parent.getBackground());
+
+ fillStyledText(parent, sText, o);
+
+ // add the F3 text
+ hintLabel = new Label(parent,SWT.BORDER);
+ hintLabel.setAlignment(SWT.RIGHT);
+ hintLabel.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ hintLabel.setText("Press 'F6' for Focus.");
+ hintLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
+
+ final Font font;
+ Display display = parent.getDisplay();
+ FontData[] fd = parent.getFont().getFontData();
+ int size2 = fd.length;
+ for (int i = 0; i < size2; i++)
+ fd[i].setHeight(7);
+ font = new Font(display, fd);
+ parent.addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ font.dispose();
+ }
+ });
+ hintLabel.setFont(font);
+
+ parseText(sText.getText(),sText);
+
+ return parent;
+ }
+
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+
+ IServer server = null;
+ IServerModule module = null;
+ if (o instanceof TreeItem) {
+ Object obj = ((TreeItem)o).getData();
+ if (obj instanceof IServer)
+ server = (IServer) obj;
+ if (obj instanceof IServerModule)
+ module = (IServerModule) obj;
+ }
+
+ if (module != null) {
+ IModule[] modules = module.getModule();
+ IModule m = modules[modules.length - 1];
+ sText.setText("<b>" + m.getName() + "</b>");
+ //sText.setText("<b>" + m.getName() + "</b></p>" + m.getModuleType().getName());
+
+ StyledText sText2 = new StyledText(parent, SWT.NONE);
+ sText2.setEditable(false);
+ sText2.setBackground(parent.getBackground());
+ sText2.setText(m.getModuleType().getName());
+ }
+
+ if (server != null) {
+ sText.setText("<b>" + server.getName() + "</b>");
+
+ // add adopters content
+ if (server.getServerType() != null) {
+ ArrayList<IServerToolTip> listOfProviders = toolTipProviders.get(server.getServerType().getId());
+
+ if (listOfProviders != null) {
+ for (IServerToolTip tipProvider : listOfProviders) {
+ tipProvider.createContent(parent,server);
+ }
+ }
+ }
+ }
+ }
+
+
+ protected void parseText(String htmlText,StyledText sText) {
+ TextPresentation presentation = new TextPresentation();
+ HTML2TextReader reader = new HTML2TextReader(new StringReader(htmlText), presentation);
+ String text;
+
+ try {
+ text = reader.getString();
+ } catch (IOException e) {
+ text= ""; //$NON-NLS-1$
+ }
+
+ sText.setText(text);
+ Iterator iter = presentation.getAllStyleRangeIterator();
+ while (iter.hasNext()) {
+ StyleRange sr = (StyleRange)iter.next();
+ sText.setStyleRange(sr);
+ }
+ }
+}
\ No newline at end of file
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r42433 - in branches/jbosstools-3.3.x/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-06 04:08:03 -0400 (Fri, 06 Jul 2012)
New Revision: 42433
Added:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
Modified:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
Log:
/JBIDE-11858 to maintenance
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java 2012-07-06 04:53:07 UTC (rev 42432)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetContentProvider.java 2012-07-06 08:08:03 UTC (rev 42433)
@@ -18,8 +18,14 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.ui.views.server.extensions.XPathTreeContentProvider.ServerWrapper;
+import org.jboss.tools.as.wst.server.ui.xpl.ServerToolTip;
public class FilesetContentProvider implements ITreeContentProvider {
private static final String FILESET_KEY = "org.jboss.ide.eclipse.as.ui.views.server.providers.FilesetViewProvider.PropertyKey"; //$NON-NLS-1$
@@ -199,7 +205,25 @@
public void dispose() {
}
+ private ServerToolTip tooltip = null;
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ if( tooltip != null )
+ tooltip.deactivate();
+ tooltip = new ServerToolTip(((TreeViewer)viewer).getTree()) {
+
+ @Override
+ protected boolean isMyType(Object selected) {
+ return selected instanceof ServerWrapper;
+ }
+ @Override
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+ sText.setText("Quickly access files matching a given pattern in your server installation."); //$NON-NLS-1$
+ }
+ };
+ tooltip.setShift(new Point(15, 8));
+ tooltip.setPopupDelay(500); // in ms
+ tooltip.setHideOnMouseDown(true);
+ tooltip.activate();
}
private IPath[] findPaths(Fileset fs) {
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2012-07-06 04:53:07 UTC (rev 42432)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2012-07-06 08:08:03 UTC (rev 42433)
@@ -8,15 +8,20 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathCategory;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult;
+import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
-import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.tools.as.wst.server.ui.xpl.ServerToolTip;
public class XPathTreeContentProvider implements ITreeContentProvider {
@@ -130,7 +135,26 @@
public void dispose() {
}
+ private ServerToolTip tooltip = null;
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ if( tooltip != null )
+ tooltip.deactivate();
+
this.viewer = viewer;
+ tooltip = new ServerToolTip(((TreeViewer)viewer).getTree()) {
+
+ @Override
+ protected boolean isMyType(Object selected) {
+ return selected instanceof ServerWrapper;
+ }
+ @Override
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+ sText.setText("Quickly modify xpath values in your server installation.");
+ }
+ };
+ tooltip.setShift(new Point(15, 8));
+ tooltip.setPopupDelay(500); // in ms
+ tooltip.setHideOnMouseDown(true);
+ tooltip.activate();
}
}
\ No newline at end of file
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2012-07-06 04:53:07 UTC (rev 42432)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2012-07-06 08:08:03 UTC (rev 42433)
@@ -5,14 +5,15 @@
import java.util.Arrays;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathCategory;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult;
+import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
-import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -25,7 +26,13 @@
ImageDescriptor des = ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/XMLFile.gif")); //$NON-NLS-1$
rootImage = des.createImage();
}
-
+// public boolean useNativeToolTip(Object object) {
+// return true;
+// }
+// public String getToolTipText(Object element) {
+// return "BLAAAAAAAH";
+// }
+
public Image getImage(Object element) {
if( element instanceof ServerWrapper )
return rootImage;
Added: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java (rev 0)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-07-06 08:08:03 UTC (rev 42433)
@@ -0,0 +1,245 @@
+/**********************************************************************
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - Initial API and implementation
+ **********************************************************************/
+package org.jboss.tools.as.wst.server.ui.xpl;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import org.eclipse.jface.internal.text.html.HTML2TextReader;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.ui.IServerModule;
+import org.eclipse.wst.server.ui.internal.provisional.IServerToolTip;
+
+public abstract class ServerToolTip extends ToolTip {
+ protected Hashtable<String,ArrayList<IServerToolTip>> toolTipProviders = new Hashtable<String,ArrayList<IServerToolTip>>();
+ protected static Shell CURRENT_TOOLTIP;
+ protected Label hintLabel;
+ protected Tree tree;
+ protected int x;
+ protected int y;
+
+ public ServerToolTip(final Tree tree) {
+ super(tree);
+
+ this.tree = tree;
+
+ tree.addMouseMoveListener(new MouseMoveListener() {
+ public void mouseMove(MouseEvent e) {
+ x = e.x;
+ y = e.y;
+ }
+ });
+
+ tree.addKeyListener(new KeyListener() {
+ public void keyPressed(KeyEvent e) {
+ if (e == null)
+ return;
+
+ if (e.keyCode == SWT.ESC) {
+ if (CURRENT_TOOLTIP != null) {
+ CURRENT_TOOLTIP.dispose();
+ CURRENT_TOOLTIP = null;
+ }
+ activate();
+ }
+ if (e.keyCode == SWT.F6) {
+ if (CURRENT_TOOLTIP == null) {
+ deactivate();
+ hide();
+ createFocusedTooltip(tree);
+ }
+ }
+ }
+ public void keyReleased(KeyEvent e){
+ // nothing to do
+ }
+ });
+ }
+
+ public void createFocusedTooltip(final Control control) {
+ final Shell stickyTooltip = new Shell(control.getShell(), SWT.ON_TOP | SWT.TOOL
+ | SWT.NO_FOCUS);
+ stickyTooltip.setLayout(new FillLayout());
+ stickyTooltip.setBackground(stickyTooltip.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+ control.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ Event event = new Event();
+ event.x = x;
+ event.y = y;
+ event.widget = tree;
+
+ createToolTipContentArea(event, stickyTooltip);
+ stickyTooltip.pack();
+
+ stickyTooltip.setLocation(stickyTooltip.getDisplay().getCursorLocation());
+ hintLabel.setText("Press 'ESC' to Hide.");
+ stickyTooltip.setVisible(true);
+// Eventually we want to add a listener that checks if
+// the mouseDown event is occurring outside of the bounds of the tooltip
+// if it is, then hide the tooltip
+// addListener(stickyTooltip);
+ }
+ });
+ CURRENT_TOOLTIP = stickyTooltip;
+ }
+
+ @Override
+ protected Object getToolTipArea(Event event) {
+ Object o = tree.getItem(new Point(event.x,event.y));
+ return o;
+ }
+
+ protected boolean shouldCreateToolTip(Event event) {
+ if (tree.getItem(new Point(event.x, event.y)) == null)
+ return false;
+ /* JBT: Added this check */
+ Object o = tree.getItem(new Point(event.x, event.y));
+ if( o instanceof TreeItem && !isMyType(((TreeItem)o).getData()))
+ return false;
+ return super.shouldCreateToolTip(event);
+ }
+
+ /*
+ * JBT: Added a method
+ */
+ protected abstract boolean isMyType(Object selected);
+
+ protected Composite createToolTipContentArea(Event event, Composite parent) {
+ Object o = tree.getItem(new Point(event.x, event.y));
+ if (o == null)
+ return null;
+
+ FillLayout layout = (FillLayout)parent.getLayout();
+ layout.type = SWT.VERTICAL;
+ parent.setLayout(layout);
+ parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+
+ // set the default text for the tooltip
+ StyledText sText = new StyledText(parent, SWT.NONE);
+ sText.setEditable(false);
+ sText.setBackground(parent.getBackground());
+
+ fillStyledText(parent, sText, o);
+
+ // add the F3 text
+ hintLabel = new Label(parent,SWT.BORDER);
+ hintLabel.setAlignment(SWT.RIGHT);
+ hintLabel.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ hintLabel.setText("Press 'F6' for Focus.");
+ hintLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
+
+ final Font font;
+ Display display = parent.getDisplay();
+ FontData[] fd = parent.getFont().getFontData();
+ int size2 = fd.length;
+ for (int i = 0; i < size2; i++)
+ fd[i].setHeight(7);
+ font = new Font(display, fd);
+ parent.addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ font.dispose();
+ }
+ });
+ hintLabel.setFont(font);
+
+ parseText(sText.getText(),sText);
+
+ return parent;
+ }
+
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+
+ IServer server = null;
+ IServerModule module = null;
+ if (o instanceof TreeItem) {
+ Object obj = ((TreeItem)o).getData();
+ if (obj instanceof IServer)
+ server = (IServer) obj;
+ if (obj instanceof IServerModule)
+ module = (IServerModule) obj;
+ }
+
+ if (module != null) {
+ IModule[] modules = module.getModule();
+ IModule m = modules[modules.length - 1];
+ sText.setText("<b>" + m.getName() + "</b>");
+ //sText.setText("<b>" + m.getName() + "</b></p>" + m.getModuleType().getName());
+
+ StyledText sText2 = new StyledText(parent, SWT.NONE);
+ sText2.setEditable(false);
+ sText2.setBackground(parent.getBackground());
+ sText2.setText(m.getModuleType().getName());
+ }
+
+ if (server != null) {
+ sText.setText("<b>" + server.getName() + "</b>");
+
+ // add adopters content
+ if (server.getServerType() != null) {
+ ArrayList<IServerToolTip> listOfProviders = toolTipProviders.get(server.getServerType().getId());
+
+ if (listOfProviders != null) {
+ for (IServerToolTip tipProvider : listOfProviders) {
+ tipProvider.createContent(parent,server);
+ }
+ }
+ }
+ }
+ }
+
+
+ protected void parseText(String htmlText,StyledText sText) {
+ TextPresentation presentation = new TextPresentation();
+ HTML2TextReader reader = new HTML2TextReader(new StringReader(htmlText), presentation);
+ String text;
+
+ try {
+ text = reader.getString();
+ } catch (IOException e) {
+ text= ""; //$NON-NLS-1$
+ }
+
+ sText.setText(text);
+ Iterator iter = presentation.getAllStyleRangeIterator();
+ while (iter.hasNext()) {
+ StyleRange sr = (StyleRange)iter.next();
+ sText.setStyleRange(sr);
+ }
+ }
+}
\ No newline at end of file
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r42432 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal/v7 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-06 00:53:07 -0400 (Fri, 06 Jul 2012)
New Revision: 42432
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss71ServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
Log:
/JBIDE-12229 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-07-06 04:45:22 UTC (rev 42431)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-07-06 04:53:07 UTC (rev 42432)
@@ -49,6 +49,7 @@
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.JavaUtils;
public class LocalJBossServerRuntime extends AbstractLocalJBossServerRuntime implements IJBossServerRuntime {
@@ -125,7 +126,7 @@
String name = getRuntime().getName();
String ret = QUOTE + SYSPROP + PROGRAM_NAME_ARG + EQ +
"JBossTools: " + name + QUOTE + SPACE; //$NON-NLS-1$
- if( Platform.getOS().equals(Platform.OS_MACOSX))
+ if( JavaUtils.supportsServerMode(getVM()))
ret += SERVER_ARG + SPACE;
IRuntimeType type = getRuntime().getRuntimeType();
if (type != null &&
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss71ServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss71ServerRuntime.java 2012-07-06 04:45:22 UTC (rev 42431)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss71ServerRuntime.java 2012-07-06 04:53:07 UTC (rev 42432)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.JavaUtils;
public class LocalJBoss71ServerRuntime extends LocalJBoss7ServerRuntime implements IJBossRuntimeConstants {
public static final String CONFIG_FILE = "org.jboss.ide.eclipse.as.core.server.internal.v7.CONFIG_FILE"; //$NON-NLS-1$
@@ -31,7 +32,8 @@
IJBossRuntimeResourceConstants c = new IJBossRuntimeResourceConstants() {};
IPath bootLog = serverHome.append(c.AS7_STANDALONE).append(c.FOLDER_LOG).append(c.AS7_BOOT_LOG);
IPath logConfig = serverHome.append(c.AS7_STANDALONE).append(c.CONFIGURATION).append(c.LOGGING_PROPERTIES);
- return SERVER_ARG
+ String serverArg =JavaUtils.supportsServerMode(getVM()) ? SERVER_ARG : ""; //$NON-NLS-1$
+ return serverArg
+ " -Xms64m" //$NON-NLS-1$
+ " -Xmx512m" //$NON-NLS-1$
+ " -XX:MaxPermSize=256m" //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-07-06 04:45:22 UTC (rev 42431)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-07-06 04:53:07 UTC (rev 42432)
@@ -21,6 +21,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.JavaUtils;
public class LocalJBoss7ServerRuntime extends LocalJBossServerRuntime implements IJBossRuntimeConstants {
public static final String CONFIG_FILE = "org.jboss.ide.eclipse.as.core.server.internal.v7.CONFIG_FILE"; //$NON-NLS-1$
@@ -57,7 +58,8 @@
IJBossRuntimeResourceConstants c = new IJBossRuntimeResourceConstants() {};
IPath bootLog = serverHome.append(c.AS7_STANDALONE).append(c.FOLDER_LOG).append(c.AS7_BOOT_LOG);
IPath logConfig = serverHome.append(c.AS7_STANDALONE).append(c.CONFIGURATION).append(c.LOGGING_PROPERTIES);
- return SERVER_ARG
+ String serverArg =JavaUtils.supportsServerMode(getVM()) ? SERVER_ARG : ""; //$NON-NLS-1$
+ return serverArg
+ " -Xms64m" //$NON-NLS-1$
+ " -Xmx512m" //$NON-NLS-1$
+ " -XX:MaxPermSize=256m" //$NON-NLS-1$
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java 2012-07-06 04:53:07 UTC (rev 42432)
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.util;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.IVMInstall2;
+
+public class JavaUtils {
+ public static boolean supportsServerMode(IVMInstall install) {
+ File f = install.getInstallLocation();
+ String version = (install instanceof IVMInstall2 ? ((IVMInstall2)install).getJavaVersion() : null);
+
+ // Maintain legacy behaviour for all older server adapters
+ if( version == null || Platform.getOS().equals(Platform.OS_MACOSX))
+ return true;
+
+ File libFolder = null;
+ if( Platform.getOS().equals(Platform.OS_WIN32))
+ libFolder = getWindowsServerLibFolder(version, install);
+ else
+ libFolder = getLinuxServerLibFolder(version, install);
+ if( libFolder != null && libFolder.exists() &&
+ libFolder.isDirectory() && libFolder.list().length > 0)
+ return true;
+ return false;
+ }
+
+ private static File getLinuxServerLibFolder(String version, IVMInstall install) {
+ File serverFolder = null;
+ IPath locPath = new Path(install.getInstallLocation().getAbsolutePath());
+ if( version.startsWith("1.7.")) //$NON-NLS-1$
+ serverFolder = findServerFolder(locPath.append("jre").append("lib")); //$NON-NLS-1$ //$NON-NLS-2$
+ return serverFolder;
+ }
+
+ private static File findServerFolder(IPath parent) {
+ File f = parent.toFile();
+ if( !f.exists())
+ return null;
+ File[] children = f.listFiles();
+ for( int i = 0; i < children.length; i++ ) {
+ if( children[i].isDirectory() ) {
+ String[] second = children[i].list();
+ for( int j = 0; j < second.length; j++ ) {
+ if( second[j].toLowerCase().equals("server")) //$NON-NLS-1$
+ return new File(children[i], second[j]);
+ }
+ }
+ }
+ return null;
+ }
+
+ private static File getWindowsServerLibFolder(String version, IVMInstall install) {
+ IPath locPath = new Path(install.getInstallLocation().getAbsolutePath());
+ return locPath.append("jre").append("bin").append("server").toFile(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+}
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r42431 - in branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal/v7 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-06 00:45:22 -0400 (Fri, 06 Jul 2012)
New Revision: 42431
Added:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java
Modified:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss71ServerRuntime.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
Log:
JBIDE-12229 to maintenance
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-07-06 02:19:16 UTC (rev 42430)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-07-06 04:45:22 UTC (rev 42431)
@@ -49,6 +49,7 @@
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.JavaUtils;
public class LocalJBossServerRuntime extends AbstractLocalJBossServerRuntime implements IJBossServerRuntime {
@@ -125,7 +126,7 @@
String name = getRuntime().getName();
String ret = QUOTE + SYSPROP + PROGRAM_NAME_ARG + EQ +
"JBossTools: " + name + QUOTE + SPACE; //$NON-NLS-1$
- if( Platform.getOS().equals(Platform.OS_MACOSX))
+ if( JavaUtils.supportsServerMode(getVM()))
ret += SERVER_ARG + SPACE;
IRuntimeType type = getRuntime().getRuntimeType();
if (type != null &&
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss71ServerRuntime.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss71ServerRuntime.java 2012-07-06 02:19:16 UTC (rev 42430)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss71ServerRuntime.java 2012-07-06 04:45:22 UTC (rev 42431)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.JavaUtils;
public class LocalJBoss71ServerRuntime extends LocalJBoss7ServerRuntime implements IJBossRuntimeConstants {
public static final String CONFIG_FILE = "org.jboss.ide.eclipse.as.core.server.internal.v7.CONFIG_FILE"; //$NON-NLS-1$
@@ -31,7 +32,8 @@
IJBossRuntimeResourceConstants c = new IJBossRuntimeResourceConstants() {};
IPath bootLog = serverHome.append(c.AS7_STANDALONE).append(c.FOLDER_LOG).append(c.AS7_BOOT_LOG);
IPath logConfig = serverHome.append(c.AS7_STANDALONE).append(c.CONFIGURATION).append(c.LOGGING_PROPERTIES);
- return SERVER_ARG
+ String serverArg =JavaUtils.supportsServerMode(getVM()) ? SERVER_ARG : ""; //$NON-NLS-1$
+ return serverArg
+ " -Xms64m" //$NON-NLS-1$
+ " -Xmx512m" //$NON-NLS-1$
+ " -XX:MaxPermSize=256m" //$NON-NLS-1$
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-07-06 02:19:16 UTC (rev 42430)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-07-06 04:45:22 UTC (rev 42431)
@@ -21,6 +21,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.JavaUtils;
public class LocalJBoss7ServerRuntime extends LocalJBossServerRuntime implements IJBossRuntimeConstants {
public static final String CONFIG_FILE = "org.jboss.ide.eclipse.as.core.server.internal.v7.CONFIG_FILE"; //$NON-NLS-1$
@@ -57,7 +58,8 @@
IJBossRuntimeResourceConstants c = new IJBossRuntimeResourceConstants() {};
IPath bootLog = serverHome.append(c.AS7_STANDALONE).append(c.FOLDER_LOG).append(c.AS7_BOOT_LOG);
IPath logConfig = serverHome.append(c.AS7_STANDALONE).append(c.CONFIGURATION).append(c.LOGGING_PROPERTIES);
- return SERVER_ARG
+ String serverArg =JavaUtils.supportsServerMode(getVM()) ? SERVER_ARG : ""; //$NON-NLS-1$
+ return serverArg
+ " -Xms64m" //$NON-NLS-1$
+ " -Xmx512m" //$NON-NLS-1$
+ " -XX:MaxPermSize=256m" //$NON-NLS-1$
Added: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java (rev 0)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JavaUtils.java 2012-07-06 04:45:22 UTC (rev 42431)
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.util;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.IVMInstall2;
+
+public class JavaUtils {
+ public static boolean supportsServerMode(IVMInstall install) {
+ File f = install.getInstallLocation();
+ String version = (install instanceof IVMInstall2 ? ((IVMInstall2)install).getJavaVersion() : null);
+
+ // Maintain legacy behaviour for all older server adapters
+ if( version == null || Platform.getOS().equals(Platform.OS_MACOSX))
+ return true;
+
+ File libFolder = null;
+ if( Platform.getOS().equals(Platform.OS_WIN32))
+ libFolder = getWindowsServerLibFolder(version, install);
+ else
+ libFolder = getLinuxServerLibFolder(version, install);
+ if( libFolder != null && libFolder.exists() &&
+ libFolder.isDirectory() && libFolder.list().length > 0)
+ return true;
+ return false;
+ }
+
+ private static File getLinuxServerLibFolder(String version, IVMInstall install) {
+ File serverFolder = null;
+ IPath locPath = new Path(install.getInstallLocation().getAbsolutePath());
+ if( version.startsWith("1.7.")) //$NON-NLS-1$
+ serverFolder = findServerFolder(locPath.append("jre").append("lib")); //$NON-NLS-1$ //$NON-NLS-2$
+ return serverFolder;
+ }
+
+ private static File findServerFolder(IPath parent) {
+ File f = parent.toFile();
+ if( !f.exists())
+ return null;
+ File[] children = f.listFiles();
+ for( int i = 0; i < children.length; i++ ) {
+ if( children[i].isDirectory() ) {
+ String[] second = children[i].list();
+ for( int j = 0; j < second.length; j++ ) {
+ if( second[j].toLowerCase().equals("server")) //$NON-NLS-1$
+ return new File(children[i], second[j]);
+ }
+ }
+ }
+ return null;
+ }
+
+ private static File getWindowsServerLibFolder(String version, IVMInstall install) {
+ IPath locPath = new Path(install.getInstallLocation().getAbsolutePath());
+ return locPath.append("jre").append("bin").append("server").toFile(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+}
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r42430 - in trunk/forge/docs/reference/en-US: images/using_forge and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-05 22:19:16 -0400 (Thu, 05 Jul 2012)
New Revision: 42430
Added:
trunk/forge/docs/reference/en-US/images/using_forge/using_forge_08.png
trunk/forge/docs/reference/en-US/images/using_forge/using_forge_09.png
Modified:
trunk/forge/docs/reference/en-US/Book_Info.xml
trunk/forge/docs/reference/en-US/General_Commands.xml
trunk/forge/docs/reference/en-US/Using_Forge.xml
Log:
updated with new information on context-menu from explorer
Modified: trunk/forge/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/forge/docs/reference/en-US/Book_Info.xml 2012-07-06 01:59:48 UTC (rev 42429)
+++ trunk/forge/docs/reference/en-US/Book_Info.xml 2012-07-06 02:19:16 UTC (rev 42430)
@@ -13,7 +13,7 @@
<edition>5.0.1</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>4</pubsnumber>
<abstract>
<para>
Modified: trunk/forge/docs/reference/en-US/General_Commands.xml
===================================================================
--- trunk/forge/docs/reference/en-US/General_Commands.xml 2012-07-06 01:59:48 UTC (rev 42429)
+++ trunk/forge/docs/reference/en-US/General_Commands.xml 2012-07-06 02:19:16 UTC (rev 42430)
@@ -46,7 +46,7 @@
</mediaobject>
</figure>
</section>
- <section>
+ <section id="chap-Forge_Reference_Guide-General_commands-pickup_command">
<title>The pick-up command</title>
<para>
The command <code>pick-up</code> allows you to view the contents of a directory or navigate to a file and automatically open it.
Modified: trunk/forge/docs/reference/en-US/Using_Forge.xml
===================================================================
--- trunk/forge/docs/reference/en-US/Using_Forge.xml 2012-07-06 01:59:48 UTC (rev 42429)
+++ trunk/forge/docs/reference/en-US/Using_Forge.xml 2012-07-06 02:19:16 UTC (rev 42430)
@@ -99,6 +99,38 @@
</mediaobject>
</figure>
<para>
+ If you find it easier to navigate your project via the <guilabel>Project Explorer</guilabel> view, you can right-click on a file from this view and select <menuchoice><guimenuitem>Show In</guimenuitem><guimenuitem>Forge Console</guimenuitem></menuchoice> from the context menu.
+ </para>
+ <figure id="using_forge_08">
+ <title>Opening a file in Forge from the Project Explorer</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/using_forge/using_forge_08.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Opening a file in Forge from the Project Explorer.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ This will automatically execute the <code>pick-up</code> command, changing the current Forge runtime context to the selected resource and opening the file or folder. For more on this command see: <xref linkend="chap-Forge_Reference_Guide-General_commands-pickup_command"/>
+ </para>
+ <figure id="using_forge_09">
+ <title>Executing the menu option on a file</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/using_forge/using_forge_09.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Having executed the menu option on a file, the file is now opened in an editor and the Forge runtime context has changed.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
If you close the <guilabel>Forge Console</guilabel> view, Forge will continue to run in the background. Re-opeing the <guilabel>Forge Console</guilabel> view will display the latest Forge state.
</para>
<para>
Added: trunk/forge/docs/reference/en-US/images/using_forge/using_forge_08.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/using_forge/using_forge_08.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/using_forge/using_forge_09.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/using_forge/using_forge_09.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r42429 - in trunk/forge/docs/reference/en-US: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-05 21:59:48 -0400 (Thu, 05 Jul 2012)
New Revision: 42429
Added:
trunk/forge/docs/reference/en-US/General_Commands.xml
trunk/forge/docs/reference/en-US/images/general_commands/
trunk/forge/docs/reference/en-US/images/general_commands/general_commands_01.png
trunk/forge/docs/reference/en-US/images/general_commands/general_commands_02.png
trunk/forge/docs/reference/en-US/images/general_commands/general_commands_03.png
trunk/forge/docs/reference/en-US/images/general_commands/general_commands_04.png
Modified:
trunk/forge/docs/reference/en-US/Book_Info.xml
trunk/forge/docs/reference/en-US/Forge_Reference_Guide.xml
trunk/forge/docs/reference/en-US/Project_Commands.xml
trunk/forge/docs/reference/en-US/master.xml
Log:
updated with new chapter on general forge commands
Modified: trunk/forge/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/forge/docs/reference/en-US/Book_Info.xml 2012-07-06 01:11:05 UTC (rev 42428)
+++ trunk/forge/docs/reference/en-US/Book_Info.xml 2012-07-06 01:59:48 UTC (rev 42429)
@@ -13,7 +13,7 @@
<edition>5.0.1</edition>
- <pubsnumber>2</pubsnumber>
+ <pubsnumber>3</pubsnumber>
<abstract>
<para>
Modified: trunk/forge/docs/reference/en-US/Forge_Reference_Guide.xml
===================================================================
--- trunk/forge/docs/reference/en-US/Forge_Reference_Guide.xml 2012-07-06 01:11:05 UTC (rev 42428)
+++ trunk/forge/docs/reference/en-US/Forge_Reference_Guide.xml 2012-07-06 01:59:48 UTC (rev 42429)
@@ -7,6 +7,7 @@
<xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Using_Forge.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Project_Commands.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="General_Commands.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Preferences.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Added: trunk/forge/docs/reference/en-US/General_Commands.xml
===================================================================
--- trunk/forge/docs/reference/en-US/General_Commands.xml (rev 0)
+++ trunk/forge/docs/reference/en-US/General_Commands.xml 2012-07-06 01:59:48 UTC (rev 42429)
@@ -0,0 +1,100 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+ <chapter id="chap-Forge_Reference_Guide-General_commands">
+ <title>General commands</title>
+ <para>
+ Outlined in this chapter are general commands for interacting with the Forge runtime, your projects and the workspace.
+ </para>
+ <section>
+ <title>Opening a file or folder</title>
+ <para>
+ The command <code>open</code> allows you to open a file or folder.
+ </para>
+ <para>
+ The format of the command is:
+ </para>
+<programlisting>
+open foo/pom.xml
+</programlisting>
+ <figure id="general_commands_01">
+ <title>open command execution</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/general_commands/general_commands_01.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Execution of the open command.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Using the command to open a file will open it in an editor. Executing the command on a folder in your workspace will expanded the folder in the Project Explorer view. If the resource is a folder outside the workspace it will be selected and expanded in the Remote Systems view.
+ </para>
+ <figure id="general_commands_02">
+ <title>File opened</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/general_commands/general_commands_02.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Having executed the command on a file, it is opened in its respective editor.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section>
+ <title>The pick-up command</title>
+ <para>
+ The command <code>pick-up</code> allows you to view the contents of a directory or navigate to a file and automatically open it.
+ </para>
+ <para>
+ The format of the command for a directory is:
+ </para>
+<programlisting>
+pick-up foo/
+</programlisting>
+ <para>
+ Executing the command on a directory will write the contents of the directory to the screen.
+ </para>
+ <figure id="general_commands_03">
+ <title>open command execution</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/general_commands/general_commands_03.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Execution of the open command.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The format of the command for a file is:
+ </para>
+<programlisting>
+pick-up foo/pom.xml
+</programlisting>
+ <para>
+ Using the command to open a file will open it in an editor.
+ </para>
+ <figure id="general_commands_04">
+ <title>File opened</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/general_commands/general_commands_04.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Having executed the command on a file, it is opened in its respective editor.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </section>
+</chapter>
+
Modified: trunk/forge/docs/reference/en-US/Project_Commands.xml
===================================================================
--- trunk/forge/docs/reference/en-US/Project_Commands.xml 2012-07-06 01:11:05 UTC (rev 42428)
+++ trunk/forge/docs/reference/en-US/Project_Commands.xml 2012-07-06 01:59:48 UTC (rev 42429)
@@ -3,7 +3,7 @@
<chapter id="chap-Forge_Reference_Guide-Project_commands">
<title>Project commands</title>
<para>
- Outlined in this chapter are the commands you will use most often when interacting with the Forge runtime.
+ Outlined in this chapter are the commands you will use most often when developing projects with the Forge runtime.
</para>
<section>
<title>Creating a new project</title>
Added: trunk/forge/docs/reference/en-US/images/general_commands/general_commands_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/general_commands/general_commands_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/general_commands/general_commands_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/general_commands/general_commands_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/general_commands/general_commands_03.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/general_commands/general_commands_03.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/general_commands/general_commands_04.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/general_commands/general_commands_04.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/forge/docs/reference/en-US/master.xml
===================================================================
--- trunk/forge/docs/reference/en-US/master.xml 2012-07-06 01:11:05 UTC (rev 42428)
+++ trunk/forge/docs/reference/en-US/master.xml 2012-07-06 01:59:48 UTC (rev 42429)
@@ -6,6 +6,7 @@
<!ENTITY Introduction SYSTEM "Introduction.xml">
<!ENTITY UsingForge SYSTEM "Using_Forge.xml">
<!ENTITY ProjectCommands SYSTEM "Project_Commands.xml">
+<!ENTITY GeneralCommands SYSTEM "General_Commands.xml">
<!ENTITY Preferences SYSTEM "Preferences.xml">
]>
@@ -43,6 +44,7 @@
&Introduction;
&UsingForge;
&ProjectCommands;
+ &GeneralCommands;
&Preferences;
</book>
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r42428 - in trunk/forge/docs/reference/en-US: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-05 21:11:05 -0400 (Thu, 05 Jul 2012)
New Revision: 42428
Added:
trunk/forge/docs/reference/en-US/Project_Commands.xml
trunk/forge/docs/reference/en-US/images/project_commands/
trunk/forge/docs/reference/en-US/images/project_commands/project_commands_01.png
trunk/forge/docs/reference/en-US/images/project_commands/project_commands_02.png
trunk/forge/docs/reference/en-US/images/project_commands/project_commands_03.png
trunk/forge/docs/reference/en-US/images/project_commands/project_commands_04.png
trunk/forge/docs/reference/en-US/images/project_commands/project_commands_05.png
trunk/forge/docs/reference/en-US/images/project_commands/project_commands_06.png
trunk/forge/docs/reference/en-US/images/project_commands/project_commands_07.png
trunk/forge/docs/reference/en-US/images/project_commands/project_commands_08.png
Modified:
trunk/forge/docs/reference/en-US/Book_Info.xml
trunk/forge/docs/reference/en-US/Forge_Reference_Guide.xml
trunk/forge/docs/reference/en-US/master.xml
Log:
updated to include new chapter on commands for projects
Modified: trunk/forge/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/forge/docs/reference/en-US/Book_Info.xml 2012-07-06 00:22:57 UTC (rev 42427)
+++ trunk/forge/docs/reference/en-US/Book_Info.xml 2012-07-06 01:11:05 UTC (rev 42428)
@@ -13,7 +13,7 @@
<edition>5.0.1</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>
Modified: trunk/forge/docs/reference/en-US/Forge_Reference_Guide.xml
===================================================================
--- trunk/forge/docs/reference/en-US/Forge_Reference_Guide.xml 2012-07-06 00:22:57 UTC (rev 42427)
+++ trunk/forge/docs/reference/en-US/Forge_Reference_Guide.xml 2012-07-06 01:11:05 UTC (rev 42428)
@@ -6,6 +6,7 @@
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Using_Forge.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Project_Commands.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Preferences.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Added: trunk/forge/docs/reference/en-US/Project_Commands.xml
===================================================================
--- trunk/forge/docs/reference/en-US/Project_Commands.xml (rev 0)
+++ trunk/forge/docs/reference/en-US/Project_Commands.xml 2012-07-06 01:11:05 UTC (rev 42428)
@@ -0,0 +1,173 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+ <chapter id="chap-Forge_Reference_Guide-Project_commands">
+ <title>Project commands</title>
+ <para>
+ Outlined in this chapter are the commands you will use most often when interacting with the Forge runtime.
+ </para>
+ <section>
+ <title>Creating a new project</title>
+ <para>
+ The command <code>new-project</code> allows you to create a new project and have it automatically imported into your workspace.
+ </para>
+ <para>
+ The format of the command is:
+ </para>
+<programlisting>
+new-project --named example --topLevelPackage com.example
+</programlisting>
+ <figure id="project_commands_01">
+ <title>new-project command execution</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/project_commands/project_commands_01.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Execution of the new-project command.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Once the command has been executed, the new project will appear in your <guilabel>Project Explorer</guilabel>.
+ </para>
+ <figure id="project_commands_02">
+ <title>New project in Project Explorer</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/project_commands/project_commands_02.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Your new project has automatically appeared in the Project Explorer.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section>
+ <title>Adding persistence</title>
+ <para>
+ Persistence can be added to a project through the use of the command <code>persistence setup</code>.
+ </para>
+ <para>
+ The format of the command is:
+ </para>
+<programlisting>
+persistence setup --provider HIBERNATE --container JBOSS_AS6
+</programlisting>
+ <figure id="project_commands_03">
+ <title>persistence setup command execution</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/project_commands/project_commands_03.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Execution of the persistence setup command.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Once the command has been executed a new file will have been created called <filename>persistence.xml</filename>. The file will appear under your project in the <guilabel>Project Explorer</guilabel>, and will automatically open in an editor.
+ </para>
+ <figure id="project_commands_04">
+ <title>persistence.xml file open in an editor</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/project_commands/project_commands_04.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Your new persistence file has automatically been opened for editing.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section>
+ <title>Creating a new entity</title>
+ <para>
+ A new entity can be created for a project by using the command <code>entity</code>.
+ </para>
+ <para>
+ The format of the command is:
+ </para>
+<programlisting>
+entity --named Customer
+</programlisting>
+ <figure id="project_commands_05">
+ <title>entity command execution</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/project_commands/project_commands_05.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Execution of the entity command.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Once the command has been executed a new entity will have been created. The entity will appear under your project's domain in the <guilabel>Project Explorer</guilabel>, and the Java file will automatically open in an editor.
+ </para>
+ <figure id="project_commands_06">
+ <title>Entity Java file open in an editor</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/project_commands/project_commands_06.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Your new entity has automatically been opened for editing.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section>
+ <title>Creating a new field</title>
+ <para>
+ A new field can be created for an entity by using the command <code>field string</code>.
+ </para>
+ <para>
+ The format of the command is:
+ </para>
+<programlisting>
+field string --named firstName
+</programlisting>
+ <figure id="project_commands_07">
+ <title>field string command execution</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/project_commands/project_commands_07.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Execution of the field string command.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Once the command has been executed a new field will have been created in the selected entity. The field will appear in the Java editor and in the <guilabel>Outline</guilabel> view.
+ </para>
+ <figure id="project_commands_08">
+ <title>Field entry displayed in the entity file, within the Java editor</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/project_commands/project_commands_08.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Your new field has been added to your entity file.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </section>
+</chapter>
+
Added: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_02.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_02.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_03.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_03.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_04.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_04.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_05.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_05.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_06.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_06.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_07.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_07.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_08.png
===================================================================
(Binary files differ)
Property changes on: trunk/forge/docs/reference/en-US/images/project_commands/project_commands_08.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/forge/docs/reference/en-US/master.xml
===================================================================
--- trunk/forge/docs/reference/en-US/master.xml 2012-07-06 00:22:57 UTC (rev 42427)
+++ trunk/forge/docs/reference/en-US/master.xml 2012-07-06 01:11:05 UTC (rev 42428)
@@ -5,6 +5,7 @@
[
<!ENTITY Introduction SYSTEM "Introduction.xml">
<!ENTITY UsingForge SYSTEM "Using_Forge.xml">
+<!ENTITY ProjectCommands SYSTEM "Project_Commands.xml">
<!ENTITY Preferences SYSTEM "Preferences.xml">
]>
@@ -41,6 +42,7 @@
<toc/>
&Introduction;
&UsingForge;
+ &ProjectCommands;
&Preferences;
</book>
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r42427 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-05 20:22:57 -0400 (Thu, 05 Jul 2012)
New Revision: 42427
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
Log:
JBIDE-3526
https://issues.jboss.org/browse/JBIDE-3526
Synchronized methods tha work with collections.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2012-07-06 00:13:30 UTC (rev 42426)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2012-07-06 00:22:57 UTC (rev 42427)
@@ -36,7 +36,7 @@
* @see org.jboss.tools.common.el.core.resolver.ELContext#getVars()
*/
@Override
- public Var[] getVars() {
+ public synchronized Var[] getVars() {
List<Var> external = getExternalVars();
if(external.isEmpty()) {
return allVars.toArray(new Var[allVars.size()]);
@@ -64,7 +64,7 @@
* @param region
* @param vars
*/
- public void addVar(Region region, Var var) {
+ public synchronized void addVar(Region region, Var var) {
var.setRegion(region);
allVars.add(var);
}
@@ -74,7 +74,7 @@
* @see org.jboss.tools.common.el.core.resolver.ELContext#getVars(int)
*/
@Override
- public Var[] getVars(int offset) {
+ public synchronized Var[] getVars(int offset) {
if(offset<0) {
return getVars();
}
@@ -111,7 +111,7 @@
* @see org.jboss.tools.jst.web.kb.IXmlContext#getELReferences()
*/
@Override
- public ELReference[] getELReferences() {
+ public synchronized ELReference[] getELReferences() {
if(elReferences==null) {
if(elReferenceSet==null || elReferenceSet.isEmpty()) {
return EMPTY_ARRAY;
@@ -121,7 +121,7 @@
return elReferences;
}
- public void addELReference(ELReference reference) {
+ public synchronized void addELReference(ELReference reference) {
if(elReferenceSet==null) {
elReferenceSet = new ArrayList<ELReference>();
}
@@ -133,7 +133,7 @@
* @see org.jboss.tools.common.el.core.resolver.SimpleELContext#getELReference(int)
*/
@Override
- public ELReference getELReference(int offset) {
+ public synchronized ELReference getELReference(int offset) {
if(elReferenceSet != null) {
for (ELReference ref: elReferenceSet) {
if(ref.getStartPosition()<=offset && (ref.getStartPosition() + ref.getLength()>offset)) {
@@ -145,7 +145,7 @@
}
@Override
- public Set<ELReference> getELReferences(IRegion region) {
+ public synchronized Set<ELReference> getELReferences(IRegion region) {
Set<ELReference> references = new HashSet<ELReference>();
if(elReferenceSet != null) {
for (ELReference ref: elReferenceSet) {
13 years, 9 months
- 1
- 0
JBoss Tools SVN: r42426 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: projects/TestKbModel/WebContent/pages/params and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-05 20:13:30 -0400 (Thu, 05 Jul 2012)
New Revision: 42426
Added:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/page1.xhtml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/page2.xhtml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/template.xhtml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/IncludeModelTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
Log:
JBIDE-3526
https://issues.jboss.org/browse/JBIDE-3526
Test is added.
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/page1.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/page1.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/page1.xhtml 2012-07-06 00:13:30 UTC (rev 42426)
@@ -0,0 +1,14 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <ui:include src="/pages/params/template.xhtml">
+ <ui:param name="param11" value="#{bean1}"/>
+ <ui:param name="param12" value="#{bean2}"/>
+ </ui:include>
+</html>
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/page2.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/page2.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/page2.xhtml 2012-07-06 00:13:30 UTC (rev 42426)
@@ -0,0 +1,17 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich">
+ <ui:decorate template="/pages/params/template.xhtml">
+ <ui:param name="param21" value="#{bean3}"/>
+ <ui:param name="param22" value="#{bean4}"/>
+ </ui:decorate>
+ <ui:composition template="/pages/params/template.xhtml">
+ <ui:param name="param31" value="#{bean5}"/>
+ <ui:param name="param32" value="#{bean6}"/>
+ </ui:composition>
+</html>
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/template.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/template.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/params/template.xhtml 2012-07-06 00:13:30 UTC (rev 42426)
@@ -0,0 +1,9 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich">
+</html>
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/IncludeModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/IncludeModelTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/IncludeModelTest.java 2012-07-06 00:13:30 UTC (rev 42426)
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.kb.test;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.common.el.core.resolver.Var;
+import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.PageContextFactory;
+import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations;
+import org.jboss.tools.jst.web.kb.internal.scanner.ScannerException;
+import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner;
+import org.jboss.tools.jst.web.kb.internal.taglib.ELFunction;
+import org.jboss.tools.jst.web.kb.taglib.IELFunction;
+import org.jboss.tools.jst.web.kb.taglib.IFunctionLibrary;
+import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+import org.jboss.tools.test.util.JUnitUtils;
+
+public class IncludeModelTest extends TestCase {
+ IProject project = null;
+ boolean makeCopy = true;
+
+ public IncludeModelTest() {
+ super("Kb Include Model Test");
+ }
+
+ public void setUp() throws Exception {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestKbModel");
+ assertNotNull("Can't load TestKbModel", project); //$NON-NLS-1$
+ }
+
+ private IKbProject getKbProject() {
+ IKbProject kbProject = null;
+ try {
+ kbProject = (IKbProject)project.getNature(IKbProject.NATURE_ID);
+ } catch (Exception e) {
+ JUnitUtils.fail("Cannot get seam nature.",e);
+ }
+ return kbProject;
+ }
+
+ public void testIncludeModel() {
+ IKbProject kbProject = getKbProject();
+
+ IFile f = project.getFile("WebContent/pages/params/page1.xhtml");
+ assertTrue(f.exists());
+ PageContextFactory.createPageContext(f);
+
+ f = project.getFile("WebContent/pages/params/page2.xhtml");
+ assertTrue(f.exists());
+ PageContextFactory.createPageContext(f);
+
+ List<Var> vars = kbProject.getIncludeModel().getVars(new Path("/TestKbModel/WebContent/pages/params/template.xhtml"));
+ assertEquals(6, vars.size());
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/IncludeModelTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2012-07-05 23:35:06 UTC (rev 42425)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2012-07-06 00:13:30 UTC (rev 42426)
@@ -35,6 +35,7 @@
suiteAll.addTest(testSetup);
suite = new TestSuite(JstWebKbAllTests.class.getName());
suite.addTestSuite(KbModelTest.class);
+ suite.addTestSuite(IncludeModelTest.class);
suite.addTestSuite(MyFacesKbModelTest.class);
suite.addTestSuite(KbMockModelTest.class);
suite.addTestSuite(MyFacesKbModelWithMetadataInSourcesTest.class);
13 years, 9 months
- 1
- 0