JBoss Tools SVN: r25911 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-10-19 05:00:18 -0400 (Tue, 19 Oct 2010)
New Revision: 25911
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAUnnecessaryElementsForDirAttributeInXHTMLPageJBIDE1813Test.java
Log:
JBIDE-7195
org.jboss.tools.jsf.ui.test fails
CA Proposals checking is fixed
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAUnnecessaryElementsForDirAttributeInXHTMLPageJBIDE1813Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAUnnecessaryElementsForDirAttributeInXHTMLPageJBIDE1813Test.java 2010-10-19 08:06:45 UTC (rev 25910)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAUnnecessaryElementsForDirAttributeInXHTMLPageJBIDE1813Test.java 2010-10-19 09:00:18 UTC (rev 25911)
@@ -27,8 +27,7 @@
//
String[] proposals={
"ltr",
- "rtl",
- "#{}"
+ "rtl"
};
checkProposals(PAGE_NAME, "dir=\"\"", 5, proposals, true);
14 years, 3 months
JBoss Tools SVN: r25910 - in trunk/vpe: plugins/org.jboss.tools.vpe.docbook/templates and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-10-19 04:06:45 -0400 (Tue, 19 Oct 2010)
New Revision: 25910
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookProgramlistingTemplate.java
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml.xml
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java
Log:
add support for <![CDATA[...]]> inside <programlisting> in Docbook editor(https://jira.jboss.org/browse/JBIDE-7174)
Added: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookProgramlistingTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookProgramlistingTemplate.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookProgramlistingTemplate.java 2010-10-19 08:06:45 UTC (rev 25910)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.vpe.docbook.template;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMText;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Used for processing CDATA sections.
+ *
+ * @author dvinnichek
+ *
+ */
+public class DocbookProgramlistingTemplate extends VpeAbstractTemplate {
+
+ @Override
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+
+ final nsIDOMElement newElement = visualDocument
+ .createElement(HTML.TAG_PRE);
+ final VpeCreationData creationData = new VpeCreationData(newElement);
+
+ NodeList childNodes = sourceNode.getChildNodes();
+ for (int i = 0; i < childNodes.getLength(); i++) {
+ Node childNode = childNodes.item(i);
+ if (childNode.getNodeType() == Node.CDATA_SECTION_NODE) {
+ String cdataText = childNode.getNodeValue();
+ newElement.appendChild(visualDocument.createTextNode(cdataText));
+ } else {
+ nsIDOMElement spanElement = visualDocument.createElement(HTML.TAG_SPAN);
+ newElement.appendChild(spanElement);
+ VpeChildrenInfo info = new VpeChildrenInfo(spanElement);
+ info.addSourceChild(childNode);
+ creationData.addChildrenInfo(info);
+ }
+ }
+
+ return creationData;
+ }
+
+}
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookProgramlistingTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-10-19 06:15:47 UTC (rev 25909)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-10-19 08:06:45 UTC (rev 25910)
@@ -322,9 +322,8 @@
</vpe:tag>
<vpe:tag name="programlisting" case-sensitive="yes" docbook="yes">
- <vpe:template children="yes" modify="yes">
- <pre />
- </vpe:template>
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.vpe.docbook.template.DocbookProgramlistingTemplate"/>
</vpe:tag>
<vpe:tag name="programlistingco" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
Added: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml 2010-10-19 08:06:45 UTC (rev 25910)
@@ -0,0 +1,20 @@
+<!DOCTYPE tip PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<programlisting id="programlisting01">
+(define (node-list-filter-by-gi nodelist gilist)
+ ;; Returns the node-list that contains every element of the original
+ ;; nodelist whose gi is in gilist
+ (let loop ((result (empty-node-list)) (nl nodelist))
+ (if (node-list-empty? nl)
+ result
+ (if (member (gi (node-list-first nl)) gilist)
+ (loop (node-list result (node-list-first nl))
+ (node-list-rest nl))
+ (loop result (node-list-rest nl))))))
+</programlisting>
+
+<programlisting id="programlisting02">
+ <![CDATA[
+<emphasis>tags</emphasis> &entities; "]".
+ ]]>
+</programlisting>
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml.xml 2010-10-19 08:06:45 UTC (rev 25910)
@@ -0,0 +1,27 @@
+<tests>
+ <test id="programlisting01">
+ <PRE>
+ <SPAN>
+ <SPAN>
+(define (node-list-filter-by-gi nodelist gilist)
+ ;; Returns the node-list that contains every element of the original
+ ;; nodelist whose gi is in gilist
+ (let loop ((result (empty-node-list)) (nl nodelist))
+ (if (node-list-empty? nl)
+ result
+ (if (member (gi (node-list-first nl)) gilist)
+ (loop (node-list result (node-list-first nl))
+ (node-list-rest nl))
+ (loop result (node-list-rest nl))))))
+ </SPAN>
+ </SPAN>
+ </PRE>
+ </test>
+ <test id="programlisting02">
+ <PRE>
+ <SPAN/>
+<emphasis>tags</emphasis> &entities; "]".
+ <SPAN/>
+ </PRE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/programlisting/programlisting.xml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java 2010-10-19 06:15:47 UTC (rev 25909)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java 2010-10-19 08:06:45 UTC (rev 25910)
@@ -60,6 +60,10 @@
performContentTest("components/important/important.xml"); //$NON-NLS-1$
}
+ public void testProgramlisting() throws Throwable {
+ performContentTest("components/programlisting/programlisting.xml"); //$NON-NLS-1$
+ }
+
@Override
protected String getTestProjectName() {
return DocbookAllTests.IMPORT_PROJECT_NAME;
14 years, 3 months
JBoss Tools SVN: r25909 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-10-19 02:15:47 -0400 (Tue, 19 Oct 2010)
New Revision: 25909
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
Log:
Test Connection button added! JBIDE-7019
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2010-10-19 04:11:25 UTC (rev 25908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2010-10-19 06:15:47 UTC (rev 25909)
@@ -154,10 +154,9 @@
*/
protected static List<String> APPROVED_FILE_SYSTEMS =
Arrays.asList(new String[]{ "ftp.files", "local.files", "ssh.files", "dstore.files"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected IFileServiceSubSystem findFileTransferSubSystem(IHost host) {
+ public static IFileServiceSubSystem findFileTransferSubSystem(IHost host) {
ISubSystem[] systems = RSECorePlugin.getTheSystemRegistry().getSubSystems(host);
for( int i = 0; i < systems.length; i++ ) {
- String tmp = systems[i].getConfigurationId();
if( APPROVED_FILE_SYSTEMS.contains(systems[i].getConfigurationId()))
return (IFileServiceSubSystem)systems[i];
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-10-19 04:11:25 UTC (rev 25908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-10-19 06:15:47 UTC (rev 25909)
@@ -12,14 +12,27 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.lang.reflect.InvocationTargetException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemModelChangeEvent;
import org.eclipse.rse.core.events.ISystemModelChangeListener;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
+import org.eclipse.rse.services.files.IFileService;
+import org.eclipse.rse.services.files.IHostFile;
+import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.ui.wizards.newconnection.RSEMainNewConnectionWizard;
import org.eclipse.swt.SWT;
@@ -37,9 +50,13 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.progress.IProgressService;
import org.eclipse.wst.server.core.IRuntime;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.core.util.IConstants;
+import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
@@ -66,7 +83,7 @@
private IServerModeUICallback callback;
private CustomSystemHostCombo combo;
private Text rseServerHome,rseServerConfig;
- private Button rseBrowse;
+ private Button rseBrowse, rseTest;
private ModifyListener comboMListener;
public RSEDeploymentPreferenceComposite(Composite parent, int style, IServerModeUICallback callback) {
super(parent, style);
@@ -111,7 +128,6 @@
serverConfigLabel.setText("Remote Server Configuration: ");
rseServerConfig= new Text(this, SWT.SINGLE | SWT.BORDER);
serverConfigLabel.setLayoutData(UIUtil.createFormData2(rseServerHome, 7, null, 0, 0, 10, null, 0));
- rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null, 0, serverConfigLabel, 5, 100, -5));
rseServerConfig.setText(callback.getServer().getAttribute(RSEUtils.RSE_SERVER_CONFIG,
getRuntime().getJBossConfiguration()));
rseServerConfig.addModifyListener(new ModifyListener(){
@@ -119,8 +135,116 @@
serverConfigChanged();
}});
callback.getServer().addPropertyChangeListener(this);
+
+ rseTest = new Button(this, SWT.NONE);
+ rseTest.setText("Test...");
+ rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null, 0, null, 0, 100, -5));
+ rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null, 0, serverConfigLabel, 5, rseTest, -5));
+ rseTest.addSelectionListener(new SelectionListener(){
+ public void widgetSelected(SelectionEvent e) {
+ testPressed();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
}
+ private void testPressed(){
+ rseTest.setEnabled(false);
+ IWorkbench wb = PlatformUI.getWorkbench();
+ IProgressService ps = wb.getProgressService();
+ final IStatus[] s = new IStatus[1];
+ Throwable e = null;
+ final String home = rseServerHome.getText();
+ final String config = rseServerConfig.getText();
+ try {
+ ps.busyCursorWhile(new IRunnableWithProgress() {
+ public void run(IProgressMonitor pm) {
+ s[0] = testPressed(home, config, pm);
+ }
+ });
+ } catch(InvocationTargetException ite) {
+ e = ite;
+ } catch(InterruptedException ie) {
+ e = ie;
+ }
+ if( s[0] == null && e != null ) {
+ s[0] = new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, e.getMessage(), e);
+ }
+ rseTest.setEnabled(true);
+ showMessageDialog(s[0]);
+ }
+
+ private void showMessageDialog(IStatus s) {
+ if( s.isOK() )
+ s = new Status(IStatus.INFO, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
+ "The remote server is properly configured.");
+ ErrorDialog d = new ErrorDialog(rseServerHome.getShell(), "Title", null, s, IStatus.INFO | IStatus.ERROR);
+ d.open();
+ }
+
+ private IStatus testPressed(String home, String config, IProgressMonitor pm) {
+ pm.beginTask("Validating Remote Configuration", 1200);
+ IHost host = combo.getHost();
+ if( host == null ) {
+ pm.done();
+ return getTestFailStatus("NoHost");
+ }
+ pm.worked(100);
+
+ IFileServiceSubSystem fileSubSystem = RSEPublishMethod.findFileTransferSubSystem(host);
+ if( fileSubSystem == null ) {
+ pm.done();
+ return getTestFailStatus("No File Sub System");
+ }
+ pm.worked(100);
+
+ if(!fileSubSystem.isConnected()) {
+ try {
+ fileSubSystem.connect(new NullProgressMonitor(), false);
+ } catch (Exception e) {
+ pm.done();
+ return getTestFailStatus(e.getLocalizedMessage());
+ }
+ }
+ pm.worked(300);
+
+ IFileService service = fileSubSystem.getFileService();
+ if( service == null ) {
+ pm.done();
+ return getTestFailStatus("No File Service");
+ }
+ pm.worked(100);
+
+ String root = home;
+ IPath root2 = new Path(root);
+ try {
+ IHostFile file = service.getFile(root2.removeLastSegments(1).toOSString(), root2.lastSegment(), new NullProgressMonitor());
+ if( file == null || !file.exists()) {
+ pm.done();
+ return getTestFailStatus("Folder Home does not exist");
+ }
+ pm.worked(300);
+
+ root2 = root2.append(IConstants.SERVER).append(config);
+ file = service.getFile(root2.removeLastSegments(1).toOSString(), root2.lastSegment(), new NullProgressMonitor());
+ if( file == null || !file.exists()) {
+ pm.done();
+ return getTestFailStatus("Server's config folder does not exist");
+ }
+ pm.worked(300);
+ } catch(SystemMessageException sme) {
+ pm.done();
+ return getTestFailStatus(sme.getLocalizedMessage());
+ }
+ pm.done();
+ return Status.OK_STATUS;
+ }
+
+ private IStatus getTestFailStatus(String string) {
+ return new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, string);
+ }
+
private String discoverCurrentHost(IServerModeUICallback callback) {
String current = callback.getServer().getAttribute(RSEUtils.RSE_SERVER_HOST, (String)null);
if( current == null ) {
@@ -130,8 +254,8 @@
for( int i = 0; i < hosts.length; i++ ) {
name = hosts[i].getName();
hostName = hosts[i].getHostName();
- if( hosts[i].getHostName().toLowerCase().equals(serverHost)) {
- callback.getServer().setAttribute(RSEUtils.RSE_SERVER_HOST, hosts[i].getName());
+ if( hostName.toLowerCase().equals(serverHost)) {
+ callback.getServer().setAttribute(RSEUtils.RSE_SERVER_HOST, name);
return hosts[i].getName();
}
}
14 years, 3 months
JBoss Tools SVN: r25908 - trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-10-19 00:11:25 -0400 (Tue, 19 Oct 2010)
New Revision: 25908
Added:
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images/Deltacloud-manage_keys.png
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images/Deltacloud-perspective-launch_instance.png
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images/Server_Manager-Remote_System_Deployment.png
Log:
adding images to go with new content
Added: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images/Deltacloud-manage_keys.png
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images/Deltacloud-manage_keys.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images/Deltacloud-perspective-launch_instance.png
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images/Deltacloud-perspective-launch_instance.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images/Server_Manager-Remote_System_Deployment.png
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/images/Server_Manager-Remote_System_Deployment.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 3 months
JBoss Tools SVN: r25907 - trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-10-19 00:10:32 -0400 (Tue, 19 Oct 2010)
New Revision: 25907
Added:
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/add_and_manage_server_keys-task.xml
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_remote_system_explorer-task.xml
Modified:
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Tasks.xml
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_deltacloud_perspective-task.xml
Log:
updated with new content from what's new pages
Modified: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Tasks.xml
===================================================================
--- trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Tasks.xml 2010-10-18 15:53:16 UTC (rev 25906)
+++ trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Tasks.xml 2010-10-19 04:10:32 UTC (rev 25907)
@@ -6,6 +6,8 @@
<chapter id="chap-Cloud_Tools_Reference_Guide-Tasks">
<title>Tasks</title>
<xi:include href="connecting_to_a_deltacloud_server-task.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="add_and_manage_server_keys-task.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="using_the_deltacloud_perspective-task.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="using_the_remote_system_explorer-task.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
Added: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/add_and_manage_server_keys-task.xml
===================================================================
--- trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/add_and_manage_server_keys-task.xml (rev 0)
+++ trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/add_and_manage_server_keys-task.xml 2010-10-19 04:10:32 UTC (rev 25907)
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Cloud_Tools_Reference_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="sect-Cloud_Tools_Reference_Guide-Tasks-add_and_manage_server_keys">
+ <title>Add and manage server keys</title>
+ <para>
+ To access Deltacloud servers, key file authentication is used. Each key represents the person accessing the server and informs the server of their authorisation level.
+ </para>
+ <para>
+ Each unique user requires an individual key file and each file must be specified in the SSH2 private keys list prior to performing the ssh connection. To access the SSH2 private keys list navigate to <menuchoice>
+ <guimenuitem>Window</guimenuitem>
+ <guimenuitem>Preferences</guimenuitem>
+ <guimenuitem>General</guimenuitem>
+ <guimenuitem>Network Connections</guimenuitem>
+ <guimenuitem>SSH2</guimenuitem>
+ </menuchoice>.
+ </para>
+ <figure id="preferences-SSH2">
+ <title>Preferences: SSH2</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Preferences-Genearl-Network_Connections-SSH2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+</section>
+
+
+
Modified: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_deltacloud_perspective-task.xml
===================================================================
--- trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_deltacloud_perspective-task.xml 2010-10-18 15:53:16 UTC (rev 25906)
+++ trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_deltacloud_perspective-task.xml 2010-10-19 04:10:32 UTC (rev 25907)
@@ -6,12 +6,12 @@
<section id="sect-Cloud_Tools_Reference_Guide-Tasks-using_the_deltacloud_perspective">
<title>Using the Deltacloud perspective</title>
<para>
- The Deltacloud perspective consists of three different views: <guilabel>Cloud Viewer</guilabel>, <guilabel>Instances</guilabel> and <guilabel>Images</guilabel>.
+ The Deltacloud perspective consists of three different views: <guilabel>Cloud Viewer</guilabel>, <guilabel>Images</guilabel> and <guilabel>Instances</guilabel>.
</para>
<formalpara>
<title>The Cloud Viewer</title>
<para>
- <guilabel>Cloud Viewer</guilabel> shows you the servers you are connected to, the instances running on each server and the images available on each server. Clicking on an object causes details to be shown in the <guilabel>Properties</guilabel> view.
+ <guilabel>Cloud Viewer</guilabel> shows you the servers you are connected to, the instances running on each server and the images available on each server. Right-clicking on a cloud connection presents you with options to disconnect from a cloud using the <guimenuitem>Disconnect Cloud</guimenuitem> option or reload the the cloud view with the <guimenuitem>Refresh View</guimenuitem> option. Clicking on a connection name causes details to be shown in the <guilabel>Properties</guilabel> view.
</para>
</formalpara>
<figure id="deltacloud_perspective-the_cloud_viewer">
@@ -23,7 +23,7 @@
</mediaobject>
</figure>
<para>
- You can have multiple Deltacloud servers connected at any one time. If you have not yet setup a connection to a Deltacloud server see <xref linkend="sect-Cloud_Tools_Reference_Guide-Tasks-connecting_to_a_deltacloud_server"/>.
+ You can have multiple Deltacloud servers connected at any one time. If you have not yet setup a connection to a Deltacloud server see <xref linkend="sect-Cloud_Tools_Reference_Guide-Tasks-connecting_to_a_deltacloud_server"/>. You will also require a unique key file for each user who is to have access to the server. To add and manage your key files see <xref linkend="sect-Cloud_Tools_Reference_Guide-Tasks-add_and_manage_server_keys"/>
</para>
<formalpara>
<title>The Images view</title>
@@ -35,7 +35,7 @@
<title>Deltacloud perspective: The Images view</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Deltacloud-images_view.png"/>
+ <imagedata fileref="images/Deltacloud-perspective-images_view.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -43,7 +43,7 @@
By right-clicking on an image in the table and selecting <guimenuitem>Launch Instance</guimenuitem>, a dialog will appear. Define the <guilabel>Name</guilabel> of the instance, the <guilabel>Realm</guilabel> the instance should appear in, select a pre-defined <guilabel>Hardware Profile</guilabel> and choose a <guilabel>Key Name</guilabel> for key file authentication.
</para>
<para>
- User authentication keys are managed for Deltacloud tooling by the <guilabel>Manage Keys</guilabel> dialog.
+ User authentication keys are managed for Deltacloud tooling by the <guilabel>Manage Keys</guilabel> dialog. When clicking on the <guibutton>Manage</guibutton> you will be presented with this dialog. Select one from the list or add a new one. When adding a new key through this dialog, be sure that it has first been added to the SSH2 key list by undertaking <xref linkend="sect-Cloud_Tools_Reference_Guide-Tasks-add_and_manage_server_keys"/>.
</para>
<para>
Click <guibutton>Finish</guibutton> to create the new instance.
@@ -71,30 +71,11 @@
</mediaobject>
</figure>
<para>
- Using the <guilabel>Remote System Explorer</guilabel> you can connect to a running instance through the SSH protocol. Accessing a remote instance requires authentication; for an EC2 instance a PEM key file would be used.
+ Using the <guilabel>Remote System Explorer</guilabel> (<xref linkend="sect-Cloud_Tools_Reference_Guide-Task-using_the_remote_system_explorer"/>) you can connect to a running instance through the SSH protocol. Accessing a remote instance requires authentication; for an EC2 instance a PEM key file will be used.
</para>
<para>
- Each unique user requires an individual key file and each file must be specified in the SSH2 private keys list prior to performing the ssh connection. To access the SSH2 private keys list navigate to <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Preferences</guimenuitem><guimenuitem>General</guimenuitem><guimenuitem>Network Connections</guimenuitem><guimenuitem>SSH2</guimenuitem></menuchoice>.
+ Once connected, files on the external instance can be manipulated as if they were on your local machine.
</para>
- <figure id="preferences-SSH2">
- <title>Preferences: SSH2</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Preferences-Genearl-Network_Connections-SSH2.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <figure id="deltacloud_perspective-the_instances_view">
- <title>Deltacloud perspective: The Instances view</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Deltacloud-perspective-instances_view.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>
- Once connected files on the external instance can be manipulated as if they were on your local machine.
- </para>
</section>
Added: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_remote_system_explorer-task.xml
===================================================================
--- trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_remote_system_explorer-task.xml (rev 0)
+++ trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_remote_system_explorer-task.xml 2010-10-19 04:10:32 UTC (rev 25907)
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Cloud_Tools_Reference_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="sect-Cloud_Tools_Reference_Guide-Task-using_the_remote_system_explorer">
+ <title>Using the Remote System Explorer</title>
+ <para>
+ With the Eclipse <guilabel>Remote System Explorer</guilabel> installed, you are able to publish to a remote location and setup additional hosts. You can also start and stop an external server through this perspective and these commands can be customized through the launch configuration.
+ </para>
+ <para>
+ To deploy to a remote system, toggle between <guimenuitem>Local</guimenuitem> and <guimenuitem>Remote System</guimenuitem> in the server editor. For information on the server editor see the <emphasis>JBoss Server Manager Reference Guide</emphasis>.
+ </para>
+ <figure id="remote_system_deployment">
+ <title>Remote system deployment</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Server_Manager-Remote_System_Deployment.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+</section>
+
+
+
14 years, 3 months
JBoss Tools SVN: r25906 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-10-18 11:53:16 -0400 (Mon, 18 Oct 2010)
New Revision: 25906
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test.java
Log:
JBIDE-7195
org.jboss.tools.jsf.ui.test fails
CA Proposals checking is fixed
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test.java 2010-10-18 15:52:19 UTC (rev 25905)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test.java 2010-10-18 15:53:16 UTC (rev 25906)
@@ -27,8 +27,7 @@
// - The "/pages" proposal is added as the main case to test
String[] proposals={
"/pages/",
- "/templates/",
- "#{}"
+ "/templates/"
};
checkProposals(PAGE_NAME, "<input type=\"image\" src=\"", 25, proposals, true, true);
14 years, 3 months
JBoss Tools SVN: r25905 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-10-18 11:52:19 -0400 (Mon, 18 Oct 2010)
New Revision: 25905
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
Log:
JBIDE-7195
org.jboss.tools.jsf.ui.test fails
CA Proposals comparing is fixed
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2010-10-18 15:19:58 UTC (rev 25904)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2010-10-18 15:52:19 UTC (rev 25905)
@@ -118,7 +118,16 @@
String replacementString = ap.getReplacementString().toLowerCase();
if (replacementString.equalsIgnoreCase(proposalName)) return true;
+
// For a tag proposal there will be not only the the tag name but all others characters like default attributes, tag ending characters and so on
+ if (replacementString.indexOf("/>") != -1) {
+ replacementString = replacementString.substring(0, replacementString.indexOf("/>"));
+ }
+ if (replacementString.indexOf('>') != -1) {
+ replacementString = replacementString.substring(0, replacementString.indexOf('>'));
+ }
+ if (replacementString.equalsIgnoreCase(proposalName)) return true;
+
String[] replacementStringParts = replacementString.split(" "); //$NON-NLS-1$
if (replacementStringParts != null && replacementStringParts.length > 0) {
if (replacementStringParts[0].equalsIgnoreCase(proposalName)) return true;
14 years, 3 months
JBoss Tools SVN: r25904 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-18 11:19:58 -0400 (Mon, 18 Oct 2010)
New Revision: 25904
Removed:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java
Log:
[JBIDE-7320] trying to run deltacloud
Deleted: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2010-10-18 15:19:29 UTC (rev 25903)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2010-10-18 15:19:58 UTC (rev 25904)
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.internal.deltacloud.test;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-
-/**
- * @author Andre Dietisheim
- */
-(a)RunWith(Suite.class)
-(a)Suite.SuiteClasses({
-})
-public class DeltaCloudTestSuite {
-
-}
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java 2010-10-18 15:19:29 UTC (rev 25903)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java 2010-10-18 15:19:58 UTC (rev 25904)
@@ -1,24 +1,36 @@
package org.jboss.tools.internal.deltacloud.test;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collections;
+import org.jruby.Ruby;
+import org.jruby.RubyInstanceConfig;
+import org.jruby.javasupport.JavaEmbedUtils;
import org.junit.Test;
public class DeltacloudIntegrationTest {
@Test
- public void runDeltaCloud() {
- ScriptEngineManager factory = new ScriptEngineManager();
- ScriptEngine engine = factory.getEngineByName("jruby");
+ public void runDeltaCloud() throws IOException {
+
+ RubyInstanceConfig config = new RubyInstanceConfig();
+ Ruby ruby = JavaEmbedUtils.initialize(Collections.EMPTY_LIST, config);
try {
- engine.eval("puts('Hello')");
-// engine.eval("gem install rake");
- engine.eval("jgem list");
- } catch (ScriptException exception) {
- exception.printStackTrace();
+ ruby.executeScript(readScript("/bootstrap-deltacloud.rb"), "/bootstrap-deltacloud.rb");
+ } finally {
+ JavaEmbedUtils.terminate(ruby);
}
}
+ private String readScript(String script) throws IOException {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream(script)));
+ StringWriter writer = new StringWriter();
+ while (reader.ready())
+ new PrintWriter(writer).println(reader.readLine());
+ return writer.toString();
+ }
}
14 years, 3 months
JBoss Tools SVN: r25903 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-18 11:19:29 -0400 (Mon, 18 Oct 2010)
New Revision: 25903
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF
Log:
[JBIDE-7320] trying to run deltacloud
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF 2010-10-18 15:19:21 UTC (rev 25902)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF 2010-10-18 15:19:29 UTC (rev 25903)
@@ -4,6 +4,7 @@
Bundle-SymbolicName: org.jboss.tools.deltacloud.test
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit;bundle-version="4.8.1"
+Require-Bundle: org.junit;bundle-version="4.8.1",
+ org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)"
Bundle-ClassPath: jruby-complete-1.5.3.jar,
.
14 years, 3 months
JBoss Tools SVN: r25902 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-18 11:19:21 -0400 (Mon, 18 Oct 2010)
New Revision: 25902
Added:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/deltacloud-dependencies.jar
Log:
[JBIDE-7320] trying to run deltacloud
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/deltacloud-dependencies.jar
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/deltacloud-dependencies.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 3 months