JBoss Tools SVN: r6755 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2008-03-07 03:41:28 -0500 (Fri, 07 Mar 2008)
New Revision: 6755
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1830
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2008-03-07 08:41:09 UTC (rev 6754)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2008-03-07 08:41:28 UTC (rev 6755)
@@ -44,8 +44,12 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
@@ -65,9 +69,9 @@
import org.hibernate.eclipse.hqleditor.HQLEditorInput;
import org.hibernate.eclipse.hqleditor.HQLEditorStorage;
import org.hibernate.eclipse.launch.ICodeGenerationLaunchConstants;
+import org.hibernate.eclipse.logging.PluginLogger;
import org.hibernate.eclipse.logging.xpl.EclipseLogger;
import org.osgi.framework.BundleContext;
-import org.hibernate.eclipse.logging.PluginLogger;
/**
* The main plugin class to be used in the desktop.
@@ -464,19 +468,17 @@
}
}
- public void openScratchHQLEditor(String consoleName, String hql) {
+ public IEditorPart openScratchHQLEditor(String consoleName, String hql) {
try {
- final IWorkbenchWindow activeWorkbenchWindow =
- PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IWorkbenchPage page = activeWorkbenchWindow.getActivePage();
+ IWorkbenchPage page = getActiveWorkbenchWindow().getActivePage();
-
HQLEditorStorage storage = new HQLEditorStorage(consoleName, hql==null?"":hql);
final HQLEditorInput editorInput = new HQLEditorInput(storage);
- page.openEditor(editorInput, "org.hibernate.eclipse.hqleditor.HQLEditor", true);
+ return page.openEditor(editorInput, "org.hibernate.eclipse.hqleditor.HQLEditor", true);
} catch (PartInitException ex) {
logErrorMessage("Could not open HQL editor for console:" + consoleName, ex);
+ return null;
}
}
@@ -640,7 +642,20 @@
public JavaTextTools getJavaTextTools() {
if (javaTextTools == null) {
- javaTextTools = new JavaTextTools(PreferenceConstants.getPreferenceStore());
+ javaTextTools = new JavaTextTools(PreferenceConstants.getPreferenceStore()){
+ public void setupJavaDocumentPartitioner(IDocument document, String partitioning) {
+ IDocumentPartitioner partitioner= createDocumentPartitioner();
+ if (document instanceof IDocumentExtension3) {
+ IDocumentExtension3 extension3= (IDocumentExtension3) document;
+ partitioner.connect(document);
+ extension3.setDocumentPartitioner(partitioning, partitioner);
+ } else {
+ document.setDocumentPartitioner(partitioner);
+ partitioner.connect(document);
+ }
+
+ }
+ };
}
return javaTextTools;
16 years, 3 months
JBoss Tools SVN: r6754 - trunk/documentation/guides/userguide/GettingStartedGuide/en/modules.
by jbosstools-commits@lists.jboss.org
Author: ykryvinchanka
Date: 2008-03-07 03:41:09 -0500 (Fri, 07 Mar 2008)
New Revision: 6754
Modified:
trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/getting_started.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-235 comments added
Modified: trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/getting_started.xml
===================================================================
--- trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/getting_started.xml 2008-03-07 00:32:08 UTC (rev 6753)
+++ trunk/documentation/guides/userguide/GettingStartedGuide/en/modules/getting_started.xml 2008-03-07 08:41:09 UTC (rev 6754)
@@ -18,8 +18,11 @@
required to use JBoss Developer Studio to develop on JBoss Enterprise Middleware and/or Red Hat
Linux. But, many find these pre-configured tools offer significant time-savings and value, making
them more productive and speeding time to deployment.</para>
+ <para>This guide covers the first steps to get started with JBoss Developer Studio. You will learn how to install
+ and configure necessary software for your operating system. Thus Getting Started guide will
+ provide you with detailed information on how to start JDK, JBDS and JBoss Tools.</para>
</section>
-
+
<section id="ConfigJavaEnvironment">
<?dbhtml filename="ConfigJavaEnvironment.html"?>
<title>Configuring Your Java Environment</title>
@@ -163,32 +166,48 @@
<para>To do this, open the Control Panel from the Start Menu, switch to Classic View if
necessary, open the System Control Panel applet (System), select the Advanced Tab, and click on
the Environment Variables button.</para>
- <para>Now, when 32-bit Sun JDK 5.0 has been successfully installed, we can pass on to the next step.</para>
+ <para>Now, when 32-bit Sun JDK 5.0 has been successfully installed, we can pass on to the next
+ step.</para>
</section>
-
+
</section>
-
+
<section id="InstallingJBDS">
<?dbhtml filename="InstallingRHDS.html"?>
<title>JBoss Developer Studio Installation</title>
- <para>This chapter will provide you with detailed information on how to install JBoss Developer Studio and all the JBoss Tools modules.</para>
-
- <section id="Instfromdownver">
+ <para>This chapter will provide you with detailed information on how to install JBoss Developer
+ Studio and all the JBoss Tools modules.</para>
+
+ <section id="Instfromdownver">
<title>Installing from the downloaded version</title>
<para>Let's start with the JBDS installation.</para>
<para>JBDS comes with a simple installer, bundled with tested/pre-configured versions of Eclipse,
WTP, JBossEAP, Seam, and SpringIDE. Thus, to start perform the next steps:</para>
<itemizedlist>
+
<listitem>
<para>Download the appropriate installation file for your platform from <ulink
- url="http://www.jboss.com/products/devstudio">Red Hat website</ulink>.</para>
+ url="http://www.jboss.com/products/devstudio">Red Hat website</ulink>.</para>
</listitem>
+
<listitem>
<para>Run in console:</para>
<programlisting role="JAVA"><![CDATA[java -jar jbdevstudio-linux-gtk-1.0.0.GA.jar
]]></programlisting>
+ <!--<tip>
+ <title>Tip:</title>
+ <para>Also you are allowed to run installation file by right click on it and choose <emphasis>
+ <property>Open with Other Application...</property>
+ </emphasis> option from the pop-up menu. Select <emphasis>
+ <property>Use a custom command</property>
+ </emphasis> at the bottom of the <property>Open With</property> window and type <emphasis>
+ java -jar jbdevstudio-linux-gtk-1.0.0.GA.jar</emphasis>. Click <emphasis>
+ <property>Ok</property>
+ </emphasis> button.</para>
+ </tip> -->
</listitem>
+
<listitem>
<para>Follow the instructions presented by the installation wizard</para>
</listitem>
@@ -236,7 +255,9 @@
<itemizedlist>
<listitem>
- <para>Installation process includes <ulink url="http://www.jboss.com/products/platforms/application">JBoss Enterprise Application Platform</ulink>. Select <emphasis>
+ <para>Installation process includes <ulink
+ url="http://www.jboss.com/products/platforms/application">JBoss Enterprise Application
+ Platform</ulink>. Select <emphasis>
<property>Yes</property>
</emphasis> to use it in JBoss Developer Studio.</para>
</listitem>
@@ -260,8 +281,12 @@
<itemizedlist>
<listitem>
- <para>Check your installation paths and see the components to install. If you'd like to change something, press <emphasis><property>Previous</property></emphasis> button. Click <emphasis>
- <property>Next</property></emphasis> to start installation. </para>
+ <para>Check your installation paths and see the components to install. If you'd like to change
+ something, press <emphasis>
+ <property>Previous</property>
+ </emphasis> button. Click <emphasis>
+ <property>Next</property>
+ </emphasis> to start installation. </para>
</listitem>
</itemizedlist>
@@ -275,11 +300,12 @@
</figure>
</section>
-
+
<section id="WhatDifferenceBetweenJBDSAndJBossTools">
<title>What is the difference between JBoss Developer Studio and JBoss Tools</title>
- <para>This release of JBoss Tools is what went into our JBoss Developer Studio which provides an easy-to-install Eclipse
- based IDE fully configured and ready to run with the bundled JBoss Enterprise Application Platform.</para>
+ <para>This release of JBoss Tools is what went into our JBoss Developer Studio which provides an
+ easy-to-install Eclipse based IDE fully configured and ready to run with the bundled JBoss
+ Enterprise Application Platform.</para>
<para>In short JBoss Tools are just a set of Eclipse plugins and JBoss Developer Studio adds:</para>
<itemizedlist>
<listitem>
@@ -301,68 +327,77 @@
<para>Access to the JBoss/Red Hat supported software</para>
</listitem>
</itemizedlist>
- <para> For additional information see <ulink url="http://www.jboss.com/products/devstudio">JBoss.com</ulink></para>
-
+ <para> For additional information see <ulink url="http://www.jboss.com/products/devstudio"
+ >JBoss.com</ulink></para>
+
<section id="JBossToolsInstall">
- <title>JBoss Tools Installation</title>
- <para>Here, let's consider the installation of the JBoss Tools modules.</para>
- <para>JBoss Tools is an umbrella project for the JBoss developed plugins that will make it into
- JBoss Developer Studio. The JBoss Tools modules are:</para>
- <itemizedlist>
- <listitem>
- <para>JBoss AS Tools</para>
- </listitem>
- <listitem>
- <para>Seam Tools</para>
- </listitem>
- <listitem>
- <para>Hibernate Tools</para>
- </listitem>
- <listitem>
- <para>Visual Page Editor</para>
- </listitem>
- <listitem>
- <para>JST Tools</para>
- </listitem>
- <listitem>
- <para>JBPM Tools</para>
- </listitem>
- </itemizedlist>
+ <title>JBoss Tools Installation</title>
+ <para>Here, let's consider the installation of the JBoss Tools modules.</para>
+ <para>JBoss Tools is an umbrella project for the JBoss developed plugins that will make it into
+ JBoss Developer Studio. The JBoss Tools modules are:</para>
+ <itemizedlist>
+ <listitem>
+ <para>JBoss AS Tools</para>
+ </listitem>
+ <listitem>
+ <para>Seam Tools</para>
+ </listitem>
+ <listitem>
+ <para>Hibernate Tools</para>
+ </listitem>
+ <listitem>
+ <para>Visual Page Editor</para>
+ </listitem>
+ <listitem>
+ <para>JST Tools</para>
+ </listitem>
+ <listitem>
+ <para>JBPM Tools</para>
+ </listitem>
+ </itemizedlist>
- <para>To install the JBoss Tools plugins for Eclipse, you need the following:</para>
-
+ <para>To install the JBoss Tools plugins for Eclipse, you need the following:</para>
+
<itemizedlist>
- <listitem>
- <para>Get Eclipse 3.3.1 and Web Tools 2.0.1</para>
- </listitem>
- </itemizedlist>
- <para>The quickest way to get a WTP version is to download "Eclipse IDE for Java EE Developers"
- via <ulink url="http://www.eclipse.org">www.eclipse.org</ulink>.</para>
- <note><title>Note:</title><para>Remember to choose the download that matches your OS and use Java 5 when you run it.</para></note>
- <itemizedlist>
<listitem>
- <para>Get the <ulink url="http://labs.jboss.com/tools/download/index.html">JBoss Tools build</ulink></para>
+ <para>Get Eclipse 3.3.1 and Web Tools 2.0.1</para>
</listitem>
- </itemizedlist>
- <para>You can also find the latest development release of JBossTools from <ulink url="http://download.jboss.org/jbosstools/updates/stable/">JBossTools Stable Update Site</ulink></para>
- <itemizedlist>
+ </itemizedlist>
+ <para>The quickest way to get a WTP version is to download "Eclipse IDE for Java EE Developers"
+ via <ulink url="http://www.eclipse.org">www.eclipse.org</ulink>.</para>
+ <note>
+ <title>Note:</title>
+ <para>Remember to choose the download that matches your OS and use Java 5 when you run
+ it.</para>
+ </note>
+ <itemizedlist>
<listitem>
- <para>Finally, install the build</para>
- </listitem>
- </itemizedlist>
-
+ <para>Get the <ulink url="http://labs.jboss.com/tools/download/index.html">JBoss Tools
+ build</ulink></para>
+ </listitem>
+ </itemizedlist>
+ <para>You can also find the latest development release of JBossTools from <ulink
+ url="http://download.jboss.org/jbosstools/updates/stable/">JBossTools Stable Update
+ Site</ulink></para>
+ <itemizedlist>
+ <listitem>
+ <para>Finally, install the build</para>
+ </listitem>
+ </itemizedlist>
+
<para>Unzip the file(s) directly into your Eclipse <emphasis>
- <property>plugins/features</property>
- </emphasis> directory and it will be readily available. It might be necessary to start Eclipse
- with eclipse -clean to make sure it starts clean and rereads the new list of plugins.</para>
+ <property>plugins/features</property>
+ </emphasis> directory and it will be readily available. It might be necessary to start Eclipse
+ with eclipse -clean to make sure it starts clean and rereads the new list of plugins.</para>
+ </section>
+
</section>
-
- </section>
</section>
<section id="Welcome">
<title>Welcome to JBoss Developer Studio</title>
- <para>In this section we'll show you how to work with the welcome page of the JBoss Developer Studio.</para>
+ <para>In this section we'll show you how to work with the welcome page of the JBoss Developer
+ Studio.</para>
<para>The welcome page is the first page you see when you first launch JBoss Developer Studio. </para>
<figure>
@@ -389,7 +424,8 @@
<itemizedlist>
<listitem>
- <para>to create new Seam projects, jBPM Process, JSF or Struts projects using JBDS wizards</para>
+ <para>to create new Seam projects, jBPM Process, JSF or Struts projects using JBDS
+ wizards</para>
</listitem>
</itemizedlist>
@@ -438,7 +474,7 @@
<title>Upgrading</title>
<para>To upgrade, just uninstall your current version and install the new one.</para>
</section>
-
+
<section id="Uninstalling">
<?dbhtml filename="Uninstalling.html"?>
<title>Uninstalling</title>
@@ -448,7 +484,7 @@
uninstaller</listitem>
</itemizedlist>
</section>
-
+
<section id="Support">
<?dbhtml filename="Support.html"?>
<title>Support</title>
@@ -468,7 +504,7 @@
</listitem>
</orderedlist>
</section>
-
+
<section id="FAQ">
<?dbhtml filename="FAQ.html"?>
<title>FAQ</title>
@@ -528,7 +564,8 @@
so that you don't need to download any additional software and can test your
application in a Web browser right away.</para>
<para>If you want to use a different JBoss server installation, after JBoss Developer Studio is
- installed open Servers View (select <emphasis><property>Window > Show View > Others > Server > Servers</property>),</emphasis> then right click on this <emphasis>
+ installed open Servers View (select <emphasis><property>Window > Show View >
+ Others > Server > Servers</property>),</emphasis> then right click on this <emphasis>
<property>view > New > Server</property>
</emphasis> and follow the wizards steps to point to another Jboss server installation.</para>
<para>JBoss Developer Studio works with any servlet container, not just JBoss. For more
@@ -537,17 +574,27 @@
<section id="Importing_Projects">
<title>Importing Projects</title>
<para>
- <emphasis role="bold">I have an existing Seam 1.2.1 project. Can I migrate/import the project to a JBDS Seam project?</emphasis>
+ <emphasis role="bold">I have an existing Seam 1.2.1 project. Can I migrate/import the project to
+ a JBDS Seam project?</emphasis>
</para>
- <para>We highly recommend you to create Seam 1.2.1 project using the JBDS. In other case try to do manually:</para>
+ <para>We highly recommend you to create Seam 1.2.1 project using the JBDS. In other case try to
+ do manually:</para>
<itemizedlist>
- <listitem><para>Create a Seam Web project to get the JBoss tools structure</para></listitem>
+ <listitem>
+ <para>Create a Seam Web project to get the JBoss tools structure</para>
+ </listitem>
</itemizedlist>
- <para>Then from your Seam 1.2.1 seam-gen project start doing the following:</para>
+ <para>Then from your Seam 1.2.1 seam-gen project start doing the following:</para>
<itemizedlist>
- <listitem><para>Copy <property>src</property> to <property>src</property></para></listitem>
- <listitem><para>Copy <property>view</property> to <property>Web content</property></para></listitem>
- <listitem><para>Copy resources individual files to where they are in the seam web project etc.</para></listitem>
+ <listitem>
+ <para>Copy <property>src</property> to <property>src</property></para>
+ </listitem>
+ <listitem>
+ <para>Copy <property>view</property> to <property>Web content</property></para>
+ </listitem>
+ <listitem>
+ <para>Copy resources individual files to where they are in the seam web project etc.</para>
+ </listitem>
</itemizedlist>
<para>
<emphasis role="bold">I have an existing Struts or JSF project. Can I open the project in
@@ -560,8 +607,8 @@
<para>
<emphasis role="bold">Can I import a .war file?</emphasis>
</para>
- <para>Yes. Select <emphasis><property>File > Import > Web > WAR file</property>,
- </emphasis> then follow importing steps.</para>
+ <para>Yes. Select <emphasis><property>File > Import > Web > WAR
+ file</property>, </emphasis> then follow importing steps.</para>
</section>
<section id="Troubleshooting">
<title>Troubleshooting, Problems, Configuration, Error Messages</title>
@@ -579,7 +626,9 @@
<para>
<emphasis role="bold">How can I add my own tag library to the JBoss Tools Palette?</emphasis>
</para>
- <para>See <ulink url="http://www.redhat.com/developer_studio/guides/jsf/html_single/#AddingJSFC...">Adding Tag Libraries</ulink> in Visual Web Tools Guide.</para>
+ <para>See <ulink
+ url="http://www.redhat.com/developer_studio/guides/jsf/html_single/#AddingJSFC..."
+ >Adding Tag Libraries</ulink> in Visual Web Tools Guide.</para>
<para>
<emphasis role="bold">I see the Oracle ADF Faces component library tags in the JBoss Tools
Palette, but I can't seem to find the libraries for ADF. How do I use this component
16 years, 3 months
JBoss Tools SVN: r6753 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-03-06 19:32:08 -0500 (Thu, 06 Mar 2008)
New Revision: 6753
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-1646 - 5.0 server editor missing credential section.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-03-07 00:30:30 UTC (rev 6752)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-03-07 00:32:08 UTC (rev 6753)
@@ -242,7 +242,7 @@
id="org.jboss.ide.eclipse.as.ui.editor.passwordSection"
insertionId="org.eclipse.wst.server.editor.overview.left"
order="10"
- typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42"/>
+ typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50"/>
</extension>
16 years, 3 months
JBoss Tools SVN: r6752 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: launch and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-03-06 19:30:30 -0500 (Thu, 06 Mar 2008)
New Revision: 6752
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java
Log:
JBIDE-1646 - trying to allow any type of poller the flexibility to request more info.
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2008-03-07 00:30:30 UTC (rev 6752)
@@ -0,0 +1,136 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.ui.dialogs;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.ide.eclipse.as.ui.Messages;
+
+/**
+ * @author rob.stryker <rob.stryker(a)redhat.com>
+ *
+ */
+public class RequiredCredentialsDialog extends Dialog {
+
+ private String user, pass;
+
+ public RequiredCredentialsDialog(Shell parentShell) {
+ super(parentShell);
+ setShellStyle(getShellStyle() | SWT.RESIZE);
+ }
+
+ protected void configureShell(Shell newShell) {
+ super.configureShell(newShell);
+ newShell.setText("Server Credentials Required");
+ }
+
+ protected Control createDialogArea(Composite parent) {
+ Composite c = (Composite) super.createDialogArea(parent);
+ Composite main = new Composite(c, SWT.NONE);
+ main.setLayoutData(new GridData(GridData.FILL_BOTH));
+ main.setLayout(new FormLayout());
+
+ // make widgets
+ Label top = new Label(main, SWT.NONE);
+ Label userLabel = new Label(main, SWT.NONE);
+ Label passLabel = new Label(main, SWT.NONE);
+ final Text userText = new Text(main, SWT.DEFAULT);
+ final Text passText = new Text(main, SWT.DEFAULT);
+ userText.setEditable(true);
+ passText.setEditable(true);
+
+
+ top.setLayoutData(createFormData(0,5,null,0,0,5,100,-5));
+ userLabel.setLayoutData(createFormData(top, 10, null, 0, 0,5, 100, -5));
+ userText.setLayoutData(createFormData(userLabel, 5, null, 0, 0,5, 100, -5));
+ passLabel.setLayoutData(createFormData(userText, 10, null, 0, 0,5, 100, -5));
+ passText.setLayoutData(createFormData(passLabel, 5, null, 0, 0,5, 100, -5));
+
+ top.setText("Your server is throwing a security exception.\nYou should make sure to open the server\neditor and save the jmx username and password there.");
+ userLabel.setText(Messages.swf_Username);
+ passLabel.setText(Messages.swf_Password);
+
+ ModifyListener listener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ user = userText.getText();
+ pass = passText.getText();
+ }
+ };
+ userText.addModifyListener(listener);
+ passText.addModifyListener(listener);
+ return c;
+ }
+
+
+
+ private FormData createFormData(Object topStart, int topOffset, Object bottomStart, int bottomOffset,
+ Object leftStart, int leftOffset, Object rightStart, int rightOffset) {
+ FormData data = new FormData();
+
+ if( topStart != null ) {
+ data.top = topStart instanceof Control ? new FormAttachment((Control)topStart, topOffset) :
+ new FormAttachment(((Integer)topStart).intValue(), topOffset);
+ }
+
+ if( bottomStart != null ) {
+ data.bottom = bottomStart instanceof Control ? new FormAttachment((Control)bottomStart, bottomOffset) :
+ new FormAttachment(((Integer)bottomStart).intValue(), bottomOffset);
+ }
+
+ if( leftStart != null ) {
+ data.left = leftStart instanceof Control ? new FormAttachment((Control)leftStart, leftOffset) :
+ new FormAttachment(((Integer)leftStart).intValue(), leftOffset);
+ }
+
+ if( rightStart != null ) {
+ data.right = rightStart instanceof Control ? new FormAttachment((Control)rightStart, rightOffset) :
+ new FormAttachment(((Integer)rightStart).intValue(), rightOffset);
+ }
+
+ return data;
+ }
+
+ /**
+ * @return the user
+ */
+ public String getUser() {
+ return user;
+ }
+
+ /**
+ * @return the pass
+ */
+ public String getPass() {
+ return pass;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java 2008-03-06 23:43:34 UTC (rev 6751)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java 2008-03-07 00:30:30 UTC (rev 6752)
@@ -3,9 +3,13 @@
import java.util.List;
import java.util.Properties;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
import org.jboss.ide.eclipse.as.core.extensions.polling.JMXPoller;
import org.jboss.ide.eclipse.as.core.server.IPollerFailureHandler;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
+import org.jboss.ide.eclipse.as.ui.dialogs.RequiredCredentialsDialog;
/**
*
@@ -21,12 +25,19 @@
return false;
}
- public void handle(IServerStatePoller poller, String action, List requiredProperties) {
-// Properties p = new Properties();
-// p.put(JMXPoller.REQUIRED_USER, "admin" );
-// p.put(JMXPoller.REQUIRED_PASS, "admin");
-// poller.failureHandled(p);
-// System.out.println("handled");
- poller.failureHandled(null);
+ public void handle(final IServerStatePoller poller, String action, List requiredProperties) {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ RequiredCredentialsDialog d = new RequiredCredentialsDialog(new Shell());
+ if( d.open() == Window.OK) {
+ Properties p = new Properties();
+ p.put(JMXPoller.REQUIRED_USER, d.getUser());
+ p.put(JMXPoller.REQUIRED_PASS, d.getPass());
+ poller.failureHandled(p);
+ } else {
+ poller.failureHandled(null);
+ }
+ }
+ });
}
}
16 years, 3 months
JBoss Tools SVN: r6751 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui/wizards and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-03-06 18:43:34 -0500 (Thu, 06 Mar 2008)
New Revision: 6751
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/initialSelectionProvider.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
Class started with a lowercase (bad) and used 4.0 as the default (also bad)
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java (from rev 6560, trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/initialSelectionProvider.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java 2008-03-06 23:43:34 UTC (rev 6751)
@@ -0,0 +1,50 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+* This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.ui.wizards;
+
+import org.eclipse.wst.server.core.IServerType;
+import org.eclipse.wst.server.ui.internal.viewers.InitialSelectionProvider;
+
+/**
+ *
+ * @author Rob Stryker <rob.stryker(a)redhat.com>
+ *
+ */
+public class JBInitialSelectionProvider extends InitialSelectionProvider {
+
+ public JBInitialSelectionProvider() {
+ }
+
+ public IServerType getInitialSelection(IServerType[] serverTypes) {
+ if (serverTypes == null)
+ return null;
+
+ int size = serverTypes.length;
+ for (int i = 0; i < size; i++) {
+ if( serverTypes[i].getId().equals("org.jboss.ide.eclipse.as.42"))
+ return serverTypes[i];
+ }
+ return serverTypes[0];
+ }
+
+
+}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/initialSelectionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/initialSelectionProvider.java 2008-03-06 23:20:28 UTC (rev 6750)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/initialSelectionProvider.java 2008-03-06 23:43:34 UTC (rev 6751)
@@ -1,50 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.ui.wizards;
-
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.ui.internal.viewers.InitialSelectionProvider;
-
-/**
- *
- * @author Rob Stryker <rob.stryker(a)redhat.com>
- *
- */
-public class initialSelectionProvider extends InitialSelectionProvider {
-
- public initialSelectionProvider() {
- }
-
- public IServerType getInitialSelection(IServerType[] serverTypes) {
- if (serverTypes == null)
- return null;
-
- int size = serverTypes.length;
- for (int i = 0; i < size; i++) {
- if( serverTypes[i].getId().equals("org.jboss.ide.eclipse.as.40"))
- return serverTypes[i];
- }
- return serverTypes[0];
- }
-
-
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-03-06 23:20:28 UTC (rev 6750)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-03-06 23:43:34 UTC (rev 6751)
@@ -209,7 +209,7 @@
<extension
point="org.eclipse.wst.server.ui.initialSelectionProvider">
<selectionProvider
- class="org.jboss.ide.eclipse.as.ui.wizards.initialSelectionProvider"
+ class="org.jboss.ide.eclipse.as.ui.wizards.JBInitialSelectionProvider"
id="org.jboss.ide.eclipse.as.ui.jboss40SelectionProvider"/>
</extension>
<extension
16 years, 3 months
JBoss Tools SVN: r6750 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-03-06 18:20:28 -0500 (Thu, 06 Mar 2008)
New Revision: 6750
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java
Log:
Slight change such that if more info is ignored, poller fails immediately.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2008-03-06 23:14:53 UTC (rev 6749)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2008-03-06 23:20:28 UTC (rev 6750)
@@ -244,7 +244,11 @@
public void failureHandled(Properties properties) {
- requiredPropertiesReturned = properties;
+ if( properties == null ) {
+ done = true;
+ pollingException = new PollingException("Request for more information ignored");
+ } else
+ requiredPropertiesReturned = properties;
}
public List<String> getRequiredProperties() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java 2008-03-06 23:14:53 UTC (rev 6749)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java 2008-03-06 23:20:28 UTC (rev 6750)
@@ -22,10 +22,11 @@
}
public void handle(IServerStatePoller poller, String action, List requiredProperties) {
- Properties p = new Properties();
- p.put(JMXPoller.REQUIRED_USER, "admin" );
- p.put(JMXPoller.REQUIRED_PASS, "admin");
- poller.failureHandled(p);
- System.out.println("handled");
+// Properties p = new Properties();
+// p.put(JMXPoller.REQUIRED_USER, "admin" );
+// p.put(JMXPoller.REQUIRED_PASS, "admin");
+// poller.failureHandled(p);
+// System.out.println("handled");
+ poller.failureHandled(null);
}
}
16 years, 3 months
JBoss Tools SVN: r6749 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core and 7 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-03-06 18:14:53 -0500 (Thu, 06 Mar 2008)
New Revision: 6749
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPollerFailureHandler.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollerFailureHandler.exsd
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-1646 - trying to allow any type of poller the flexibility to request more info.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2008-03-06 22:25:41 UTC (rev 6748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2008-03-06 23:14:53 UTC (rev 6749)
@@ -22,12 +22,17 @@
package org.jboss.ide.eclipse.as.core;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
+import org.jboss.ide.eclipse.as.core.server.IPollerFailureHandler;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
/**
@@ -49,6 +54,9 @@
/** The map of pollerID -> PollerObject */
private HashMap<String, ServerStatePollerType> pollers;
+ /** The map of pollerID -> PollerObject */
+ private HashMap<String, IPollerFailureHandler> pollerFailureHandlers;
+
/** The method used to load / instantiate the pollers */
public void loadPollers() {
pollers = new HashMap<String, ServerStatePollerType>();
@@ -99,5 +107,39 @@
}
return list.toArray(new ServerStatePollerType[list.size()]);
}
+
+ /** The method used to load / instantiate the failure handlers */
+ public void loadFailureHandler() {
+ pollerFailureHandlers = new HashMap<String, IPollerFailureHandler>();
+ IExtensionRegistry registry = Platform.getExtensionRegistry();
+ IConfigurationElement[] cf = registry.getConfigurationElementsFor(JBossServerCorePlugin.PLUGIN_ID, "pollerFailureHandler");
+ for( int i = 0; i < cf.length; i++ ) {
+ try {
+ pollerFailureHandlers.put(cf[i].getAttribute("id"),
+ (IPollerFailureHandler)cf[i].createExecutableExtension("class"));
+ } catch( CoreException e ) {
+ // TODO ERROR LOG
+ } catch( ClassCastException cce ) {
+ // TODO ERROR LOG
+ }
+ }
+ }
+
+ public IPollerFailureHandler[] getPollerFailureHandlers() {
+ if( pollerFailureHandlers == null )
+ loadFailureHandler();
+ Collection<IPollerFailureHandler> c = pollerFailureHandlers.values();
+ return c.toArray(new IPollerFailureHandler[c.size()]);
+ }
+
+ public IPollerFailureHandler getFirstPollFailureHandler(IServerStatePoller poller, String action, List requiredProperties) {
+ IPollerFailureHandler[] handlers = getPollerFailureHandlers();
+ for( int i = 0; i < handlers.length; i++ ) {
+ if( handlers[i].accepts(poller, action, requiredProperties)) {
+ return handlers[i];
+ }
+ }
+ return null;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2008-03-06 22:25:41 UTC (rev 6748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2008-03-06 23:14:53 UTC (rev 6749)
@@ -4,7 +4,7 @@
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
-* This is free software; you can redistribute it and/or modify it
+ * This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
@@ -27,35 +27,33 @@
import java.security.Principal;
import java.util.Properties;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
/**
* Utility class
+ *
* @author Rob Stryker rob.stryker(a)redhat.com
- *
+ *
*/
public class JMXUtil {
-
/**
* In the current thread, set the credentials from some server
+ *
* @param server
*/
- public static void setCredentials(IServer server) throws CredentialException {
+ public static void setCredentials(IServer server)
+ throws CredentialException {
+ String user = ServerConverter.getJBossServer(server).getUsername();
+ String pass = ServerConverter.getJBossServer(server).getPassword();
+ setCredentials(server, user, pass);
+ }
+
+ public static void setCredentials(IServer server, Object principal,
+ Object credential) throws CredentialException {
Exception temp = null;
try {
- ILaunchConfiguration lc = server.getLaunchConfiguration(true,
- new NullProgressMonitor());
- // get user from the IServer, but override with launch configuration
- String user = ServerConverter.getJBossServer(server).getUsername();
-
- // get password from the IServer, but override with launch configuration
- String pass = ServerConverter.getJBossServer(server).getPassword();
-
// get our methods
Class simplePrincipal = Thread.currentThread()
.getContextClassLoader().loadClass(
@@ -69,20 +67,18 @@
Constructor newSimplePrincipal = simplePrincipal
.getConstructor(new Class[] { String.class });
Object newPrincipalInstance = newSimplePrincipal
- .newInstance(new Object[] { user });
+ .newInstance(new Object[] { principal });
// set the principal
- Method setPrincipalMethod = securityAssoc.getMethod(
- "setPrincipal", new Class[] { Principal.class });
+ Method setPrincipalMethod = securityAssoc.getMethod("setPrincipal",
+ new Class[] { Principal.class });
setPrincipalMethod.invoke(null,
new Object[] { newPrincipalInstance });
// set the credential
Method setCredentialMethod = securityAssoc.getMethod(
"setCredential", new Class[] { Object.class });
- setCredentialMethod.invoke(null, new Object[] { pass });
- } catch (CoreException e) {
- temp = e;
+ setCredentialMethod.invoke(null, new Object[] { credential });
} catch (ClassNotFoundException e) {
temp = e;
} catch (SecurityException e) {
@@ -101,16 +97,20 @@
if( temp != null )
throw new CredentialException(temp);
}
-
+
public static class CredentialException extends Exception {
private static final long serialVersionUID = 1L;
protected Exception wrapped;
+
public CredentialException(Exception wrapped) {
this.wrapped = wrapped;
}
- public Exception getWrapped() { return wrapped; }
+
+ public Exception getWrapped() {
+ return wrapped;
+ }
}
-
+
public static Properties getDefaultProperties(IServer server) {
int port = ServerConverter.getJBossServer(server).getJNDIPort();
Properties props = new Properties();
@@ -118,8 +118,8 @@
"org.jnp.interfaces.NamingContextFactory");
props.put("java.naming.factory.url.pkgs",
"org.jboss.naming:org.jnp.interfaces");
- props.put("java.naming.provider.url", "jnp://"
- + server.getHost() + ":" + port);
+ props.put("java.naming.provider.url", "jnp://" + server.getHost() + ":"
+ + port);
return props;
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2008-03-06 22:25:41 UTC (rev 6748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2008-03-06 23:14:53 UTC (rev 6749)
@@ -22,6 +22,8 @@
package org.jboss.ide.eclipse.as.core.extensions.polling;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
import javax.management.MBeanException;
@@ -41,6 +43,7 @@
import org.jboss.ide.eclipse.as.core.extensions.jmx.JMXUtil.CredentialException;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
+import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
import org.jboss.ide.eclipse.as.core.util.SimpleTreeItem;
/**
@@ -55,6 +58,8 @@
public static final String STARTED_PROPERTY = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.STARTED_PROPERTY";
public static final String EVENT_TYPE_STARTING = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.eventTypes.STARTING";
+ public static final String REQUIRED_USER = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.REQUIRED_USER";
+ public static final String REQUIRED_PASS = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.REQUIRED_PASS";
public static final int STATE_STARTED = 1;
public static final int STATE_STOPPED = 0;
@@ -63,8 +68,12 @@
private int started;
private boolean canceled;
private boolean done;
+ private boolean waitingForCredentials = false;
private IServer server;
+ private ServerStatePollerType type;
private PollingException pollingException = null;
+ private RequiresInfoException requiresInfoException = null;
+ private Properties requiredPropertiesReturned = null;
private EventLogTreeItem event;
@@ -108,9 +117,21 @@
new JMXEvent(event, b);
}
} catch (SecurityException se) {
- pollingException = new PollingSecurityException(
- "Security Exception: " + se.getMessage());
- done = true;
+ if( !waitingForCredentials ) {
+ waitingForCredentials = true;
+ requiresInfoException = new PollingSecurityException(
+ "Security Exception: " + se.getMessage());
+ } else {
+ // we're waiting. are they back yet?
+ if( requiredPropertiesReturned != null ) {
+ requiresInfoException = null;
+ String user, pass;
+ user = (String)requiredPropertiesReturned.get(REQUIRED_USER);
+ pass = (String)requiredPropertiesReturned.get(REQUIRED_PASS);
+ setCredentials(user, pass);
+ waitingForCredentials = false;
+ }
+ }
} catch (CommunicationException ce) {
started = STATE_STOPPED;
new JMXEvent(event, ce);
@@ -152,8 +173,18 @@
pollingException = new PollingException(ce.getWrapped().getMessage());
}
}
+
+ protected void setCredentials(String user, String pass) {
+ try {
+ JMXUtil.setCredentials(server, user, pass);
+ } catch( CredentialException ce ) {
+ pollingException = new PollingException(ce.getWrapped().getMessage());
+ }
+ }
}
+
+
private void launchJMXPoller() {
PollerRunnable run = new PollerRunnable();
Thread t = new Thread(run, "JMX Poller");
@@ -167,16 +198,19 @@
public void cleanup() {
}
- public class PollingSecurityException extends PollingException {
+ public class PollingSecurityException extends RequiresInfoException {
private static final long serialVersionUID = 1L;
public PollingSecurityException(String msg) {
super(msg);
}
}
- public boolean getState() throws PollingException {
+ public boolean getState() throws PollingException, RequiresInfoException {
if (pollingException != null)
throw pollingException;
+ if( requiresInfoException != null )
+ throw requiresInfoException;
+
if (started == 0)
return SERVER_DOWN;
if (started == 1)
@@ -188,9 +222,11 @@
return SERVER_UP; // done or canceled, doesnt matter
}
- public boolean isComplete() throws PollingException {
+ public boolean isComplete() throws PollingException, RequiresInfoException {
if (pollingException != null)
throw pollingException;
+ if( requiresInfoException != null )
+ throw requiresInfoException;
return done;
}
@@ -205,4 +241,24 @@
setProperty(EventLogModel.EXCEPTION_PROPERTY, e);
}
}
+
+
+ public void failureHandled(Properties properties) {
+ requiredPropertiesReturned = properties;
+ }
+
+ public List<String> getRequiredProperties() {
+ ArrayList<String> list = new ArrayList<String>();
+ list.add(REQUIRED_USER);
+ list.add(REQUIRED_PASS);
+ return list;
+ }
+
+ public ServerStatePollerType getPollerType() {
+ return type;
+ }
+
+ public void setPollerType(ServerStatePollerType type) {
+ this.type = type;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2008-03-06 22:25:41 UTC (rev 6748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2008-03-06 23:14:53 UTC (rev 6749)
@@ -21,11 +21,15 @@
*/
package org.jboss.ide.eclipse.as.core.extensions.polling;
+import java.util.List;
+import java.util.Properties;
+
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
+import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
/**
* Essentially does nothing because the process already has a listener
@@ -40,6 +44,7 @@
public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.processTerminatedPoller";
+ private ServerStatePollerType type;
private JBossServerBehavior server;
public void beginPolling(IServer server, boolean expectedState,
PollThread pt) {
@@ -60,4 +65,20 @@
return server.getProcess() == null || server.getProcess().isTerminated();
}
+ public void failureHandled(Properties properties) {
+ }
+
+ public List getRequiredProperties() {
+ return null;
+ }
+
+ public ServerStatePollerType getPollerType() {
+ return type;
+ }
+
+ public void setPollerType(ServerStatePollerType type) {
+ this.type = type;
+ }
+
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2008-03-06 22:25:41 UTC (rev 6748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2008-03-06 23:14:53 UTC (rev 6749)
@@ -22,6 +22,8 @@
package org.jboss.ide.eclipse.as.core.extensions.polling;
import java.util.Date;
+import java.util.List;
+import java.util.Properties;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.internal.ServerType;
@@ -30,6 +32,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
+import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
/**
* Wait 15 seconds, then say it's at it's expected state
@@ -42,9 +45,10 @@
private boolean expectedState;
private long endTime;
private IServer server;
- int timeout = -1;
+ private int timeout = -1;
+ private ServerStatePollerType type;
+
-
public void beginPolling(IServer server, boolean expectedState, PollThread pt) {
this.expectedState = expectedState;
this.server = server;
@@ -88,6 +92,21 @@
public boolean supportsStartup() {
return true;
}
+
+ public void failureHandled(Properties properties) {
+ }
+
+ public List getRequiredProperties() {
+ return null;
+ }
+ public ServerStatePollerType getPollerType() {
+ return type;
+ }
+ public void setPollerType(ServerStatePollerType type) {
+ this.type = type;
+ }
+
+
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPollerFailureHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPollerFailureHandler.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPollerFailureHandler.java 2008-03-06 23:14:53 UTC (rev 6749)
@@ -0,0 +1,33 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+* This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.core.server;
+
+import java.util.List;
+
+/**
+ * @author rob.stryker <rob.stryker(a)redhat.com>
+ *
+ */
+public interface IPollerFailureHandler {
+ public boolean accepts(IServerStatePoller poller, String action, List requiredProperties);
+ public void handle(IServerStatePoller poller, String action, List requiredProperties);
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2008-03-06 22:25:41 UTC (rev 6748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2008-03-06 23:14:53 UTC (rev 6749)
@@ -21,8 +21,12 @@
*/
package org.jboss.ide.eclipse.as.core.server;
+import java.util.List;
+import java.util.Properties;
+
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
+import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
/**
* A server state poller will
@@ -37,10 +41,16 @@
public static final int CANCEL = 0;
public static final int TIMEOUT_REACHED = 1;
+ public ServerStatePollerType getPollerType();
+ public void setPollerType(ServerStatePollerType type);
public void beginPolling(IServer server, boolean expectedState, PollThread pt); // expected to launch own thread
- public boolean isComplete() throws PollingException;
- public boolean getState() throws PollingException;
+
+ public boolean isComplete() throws PollingException, RequiresInfoException;
+ public boolean getState() throws PollingException, RequiresInfoException;
+
public void cleanup(); // clean up any resources / processes. Will ALWAYS be called
+ public List getRequiredProperties();
+ public void failureHandled(Properties properties);
/**
* Cancel the polling.
@@ -51,4 +61,11 @@
public class PollingException extends Exception {
public PollingException(String message) {super(message);}
}
+
+ public class RequiresInfoException extends Exception {
+ private boolean checked = false;
+ public RequiresInfoException(String msg) {super(msg);}
+ public void setChecked() { this.checked = true; }
+ public boolean getChecked() { return this.checked; }
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2008-03-06 22:25:41 UTC (rev 6748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2008-03-06 23:14:53 UTC (rev 6749)
@@ -29,9 +29,11 @@
import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel;
import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogRoot;
import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogTreeItem;
+import org.jboss.ide.eclipse.as.core.server.IPollerFailureHandler;
import org.jboss.ide.eclipse.as.core.server.IServerPollingAttributes;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.PollingException;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.RequiresInfoException;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.SimpleTreeItem;
@@ -86,7 +88,12 @@
IServerPollingAttributes.DEFAULT_SHUTDOWN_POLLER;
String pollerId = helper.getAttribute(key, defaultPoller);
ServerStatePollerType type = ExtensionManager.getDefault().getPollerType(pollerId);
- return type == null ? null : type.createPoller();
+ if( type != null ) {
+ IServerStatePoller tempPoller = type.createPoller();
+ tempPoller.setPollerType(type);
+ return tempPoller;
+ }
+ return null;
}
public void cancel() {
@@ -145,6 +152,14 @@
alertEventLogPollerException(e);
alertBehavior(IServerStatePoller.SERVER_DOWN, false);
return;
+ } catch( RequiresInfoException rie ) {
+ // This way each request for new info is checked only once.
+ if( !rie.getChecked()) {
+ rie.setChecked();
+ String action = expectedState == IServerStatePoller.SERVER_UP ? SERVER_STARTING : SERVER_STOPPING;
+ IPollerFailureHandler handler = ExtensionManager.getDefault().getFirstPollFailureHandler(poller, action, poller.getRequiredProperties());
+ handler.handle(poller, action, poller.getRequiredProperties());
+ }
}
}
@@ -168,6 +183,8 @@
alertEventLogPollerException(pe);
alertBehavior(IServerStatePoller.SERVER_DOWN, false);
return;
+ } catch( RequiresInfoException rie ) {
+ // You don't have an answer... liar!
}
} else {
// we timed out. get response from preferences
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-03-06 22:25:41 UTC (rev 6748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-03-06 23:14:53 UTC (rev 6749)
@@ -3,6 +3,7 @@
<plugin>
<extension-point id="pollers" name="org.jboss.ide.eclipse.as.core.runtime.server.pollers" schema="schema/pollers.exsd"/>
+ <extension-point id="pollerFailureHandler" name="org.jboss.ide.eclipse.as.core.runtime.server.pollerFailureHandler" schema="schema/pollerFailureHandler.exsd"/>
<extension
point="org.eclipse.wst.server.core.serverTypes">
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollerFailureHandler.exsd
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollerFailureHandler.exsd (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollerFailureHandler.exsd 2008-03-06 23:14:53 UTC (rev 6749)
@@ -0,0 +1,112 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.jboss.ide.eclipse.as.core">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.jboss.ide.eclipse.as.core" id="pollerFailureHandler" name="org.jboss.ide.eclipse.as.core.runtime.server."/>
+ </appInfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <complexType>
+ <sequence>
+ <element ref="pollerHandler" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="pollerHandler">
+ <complexType>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="class" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.jboss.ide.eclipse.as.core.server.IPollerFailureHandler"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ [Enter the first release in which this extension point appears.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="examples"/>
+ </appInfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="apiInfo"/>
+ </appInfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="implementation"/>
+ </appInfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="copyright"/>
+ </appInfo>
+ <documentation>
+
+ </documentation>
+ </annotation>
+
+</schema>
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java 2008-03-06 23:14:53 UTC (rev 6749)
@@ -0,0 +1,31 @@
+package org.jboss.ide.eclipse.as.ui.launch;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.jboss.ide.eclipse.as.core.extensions.polling.JMXPoller;
+import org.jboss.ide.eclipse.as.core.server.IPollerFailureHandler;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
+
+/**
+ *
+ * @author rob.stryker <rob.stryker(a)redhat.com>
+ *
+ */
+public class SecurityFailureHandler implements IPollerFailureHandler {
+
+ public boolean accepts(IServerStatePoller poller, String action,
+ List requiredProperties) {
+ if( poller.getPollerType().getId().equals("org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller"))
+ return true;
+ return false;
+ }
+
+ public void handle(IServerStatePoller poller, String action, List requiredProperties) {
+ Properties p = new Properties();
+ p.put(JMXPoller.REQUIRED_USER, "admin" );
+ p.put(JMXPoller.REQUIRED_PASS, "admin");
+ poller.failureHandled(p);
+ System.out.println("handled");
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-03-06 22:25:41 UTC (rev 6748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-03-06 23:14:53 UTC (rev 6749)
@@ -340,5 +340,12 @@
</enablement>
</consolePatternMatchListener>
</extension>
+ <extension
+ point="org.jboss.ide.eclipse.as.core.pollerFailureHandler">
+ <pollerHandler
+ class="org.jboss.ide.eclipse.as.ui.launch.SecurityFailureHandler"
+ id="org.jboss.ide.eclipse.as.ui.launch.securityPollerHandler">
+ </pollerHandler>
+ </extension>
</plugin>
16 years, 3 months
JBoss Tools SVN: r6748 - in trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user: META-INF and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-03-06 17:25:41 -0500 (Thu, 06 Mar 2008)
New Revision: 6748
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.classpath
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.project
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/build.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/doc.zip
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/toc.xml
Log:
http://jira.jboss.org/jira/browse/JBIDE-1692
JBoss Server Manager refernce guide
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.classpath
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.classpath (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.classpath 2008-03-06 22:25:41 UTC (rev 6748)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.project
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.project (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.project 2008-03-06 22:25:41 UTC (rev 6748)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.ide.eclipse.as.doc.user</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF 2008-03-06 22:25:41 UTC (rev 6748)
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: JBoss AS User Guide Plug-in
+Bundle-SymbolicName: org.jboss.ide.eclipse.as.doc.user;singleton:=true
+Bundle-Version: 1.0.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/build.properties (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/build.properties 2008-03-06 22:25:41 UTC (rev 6748)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/doc.zip
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/doc.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/plugin.xml (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/plugin.xml 2008-03-06 22:25:41 UTC (rev 6748)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+ <extension point="org.eclipse.help.toc">
+ <toc
+ file="toc.xml"
+ primary="true"/>
+ </extension>
+
+</plugin>
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/plugin.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/toc.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/toc.xml (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/toc.xml 2008-03-06 22:25:41 UTC (rev 6748)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<toc xmlns="http://www.w3.org/TR/xhtml1/transitional" label="JBoss Server Manager Reference Guide" topic="index.html">
+ <topic label="Quick Start with JBoss Server" href="quick_start.html">
+ <topic label="Starting JBoss server" href="quick_start.html#starting"/>
+ <topic label="Stopping JBoss Server" href="quick_start.html#stopping"/>
+ <topic label="Project Archiving" href="quick_start.html#archiving"/>
+ <topic label="Deploying an Application to a Server" href="quick_start.html#deployment"/>
+ </topic>
+ <topic label="Runtimes and Servers in the JBoss AS plugin" href="runtimes_servers.html">
+ <topic label="Runtimes" href="runtimes_servers.html#d0e246">
+ <topic label="Installing a new Runtime" href="runtimes_servers.html#InstNewRuntime"/>
+ </topic>
+ <topic label="Servers" href="runtimes_servers.html#d0e386">
+ <topic label="Creating a New Server" href="runtimes_servers.html#d0e399"/>
+ </topic>
+ </topic>
+ <topic label="JBoss AS Perspective" href="perspective.html">
+ <topic label="The JBoss Server View" href="perspective.html#JBossServerView">
+ <topic label="Top Part of the JBoss Server View" href="perspective.html#d0e546"/>
+ <topic label="Bottom Part of the JBoss Server View" href="perspective.html#d0e779">
+ <topic label="Relevant Resources Links" href="perspective.html#d0e1055"/>
+ </topic>
+ </topic>
+ <topic label="Project Archives View" href="perspective.html#Project_archivesView">
+ <topic label="Overview" href="perspective.html#archives_overview"/>
+ <topic label="Creating an Archive" href="perspective.html#Creating an archive">
+ <topic label="Creating a Folder" href="perspective.html#CreatingaFolder"/>
+ <topic label="Creating a FileSet" href="perspective.html#CreatingaFileSet"/>
+ </topic>
+ <topic label="Archive Actions" href="perspective.html#View Actions"/>
+ <topic label="Publishing to Server" href="perspective.html#PublishToServer"/>
+ <topic label="Relevant Resources Links" href="perspective.html#d0e1302"/>
+ </topic>
+ </topic>
+ <topic label="Projects" href="webtools.html">
+ <topic label="Faceted Projects Overview" href="webtools.html#d0e1320"/>
+ <topic label="Adding Facets to a Project" href="webtools.html#d0e1335"/>
+ </topic>
+ <topic label="Deploying Modules" href="modules.html">
+ <topic label="Deploying on the Package Explorer" href="modules.html#d0e1440">
+ <topic label="Deploying with Run On Server Wizard" href="modules.html#run_on_server_wizard"/>
+ <topic label="Deploying single files" href="modules.html#single_file_deployment"/>
+ </topic>
+ <topic label="Deploying with JBoss Server View" href="modules.html#d0e1552">
+ <topic label="Top part of JBoss Server View" href="modules.html#d0e1560"/>
+ <topic label="Bottom part of JBoss Server View" href="modules.html#d0e1594"/>
+ </topic>
+ <topic label="Deploying with Project Archives View" href="modules.html#d0e1631"/>
+ </topic>
+</toc>
\ No newline at end of file
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/toc.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 3 months