Bug 551190: Add Zephyr Support
Bug 551190: Add Zephyr Support
Change-Id: Ideae251534867c20d236d50f7ba97bd27a9e284c
diff --git a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/TestEngineManager.java b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/TestEngineManager.java
index e27e477..58042c4 100644
--- a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/TestEngineManager.java
+++ b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/TestEngineManager.java
@@ -145,7 +145,7 @@
public void fireExecutionStarted(EclScenarioExecutable scenario) {
for (TestEngineExtension engine : this.enabledEngines) {
- engine.getEngine().executionStarted(scenario);
+ engine.getEngine().executionStarted(scenario, engine.getEngine().getConfiguration());
}
}
@@ -212,6 +212,7 @@
engine.getName()));
}
engine.setConfig(engineConfig);
+ engine.engine.setConfiguration(engineConfig);
}
this.engineStatuses = statuses;
this.enabledEngines = getEnabledEngines();
diff --git a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/launching/ITestEngine.java b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/launching/ITestEngine.java
index 95ba6b4..ab5d43a 100644
--- a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/launching/ITestEngine.java
+++ b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/launching/ITestEngine.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2016 Xored Software Inc and others.
+ * Copyright (c) 2009, 2019 Xored Software Inc and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,15 +20,25 @@
public interface ITestEngine {
+ /**
+ * @deprecated Use {@link #executionStarted}
+ */
+ @Deprecated
public void testRunStarted(Map<String, String> config, List<Q7TestCase> tests);
+ /** To be extracted into a separate interface */
+ public void setConfiguration(Map<String, String> config);
+
+ /** To be extracted into a separate interface */
+ public Map<String, String> getConfiguration();
+
public void testRunCompleted();
public void sessionStarted(ExecutionSession session);
public void sessionCompleted(ExecutionSession session);
- public void executionStarted(EclScenarioExecutable scenario);
+ public void executionStarted(EclScenarioExecutable scenario, Map<String, String> config);
public void executionCompleted(EclScenarioExecutable scenario, Report report);
diff --git a/modules/runtime-repository/category.xml b/modules/runtime-repository/category.xml
index 2d679c1..cb6112b 100644
--- a/modules/runtime-repository/category.xml
+++ b/modules/runtime-repository/category.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2009, 2016 Xored Software Inc and others.
+ Copyright (c) 2009, 2019 Xored Software Inc and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -16,6 +16,8 @@
</feature>
<feature id="org.eclipse.rcptt.tesla">
<category name="rcptt.runtime"/>
+ <feature id="org.eclipse.rcptt.zephyr">
+ <category name="rcptt.runtime"/>
</feature>
<feature id="org.eclipse.rcptt.tesla.runtime">
<category name="rcptt.runtime"/>
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail/src/org/eclipse/rcptt/testrail/TestRailService.java b/modules/testrail/plugins/org.eclipse.rcptt.testrail/src/org/eclipse/rcptt/testrail/TestRailService.java
index 898606e..304af26 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.testrail/src/org/eclipse/rcptt/testrail/TestRailService.java
+++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail/src/org/eclipse/rcptt/testrail/TestRailService.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2016 Xored Software Inc and others.
+ * Copyright (c) 2009, 2019 Xored Software Inc and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,18 +10,24 @@
*******************************************************************************/
package org.eclipse.rcptt.testrail;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URLConnection;
import java.text.MessageFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
+import javax.net.ssl.SSLException;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.debug.core.ILaunchConfiguration;
@@ -75,6 +81,7 @@
public TestRailService() {
}
+ // TODO remove this method to eliminate Runner / IDE code duplication
@Override
public void testRunStarted(Map<String, String> config, List<Q7TestCase> tests) {
applyConfig(config);
@@ -134,7 +141,7 @@
}
@Override
- public void executionStarted(EclScenarioExecutable scenario) {
+ public void executionStarted(EclScenarioExecutable scenario, Map<String, String> config) {
}
@Override
@@ -495,4 +502,15 @@
}
return null;
}
+
+ public void setConfiguration(Map<String, String> config) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Map<String, String> getConfiguration() {
+ // TODO Auto-generated method stub
+ return new HashMap<String, String>();
+ }
}
diff --git a/modules/zephyr/README.md b/modules/zephyr/README.md
new file mode 100644
index 0000000..492b45c
--- /dev/null
+++ b/modules/zephyr/README.md
@@ -0,0 +1,33 @@
+# RCPTT Integration with Zephyr
+
+**Zephyr configuration parameters**:
+* **host** --- Zephyr Host. Should be valid URL and end with slash "/".
+* **username** --- Username.
+* **password** --- Password or API Key.
+* **projectId** --- Project ID. Should start with "P" and end with positive number.
+
+**Examples**
+For RCPTT Test Runner:
+
+ -testEngine 'zephyr:baseUrl=https://example.zephyr.net/;username=username@example.com;password=1234567890;projectId=P1'
+
+
+For RCPTT Maven Plugin:
+
+ <configuration>
+ <testEngines>
+ <testEngine>
+ <id>zephyr</id>
+ <parameters>
+ <baseUrl>https://example.zephyr.net/</baseUrl>
+ <username>username@example.com</username>
+ <password>1234567890</password>
+ <project>P1</project>
+ <version>v1.0</version>
+ <cycle>Add hoc</cycle>
+ </parameters>
+ </testEngine>
+ </testEngines>
+ </configuration>
+
+
diff --git a/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/build.properties b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/build.properties
new file mode 100644
index 0000000..bd0c291
--- /dev/null
+++ b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/build.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2019 Xored Software Inc and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Xored Software Inc - initial API and implementation and/or initial documentation
+###############################################################################
+bin.includes = feature.xml,\
+ license.html,\
+ epl-v10.html,\
+ feature.properties
diff --git a/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/epl-v10.html b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/epl-v10.html
new file mode 100644
index 0000000..fd39122
--- /dev/null
+++ b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/epl-v10.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
diff --git a/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/feature.properties b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/feature.properties
new file mode 100644
index 0000000..6ee8542
--- /dev/null
+++ b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/feature.properties
@@ -0,0 +1,146 @@
+###############################################################################
+# Copyright (c) 2019 Xored Software Inc and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Xored Software Inc - initial API and implementation and/or initial documentation
+###############################################################################
+providerName=Eclipse RCP Testing Tool Project
+copyrightURL=epl-v10.html
+copyright=\
+Copyright (c) 2009, 2016 Xored Software Inc and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ Xored Software Inc - initial API and implementation and/or initial documentation\n
+licenseURL=license.html
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 9, 2014\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+\t- Content may be structured and packaged into modules to facilitate delivering,\n\
+\t extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+\t plug-in fragments ("Fragments"), and features ("Features").\n\
+\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+\t in a directory named "plugins".\n\
+\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+\t Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+\t Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+\t numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
+\t named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+\t- The top-level (root) directory\n\
+\t- Plug-in and Fragment directories\n\
+\t- Inside Plug-ins and Fragments packaged as JARs\n\
+\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
+\t- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+\t the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\t extending or updating the functionality of an Eclipse-based product.\n\
+\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+\t Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+\t govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+\t Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+\t with the Specification. Such Installable Software Agreement must inform the user of the\n\
+\t terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+\t the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+\t indication of agreement by the user, the provisioning Technology will complete installation\n\
+\t of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/feature.xml b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/feature.xml
new file mode 100644
index 0000000..a347fc5
--- /dev/null
+++ b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/feature.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2019 Xored Software Inc and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Xored Software Inc - initial API and implementation and/or initial documentation
+ -->
+
+<feature
+ id="org.eclipse.rcptt.module.zephyr"
+ label="RCPTT Zephyr Support"
+ version="2.5.0.qualifier"
+ provider-name="%providerName">
+
+ <description>Zephyr
+ Test result reporting to Zephyr Software Testing
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.rcptt.zephyr"
+ download-size="0"
+ install-size="0"
+ version="2.5.0.qualifier"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.rcptt.zephyr.ui"
+ download-size="0"
+ install-size="0"
+ version="2.5.0.qualifier"
+ unpack="false"/>
+</feature>
diff --git a/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/license.html b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/license.html
new file mode 100644
index 0000000..c3d34c3
--- /dev/null
+++ b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/license.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/pom.xml b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/pom.xml
new file mode 100644
index 0000000..923b074
--- /dev/null
+++ b/modules/zephyr/features/org.eclipse.rcptt.module.zephyr/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2019 Xored Software Inc and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Xored Software Inc - initial API and implementation and/or initial documentation
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>rcptt-module-zephyr</artifactId>
+ <groupId>org.eclipse.rcptt</groupId>
+ <version>2.5.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.rcptt.features</groupId>
+ <artifactId>org.eclipse.rcptt.module.zephyr</artifactId>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/.classpath b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/.classpath
new file mode 100644
index 0000000..eca7bdb
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/.project b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/.project
new file mode 100644
index 0000000..f7cccef
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.rcptt.zephyr.ui</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>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/META-INF/MANIFEST.MF b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..98c2941
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: RCPTT Zephyr Support UI
+Bundle-SymbolicName: org.eclipse.rcptt.zephyr.ui;singleton:=true
+Bundle-Version: 2.5.0.qualifier
+Require-Bundle: org.eclipse.rcptt.zephyr;bundle-version="2.5.0",
+ org.eclipse.ui,
+ org.eclipse.osgi,
+ org.eclipse.rcptt.ui;bundle-version="2.5.0",
+ org.eclipse.ui.forms,
+ org.eclipse.debug.core,
+ org.eclipse.core.runtime,
+ org.eclipse.rcptt.core.scenario,
+ org.eclipse.core.resources
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Vendor: Eclipse RCP Testing Tool Project
+Import-Package: org.apache.commons.lang3
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/about.html b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/about.html
new file mode 100644
index 0000000..692eebb
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>February 24, 2014</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/build.properties b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/build.properties
new file mode 100644
index 0000000..e9863e2
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/epl-v10.html b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/epl-v10.html
new file mode 100644
index 0000000..fd39122
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/epl-v10.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/plugin.xml b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/plugin.xml
new file mode 100644
index 0000000..bc0abcc
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/plugin.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+
+<!--
+ Copyright (c) 2019 Xored Software Inc and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Xored Software Inc - initial API and implementation and/or initial documentation
+ -->
+
+<plugin>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.eclipse.rcptt.ui.IntegrationsPreferencePage"
+ class="org.eclipse.rcptt.zephyr.ui.preferences.ZephyrPreferencePage"
+ id="org.eclipse.rcptt.zephyr.ZephyrPreferencePage"
+ name="Zephyr">
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.ui.propertyPages">
+ <page
+ category="org.eclipse.rcptt.ui.views.IntegrationsPropertiesPage"
+ class="org.eclipse.rcptt.zephyr.ui.properties.ZephyrPropertiesPage"
+ id="org.eclipse.rcptt.zephyr.ZephyrPropertiesPage"
+ name="Zephyr">
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.rcptt.ui.propertySuggestionProviders">
+ <propertySuggestions
+ scenarioProperties="org.eclipse.rcptt.zephyr.ui.ZephyrPropertySuggestionProvider">
+ </propertySuggestions>
+ </extension>
+
+
+</plugin>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/pom.xml b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/pom.xml
new file mode 100644
index 0000000..fceece3
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2019 Xored Software Inc and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Xored Software Inc - initial API and implementation and/or initial documentation
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>rcptt-module-zephyr</artifactId>
+ <groupId>org.eclipse.rcptt</groupId>
+ <version>2.5.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.rcptt.zephyr.ui</artifactId>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/internal/ui/Messages.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/internal/ui/Messages.java
new file mode 100644
index 0000000..9bba529
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/internal/ui/Messages.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.zephyr.internal.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.rcptt.zephyr.internal.ui.messages"; //$NON-NLS-1$
+ public static String ZephyrPreferencePage_EnableIntegration;
+ public static String ZephyrPreferencePage_Address;
+ public static String ZephyrPreferencePage_Username;
+ public static String ZephyrPreferencePage_Password;
+ public static String ZephyrPreferencePage_Project;
+ public static String ZephyrPreferencePage_Version;
+ public static String ZephyrPreferencePage_Cycle;
+ public static String ZephyrPreferencePage_Issue;
+ public static String ZephyrPreferencePage_TestConnection;
+ public static String ZephyrPreferencePage_IncorrectAddressMsg;
+ public static String ZephyrPreferencePage_AddressEndsWithSlashMsg;
+ public static String ZephyrPreferencePage_FieldNotSpecifiedMsg;
+ public static String ZephyrPreferencePage_IncorrectProjectIdMsg;
+ public static String ZephyrPreferencePage_FailedToConnectMsg;
+ public static String ZephyrPreferencePage_SuccessfullyConnectedMsg;
+ public static String ZephyrPreferencePage_AdvancedSectionLabel;
+ public static String ZephyrPropertiesPage_AllPropertiesValid;
+ public static String ZephyrPropertiesPage_CycleInvalid;
+
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/internal/ui/messages.properties b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/internal/ui/messages.properties
new file mode 100644
index 0000000..c0a220c
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/internal/ui/messages.properties
@@ -0,0 +1,28 @@
+###############################################################################
+# Copyright (c) 2019 Xored Software Inc and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Xored Software Inc - initial API and implementation and/or initial documentation
+###############################################################################
+ZephyrPreferencePage_EnableIntegration=Enable integration with Zephyr
+ZephyrPreferencePage_Address=Zephyr Host
+ZephyrPreferencePage_Username=Username
+ZephyrPreferencePage_Password=Password or API Key
+ZephyrPreferencePage_Project=Project
+ZephyrPreferencePage_Version=Version
+ZephyrPreferencePage_Cycle=Cycle
+ZephyrPreferencePage_Issue=Issue
+ZephyrPreferencePage_TestConnection=Test connection
+ZephyrPreferencePage_IncorrectAddressMsg=Zephyr Host should be valid URL
+ZephyrPreferencePage_AddressEndsWithSlashMsg=Zephyr Host should end with slash "/"
+ZephyrPreferencePage_FieldNotSpecifiedMsg={0} not specified
+ZephyrPreferencePage_IncorrectProjectIdMsg=Project ID should start with "P" and end with positive number
+ZephyrPreferencePage_FailedToConnectMsg=Failed to connect to Zephyr (see Error Log for details)
+ZephyrPreferencePage_SuccessfullyConnectedMsg=Successfully connected to Zephyr
+ZephyrPreferencePage_AdvancedSectionLabel=Advanced options
+ZephyrPropertiesPage_AllPropertiesValid=All properties are valid
+ZephyrPropertiesPage_CycleInvalid=Cycle not founded
\ No newline at end of file
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/ui/ZephyrPropertySuggestionProvider.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/ui/ZephyrPropertySuggestionProvider.java
new file mode 100644
index 0000000..8208bbf
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/ui/ZephyrPropertySuggestionProvider.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.zephyr.ui;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.rcptt.core.scenario.Scenario;
+import org.eclipse.rcptt.ui.controls.SuggestionItem;
+import org.eclipse.rcptt.ui.editors.IScenarioPropertyProvider;
+import org.eclipse.rcptt.zephyr.ZephyrService;
+
+public final class ZephyrPropertySuggestionProvider implements IScenarioPropertyProvider {
+
+ @Override
+ public List<SuggestionItem> getProperties(Scenario scenario) {
+ final List<SuggestionItem> props = new ArrayList<SuggestionItem>();
+ props.add(new SuggestionItem(ZephyrService.ZEPHYR_ISSUE));
+ return props;
+ }
+
+ @Override
+ public List<SuggestionItem> getPropertyValues(String name) {
+ return Collections.emptyList();
+ }
+
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/ui/preferences/ZephyrPreferencePage.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/ui/preferences/ZephyrPreferencePage.java
new file mode 100644
index 0000000..9006fe5
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/ui/preferences/ZephyrPreferencePage.java
@@ -0,0 +1,205 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.zephyr.ui.preferences;
+
+import java.net.URL;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.rcptt.internal.zephyr.ZephyrPlugin;
+import org.eclipse.rcptt.zephyr.ZephyrService;
+import org.eclipse.rcptt.zephyr.internal.ui.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+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.IWorkbenchPreferencePage;
+
+public final class ZephyrPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+
+ private Button zephyrCheckBox;
+ private Text zephyrAddress;
+ private Text zephyrUsername;
+ private Text zephyrPassword;
+ private Button testConnectionButton;
+
+ @Override
+ public void init(IWorkbench workbench) {
+ }
+
+ @Override
+ public boolean performOk() {
+ if (zephyrCheckBox.getSelection())
+ ZephyrPlugin.setZephyrEnabled(true);
+ else
+ ZephyrPlugin.setZephyrEnabled(false);
+
+ ZephyrPlugin.setZephyrAddress(zephyrAddress.getText());
+ ZephyrPlugin.setZephyrUsername(zephyrUsername.getText());
+ ZephyrPlugin.setZephyrPassword(zephyrPassword.getText());
+
+ return super.performOk();
+ }
+
+ @Override
+ protected void performDefaults() {
+ final boolean state = ZephyrPlugin.DEFAULT_ZEPHYR_ENABLED;
+ zephyrCheckBox.setSelection(ZephyrPlugin.DEFAULT_ZEPHYR_ENABLED);
+ zephyrAddress.setText("");
+ zephyrUsername.setText("");
+ zephyrPassword.setText("");
+ testConnectionButton.setEnabled(state);
+ super.performDefaults();
+ }
+
+ @Override
+ protected Control createContents(Composite parent) {
+ final Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayout(new GridLayout(2, false));
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+
+ zephyrCheckBox = createCheckBoxButton(composite, Messages.ZephyrPreferencePage_EnableIntegration,
+ ZephyrPlugin.getZephyrEnabled());
+ zephyrAddress = createText(composite, Messages.ZephyrPreferencePage_Address,
+ ZephyrPlugin.getZephyrAddress());
+ zephyrUsername = createText(composite, Messages.ZephyrPreferencePage_Username,
+ ZephyrPlugin.getZephyrUsername());
+ zephyrPassword = createText(composite, Messages.ZephyrPreferencePage_Password,
+ ZephyrPlugin.getZephyrPassword());
+ zephyrPassword.setEchoChar('*');
+
+
+ testConnectionButton = createButton(composite, Messages.ZephyrPreferencePage_TestConnection);
+ final boolean state = ZephyrPlugin.getZephyrEnabled();
+ testConnectionButton.setEnabled(state && isValid());
+
+ return null;
+ }
+
+ private Text createText(Composite parent, String labelText, String initialValue) {
+ final Label label = new Label(parent, SWT.LEFT);
+ label.setText(labelText);
+ final Text text = new Text(parent, SWT.BORDER);
+ text.setText(initialValue);
+ text.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ validate();
+
+ final boolean state = zephyrCheckBox.getSelection();
+ testConnectionButton.setEnabled(state && isValid());
+ }
+ });
+
+ text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ return text;
+ }
+
+ private Button createCheckBoxButton(Composite parent, String labelText, boolean state) {
+ final Label label = new Label(parent, SWT.LEFT);
+ label.setText(labelText);
+ final Button button = new Button(parent, SWT.CHECK);
+ button.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ validate();
+
+ final boolean state = zephyrCheckBox.getSelection();
+ testConnectionButton.setEnabled(state && isValid());
+ }
+ });
+
+ button.setSelection(state);
+ return button;
+ }
+
+ private Button createButton(Composite parent, String labelText) {
+ final Button button = new Button(parent, SWT.PUSH);
+ button.setText(labelText);
+ button.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ testConnection();
+ }
+ });
+
+ return button;
+ }
+
+ private void validate() {
+ final String message = doValidate();
+ setMessage(null);
+ setErrorMessage(message);
+ setValid(message == null);
+ }
+
+ private String doValidate() {
+ if (!zephyrCheckBox.getSelection()) {
+ return null;
+ }
+ if (!isValidURL(zephyrAddress.getText())) {
+ return Messages.ZephyrPreferencePage_IncorrectAddressMsg;
+ }
+ if (zephyrUsername.getText() == null || zephyrUsername.getText().equals("")) {
+ return MessageFormat.format(Messages.ZephyrPreferencePage_FieldNotSpecifiedMsg,
+ Messages.ZephyrPreferencePage_Username);
+ }
+ if (zephyrPassword.getText() == null || zephyrPassword.getText().equals("")) {
+ return MessageFormat.format(Messages.ZephyrPreferencePage_FieldNotSpecifiedMsg,
+ Messages.ZephyrPreferencePage_Password);
+ }
+ return null;
+ }
+
+ private boolean isValidURL(String urlString) {
+ try {
+ final URL url = new URL(urlString);
+ return !url.getHost().equals("");
+ } catch (Exception e) {
+ ZephyrPlugin.log(e);
+ }
+ return false;
+ }
+
+ private void testConnection() {
+ BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
+ public void run() {
+
+ final String address = zephyrAddress.getText();
+ final String username = zephyrUsername.getText();
+ final String password = zephyrPassword.getText();
+
+ final ZephyrService service = new ZephyrService();
+ final IStatus result = service.doTestConnection(address, username, password);
+
+ if (result.isOK()) {
+ setMessage(result.getMessage(), INFORMATION);
+ setErrorMessage(null);
+ } else {
+ setMessage(null);
+ setErrorMessage(result.getMessage());
+ }
+
+ }
+ });
+ }
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/ui/properties/ZephyrPropertiesPage.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/ui/properties/ZephyrPropertiesPage.java
new file mode 100644
index 0000000..4452ebd
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr.ui/src/org/eclipse/rcptt/zephyr/ui/properties/ZephyrPropertiesPage.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.zephyr.ui.properties;
+
+import java.util.Map;
+import org.eclipse.rcptt.zephyr.internal.ui.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IWorkbenchPropertyPage;
+import org.eclipse.ui.dialogs.PropertyPage;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.rcptt.internal.zephyr.ZephyrPlugin;
+import org.eclipse.rcptt.zephyr.ZephyrService;
+
+public final class ZephyrPropertiesPage extends PropertyPage implements IWorkbenchPropertyPage {
+
+ private ZephyrService service;
+
+ private Combo zephyrProject;
+ private Combo zephyrVersion;
+ private Combo zephyrCycle;
+
+ private Map<String, Long> zephyrProjects;
+ private Map<String, Long> zephyrVersions;
+ private Map<String, Long> zephyrCycles;
+
+ @Override
+ protected Control createContents(final Composite parent) {
+ final Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayout(new GridLayout(2, false));
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+
+ this.service = new ZephyrService();
+ this.zephyrProject = createCombo(composite, Messages.ZephyrPreferencePage_Project, () -> updateVersionList());
+ this.zephyrVersion = createCombo(composite, Messages.ZephyrPreferencePage_Version, () -> updateCycleList());
+ this.zephyrCycle = createCombo(composite, Messages.ZephyrPreferencePage_Cycle, () -> checkCycle());
+
+ updateProjectList();
+ final int projectIndex = this.zephyrProject.indexOf(ZephyrPlugin.getZephyrProject(getRcpttProject()));
+ if (projectIndex > -1) {
+ this.zephyrProject.select(projectIndex);
+ updateVersionList();
+ final int versionIndex = this.zephyrVersion.indexOf(ZephyrPlugin.getZephyrVersion(getRcpttProject()));
+ if (versionIndex > -1) {
+ this.zephyrVersion.select(versionIndex);
+ updateCycleList();
+ final int cycleIndex = this.zephyrCycle.indexOf(ZephyrPlugin.getZephyrCycle(getRcpttProject()));
+ if (cycleIndex > -1) {
+ this.zephyrCycle.select(cycleIndex);
+
+ }
+ }
+ }
+ return composite;
+ }
+
+ @Override
+ public boolean performOk() {
+ System.out.print("Perform");
+ ZephyrPlugin.setZephyrProject(getItemName(this.zephyrProject), getRcpttProject());
+ ZephyrPlugin.setZephyrVersion(getItemName(this.zephyrVersion), getRcpttProject());
+ ZephyrPlugin.setZephyrCycle(getItemName(this.zephyrCycle), getRcpttProject());
+ return super.performOk();
+ }
+
+ @Override
+ protected void performDefaults() {
+ System.out.print("Default");
+ ZephyrPlugin.setZephyrProject("", getRcpttProject());
+ ZephyrPlugin.setZephyrVersion("", getRcpttProject());
+ ZephyrPlugin.setZephyrCycle("", getRcpttProject());
+ this.zephyrProject.clearSelection();
+ this.zephyrVersion.clearSelection();
+ this.zephyrCycle.clearSelection();
+ super.performDefaults();
+ }
+
+ private Combo createCombo(final Composite parent, final String labelText, final Runnable runnable) {
+ final Label label = new Label(parent, SWT.LEFT);
+ label.setText(labelText);
+
+ final Combo combo = new Combo(parent, SWT.DROP_DOWN);
+ combo.addModifyListener(new ModifyListener() {
+ public void modifyText(final ModifyEvent e) {
+ runnable.run();
+ }
+ });
+
+ combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ return combo;
+ }
+
+ private void updateProjectList() {
+ this.zephyrProjects = service.getAllProjects();
+ this.zephyrProject.setItems(getKeyArray(this.zephyrProjects));
+ this.zephyrVersion.clearSelection();
+ }
+
+ private void updateVersionList() {
+ final Long projectId = getProjectId();
+ this.zephyrVersions = projectId == null ? null : service.getAllVersions(getProjectId());
+ this.zephyrVersion.setItems(getKeyArray(this.zephyrVersions));
+ this.zephyrCycle.clearSelection();
+ }
+
+ private void updateCycleList() {
+ final Long versionId = getVersionId();
+ this.zephyrCycles = versionId == null ? null : service.getAllCycles(getProjectId(), versionId);
+ this.zephyrCycle.setItems(getKeyArray(this.zephyrCycles));
+ }
+
+ private void checkCycle() {
+ final Long cycleId = getCycleId();
+ if (cycleId == null) {
+ setMessage(null);
+ setErrorMessage(Messages.ZephyrPropertiesPage_CycleInvalid);
+ } else {
+ setMessage(Messages.ZephyrPropertiesPage_AllPropertiesValid);
+ setErrorMessage(null);
+ }
+ }
+
+ private String[] getKeyArray(Map<String, Long> items) {
+ if (items == null)
+ return new String[0];
+ return items.keySet().toArray(new String[items.size()]);
+ }
+
+ private Long getProjectId() {
+ return getItemId(this.zephyrProject, this.zephyrProjects);
+ }
+
+ private Long getVersionId() {
+ return getItemId(this.zephyrVersion, this.zephyrVersions);
+ }
+
+ private Long getCycleId() {
+ return getItemId(this.zephyrCycle, this.zephyrCycles);
+ }
+
+ private Long getItemId(final Combo item, final Map<String, Long> items) {
+ final int index = item.getSelectionIndex();
+ return index > -1 && items != null ? items.get(item.getItem(index)) : null;
+ }
+
+ private String getItemName(final Combo item) {
+ final int index = item.getSelectionIndex();
+ return index > -1 ? item.getItem(index) : "";
+ }
+
+ private IProject getRcpttProject() {
+ return (IProject) this.getElement().getAdapter(IResource.class);
+ }
+
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/.classpath b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/.classpath
new file mode 100644
index 0000000..eca7bdb
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/.project b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/.project
new file mode 100644
index 0000000..65107b6
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.rcptt.zephyr</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>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/META-INF/MANIFEST.MF b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1b77516
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Zephyr support core
+Bundle-SymbolicName: org.eclipse.rcptt.zephyr;singleton:=true
+Bundle-Version: 2.5.0.qualifier
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.rcptt.core;bundle-version="2.5.0",
+ org.eclipse.rcptt.reporting;bundle-version="2.5.0",
+ com.google.gson,
+ org.eclipse.rcptt.reporting.util;bundle-version="2.5.0",
+ org.eclipse.debug.core,
+ org.eclipse.equinox.security,
+ org.eclipse.rcptt.util,
+ org.eclipse.rcptt.launching;bundle-version="2.5.0",
+ org.apache.httpcomponents.httpclient,
+ org.apache.httpcomponents.httpcore,
+ org.apache.commons.lang3
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.rcptt.internal.zephyr,
+ org.eclipse.rcptt.zephyr
+Bundle-Vendor: Eclipse RCP Testing Tool Project
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.rcptt.internal.zephyr.ZephyrPlugin
+Automatic-Module-Name: org.eclipse.rcptt.zephyr
+Bundle-ClassPath: .
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/about.html b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/about.html
new file mode 100644
index 0000000..692eebb
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>February 24, 2014</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/build.properties b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/build.properties
new file mode 100644
index 0000000..2639302
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+ META-INF/,\
+ .
\ No newline at end of file
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/epl-v10.html b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/epl-v10.html
new file mode 100644
index 0000000..fd39122
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/epl-v10.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/plugin.xml b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/plugin.xml
new file mode 100644
index 0000000..a9a00c9
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/plugin.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+
+<!--
+ Copyright (c) 2019 Xored Software Inc and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Xored Software Inc - initial API and implementation and/or initial documentation
+ -->
+
+<plugin>
+ <extension
+ point="org.eclipse.rcptt.launching.testEngine">
+ <testEngine
+ class="org.eclipse.rcptt.zephyr.ZephyrService"
+ parameters="baseUrl*, username*, password*, project*, version*, cycle*"
+ id="zephyr"
+ name="Zephyr">
+ </testEngine>
+ </extension>
+
+
+</plugin>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/pom.xml b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/pom.xml
new file mode 100644
index 0000000..330f295
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2019 Xored Software Inc and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Xored Software Inc - initial API and implementation and/or initial documentation
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>rcptt-module-zephyr</artifactId>
+ <groupId>org.eclipse.rcptt</groupId>
+ <version>2.5.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.rcptt.zephyr</artifactId>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/Messages.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/Messages.java
new file mode 100644
index 0000000..a2cab49
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/Messages.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.internal.zephyr;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.rcptt.internal.zephyr.messages"; //$NON-NLS-1$
+ public static String ZephyrPlugin_ErrorWhileSaving;
+ public static String ZephyrPlugin_ErrorWhileGetting;
+ public static String ZephyrService_ZephyrIsNotEnabled;
+ public static String ZephyrService_SuccessfullyCreatedClient;
+ public static String ZephyrService_ErrorWhileGettingLaunchProperty;
+ public static String ZephyrService_TestCasePropertyIsNotSpecified;
+ public static String ZephyrService_TestCaseCanceled;
+ public static String ZephyrService_ErrorWhileGettingTestCaseProperty;
+ public static String ZephyrService_FailedToSetUpConnection;
+ public static String ZephyrService_InvalidParameterValue;
+ public static String ZephyrService_InvalidZephyrId;
+ public static String ZephyrService_InvalidURL;
+ public static String ZephyrService_URLShouldEndsWithSlash;
+ public static String ZephyrService_InvalidBoolean;
+ public static String ZephyrService_UrlInvalid;
+ public static String ZephyrService_UrlSslError;
+ public static String ZephyrService_UrlConnectionError;
+
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/TestCaseResultModel.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/TestCaseResultModel.java
new file mode 100644
index 0000000..0156d7c
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/TestCaseResultModel.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.internal.zephyr;
+
+public final class TestCaseResultModel {
+
+ private Boolean isPassed;
+ private String comment;
+
+ public TestCaseResultModel(Boolean isPassed, String comment){
+ this.isPassed = isPassed;
+ this.comment = comment;
+ }
+
+ public Boolean getIsPassed() {
+ return isPassed;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrConfigModel.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrConfigModel.java
new file mode 100644
index 0000000..bb2fe56
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrConfigModel.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.internal.zephyr;
+
+public final class ZephyrConfigModel {
+
+ private TestCaseResultModel testcase;
+ private Long projectId;
+ private Long versionId;
+ private Long cycleId;
+ private String IssueName;
+ private long zephyrTypeId;
+ private ZephyrRestClient restClient;
+
+ public String getIssueName() {
+ return IssueName;
+ }
+
+ public void setIssueName(String testIssueId) {
+ this.IssueName = testIssueId;
+ }
+
+ public long getTestIssueTypeId() {
+ return zephyrTypeId;
+ }
+
+ public void setTestIssueTypeId(long testIssueTypeId) {
+ this.zephyrTypeId = testIssueTypeId;
+ }
+
+ public TestCaseResultModel getTestcase() {
+ return testcase;
+ }
+
+ public void setTestcase(TestCaseResultModel testcase) {
+ this.testcase = testcase;
+ }
+
+ public Long getProjectId() {
+ return projectId;
+ }
+
+ public void setZephyrProjectId(Long zephyrProjectId) {
+ this.projectId = zephyrProjectId;
+ }
+
+ public Long getCycleId() {
+ return cycleId;
+ }
+
+ public void setCycleId(Long cycleId) {
+ this.cycleId = cycleId;
+ }
+
+ public ZephyrRestClient getRestClient() {
+ return restClient;
+ }
+
+ public void setRestClient(ZephyrRestClient restClient) {
+ this.restClient = restClient;
+ }
+
+ public Long getVersionId() {
+ return versionId;
+ }
+
+ public void setVersionId(Long versionId) {
+ this.versionId = versionId;
+ }
+}
\ No newline at end of file
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrCycle.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrCycle.java
new file mode 100644
index 0000000..14af0de
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrCycle.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.internal.zephyr;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.ParseException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.util.EntityUtils;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+public final class ZephyrCycle {
+
+ private static final String URL_GET_CYCLES = "%s/rest/zapi/latest/cycle?projectId=%s&versionId=%s";
+
+ public static Map<String, Long> getAllCycles(final ZephyrRestClient restClient, final long projectId,
+ final long versionId) {
+
+ final Map<String, Long> cycles = new HashMap<String, Long>();
+
+ final String url = String.format(URL_GET_CYCLES, restClient.getUrl(), projectId, versionId);
+ try (final CloseableHttpResponse response = restClient.get(url)) {
+ final int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode >= 200 && statusCode < 300) {
+ final HttpEntity entity = response.getEntity();
+ String string = null;
+ try {
+ string = EntityUtils.toString(entity);
+ } catch (ParseException | IOException e) {
+ throw new IllegalArgumentException(
+ String.format("Bad response entity upon receipt of cycles <%s>", url), e);
+ }
+
+ final JsonObject projObj = new JsonParser().parse(string).getAsJsonObject();
+ for (int i = 0; i < projObj.size(); i++) {
+ final Set<String> keys = projObj.keySet();
+
+ for (final String key : keys) {
+ if (!key.trim().equals("recordsCount")) {
+ final JsonObject cycleObject = projObj.get(key).getAsJsonObject();
+ final String cycleName = cycleObject.get("name").getAsString();
+ final long id = Long.parseLong(key);
+ cycles.put(cycleName, id);
+ }
+ }
+ }
+ } else {
+ throw new IllegalArgumentException(
+ String.format("Unexpected response status <%s> upon receipt of cycles <%s>", statusCode, url));
+ }
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ return cycles;
+ }
+
+ public static Long getCycleIdByName(final ZephyrRestClient restClient, final long projectId, final long versionId,
+ final String cycleName) {
+ final Map<String, Long> cycles = getAllCycles(restClient, projectId, versionId);
+ final Long cycleId = cycles.get(cycleName);
+ if (cycleId == null) {
+ throw new IllegalArgumentException(
+ String.format("Cycle <%s> not found among <%s>", cycleName, String.join(", ", cycles.keySet())));
+ }
+ return cycleId;
+ }
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrPlugin.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrPlugin.java
new file mode 100644
index 0000000..810d2e3
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrPlugin.java
@@ -0,0 +1,257 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.internal.zephyr;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.equinox.security.storage.ISecurePreferences;
+import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
+import org.eclipse.equinox.security.storage.StorageException;
+import org.eclipse.rcptt.tesla.core.TeslaFeatures;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.prefs.BackingStoreException;
+
+public final class ZephyrPlugin extends Plugin {
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.rcptt.zephyr"; //$NON-NLS-1$
+
+ public static final String LAUNCH_TESTRUNID = PLUGIN_ID + ".ATTR_ZEPHYR_TESTRUNID";
+
+ public static final String ZEPHYR_ENABLED = "ZEPHYR_ENABLED";
+ public static final String ZEPHYR_ADDRESS = "ZEPHYR_ADDRESS";
+ public static final String ZEPHYR_USERNAME = "ZEPHYR_USERNAME";
+ public static final String ZEPHYR_PASSWORD = "ZEPHYR_PASSWORD";
+ public static final String ZEPHYR_PROJECT = "ZEPHYR_PROJECT";
+ public static final String ZEPHYR_VERSION = "ZEPHYR_VERSION";
+ public static final String ZEPHYR_CYCLE = "ZEPHYR_CYCLE";
+
+ public static final boolean DEFAULT_ZEPHYR_ENABLED = false;
+
+ // The shared instance
+ private static ZephyrPlugin plugin;
+
+ /**
+ * The constructor
+ */
+ public ZephyrPlugin() {
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.
+ * BundleContext)
+ */
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static ZephyrPlugin getDefault() {
+ return plugin;
+ }
+
+ public static void logInfo(String message) {
+ final String loggingEnabled = TeslaFeatures.getInstance().getValue(TeslaFeatures.TESTENGINE_LOGS);
+ if ("true".equals(loggingEnabled)) {
+ log(createStatus(Status.INFO, message));
+ }
+ }
+
+ public static void log(Throwable t) {
+ log(t.getMessage(), t);
+ }
+
+ public static void log(String message, Throwable t) {
+ log(createStatus(message, t));
+ }
+
+ public static void log(String message) {
+ log(createStatus(message));
+ }
+
+ public static void log(IStatus status) {
+ if (getDefault() != null) {
+ getDefault().getLog().log(status);
+ }
+ }
+
+ public static IStatus createStatus(String message) {
+ return createStatus(Status.ERROR, message, null);
+ }
+
+ public static IStatus createStatus(int state, String message) {
+ return createStatus(state, message, null);
+ }
+
+ public static IStatus createStatus(String message, Throwable t) {
+ return createStatus(Status.ERROR, message, t);
+ }
+
+ public static IStatus createStatus(int state, String message, Throwable t) {
+ return new Status(state, PLUGIN_ID, message, t);
+ }
+
+ public static IEclipsePreferences getPreferences() {
+ return InstanceScope.INSTANCE.getNode(PLUGIN_ID);
+ }
+
+ public static ISecurePreferences getSecurePreferences() {
+ return SecurePreferencesFactory.getDefault().node(PLUGIN_ID);
+ }
+
+ public static boolean getZephyrEnabled() {
+ final IEclipsePreferences preferences = getPreferences();
+ return preferences.getBoolean(ZEPHYR_ENABLED, DEFAULT_ZEPHYR_ENABLED);
+ }
+
+ public static void setZephyrEnabled(final boolean enabled) {
+ final IEclipsePreferences preferences = getPreferences();
+ try {
+ preferences.putBoolean(ZEPHYR_ENABLED, enabled);
+ preferences.flush();
+ } catch (final BackingStoreException e) {
+ throw new IllegalStateException(
+ MessageFormat.format(Messages.ZephyrPlugin_ErrorWhileSaving, ZEPHYR_ENABLED), e);
+ }
+ }
+
+ public static String getZephyrAddress() {
+ final IEclipsePreferences preferences = getPreferences();
+ return preferences.get(ZEPHYR_ADDRESS, "");
+ }
+
+ public static void setZephyrAddress(final String address) {
+ final IEclipsePreferences preferences = getPreferences();
+ try {
+ preferences.put(ZEPHYR_ADDRESS, address);
+ preferences.flush();
+ } catch (final BackingStoreException e) {
+ throw new IllegalStateException(
+ MessageFormat.format(Messages.ZephyrPlugin_ErrorWhileSaving, ZEPHYR_ADDRESS), e);
+ }
+ }
+
+ public static String getZephyrUsername() {
+ final IEclipsePreferences preferences = getPreferences();
+ return preferences.get(ZEPHYR_USERNAME, "");
+ }
+
+ public static void setZephyrUsername(final String username) {
+ final IEclipsePreferences preferences = getPreferences();
+ try {
+ preferences.put(ZEPHYR_USERNAME, username);
+ preferences.flush();
+ } catch (final BackingStoreException e) {
+ throw new IllegalStateException(
+ MessageFormat.format(Messages.ZephyrPlugin_ErrorWhileSaving, ZEPHYR_USERNAME), e);
+ }
+ }
+
+ public static String getZephyrPassword() {
+ final ISecurePreferences preferences = getSecurePreferences();
+ try {
+ return preferences.get(ZEPHYR_PASSWORD, "");
+ } catch (final StorageException e) {
+ throw new IllegalStateException(
+ MessageFormat.format(Messages.ZephyrPlugin_ErrorWhileSaving, ZEPHYR_PASSWORD), e);
+ }
+ }
+
+ public static void setZephyrPassword(final String password) {
+ final ISecurePreferences preferences = getSecurePreferences();
+ try {
+ preferences.put(ZEPHYR_PASSWORD, password, true);
+ preferences.flush();
+ } catch (final StorageException | IOException e) {
+ throw new IllegalStateException(
+ MessageFormat.format(Messages.ZephyrPlugin_ErrorWhileSaving, ZEPHYR_PASSWORD), e);
+ }
+ }
+
+ public static String getZephyrProject(final IProject project) {
+ final IEclipsePreferences preferences = getProperties(project);
+ return preferences.get(ZEPHYR_PROJECT, "");
+ }
+
+ public static void setZephyrProject(final String zephyrProject, final IProject rcpttProject) {
+ final IEclipsePreferences properties = getProperties(rcpttProject);
+ try {
+ properties.put(ZEPHYR_PROJECT, zephyrProject);
+ properties.flush();
+ } catch (final BackingStoreException e) {
+ throw new IllegalStateException(
+ MessageFormat.format(Messages.ZephyrPlugin_ErrorWhileSaving, ZEPHYR_PROJECT), e);
+ }
+ }
+
+ public static String getZephyrVersion(final IProject project) {
+ final IEclipsePreferences preferences = getProperties(project);
+ return preferences.get(ZEPHYR_VERSION, "");
+ }
+
+ public static void setZephyrVersion(final String zephyrVersion, final IProject rcpttProject) {
+ final IEclipsePreferences properties = getProperties(rcpttProject);
+ try {
+ properties.put(ZEPHYR_VERSION, zephyrVersion);
+ properties.flush();
+ } catch (final BackingStoreException e) {
+ throw new IllegalStateException(
+ MessageFormat.format(Messages.ZephyrPlugin_ErrorWhileSaving, ZEPHYR_VERSION), e);
+ }
+ }
+
+ public static String getZephyrCycle(final IProject project) {
+ final IEclipsePreferences preferences = getProperties(project);
+ return preferences.get(ZEPHYR_CYCLE, "");
+ }
+
+ public static void setZephyrCycle(final String zephyrCycle, final IProject rcpttProject) {
+ final IEclipsePreferences properties = getProperties(rcpttProject);
+ try {
+ properties.put(ZEPHYR_CYCLE, zephyrCycle);
+ properties.flush();
+ } catch (final BackingStoreException e) {
+ throw new IllegalStateException(MessageFormat.format(Messages.ZephyrPlugin_ErrorWhileSaving, ZEPHYR_CYCLE),
+ e);
+ }
+ }
+
+ private static IEclipsePreferences getProperties(final IProject project) {
+ return new ProjectScope(project).getNode(PLUGIN_ID);
+ }
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrProject.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrProject.java
new file mode 100644
index 0000000..25af9f3
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrProject.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.internal.zephyr;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.ParseException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.util.EntityUtils;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+public final class ZephyrProject {
+
+ private static final String URL_GET_PROJECTS = "%s/rest/api/2/issue/createmeta";
+ private static final String TEST_ISSSUETYPE_NAME = "Test";
+
+ public static Map<String, Long> getAllProjects(ZephyrRestClient restClient) {
+
+ final Map<String, Long> projects = new HashMap<>();
+
+ final String url = String.format(URL_GET_PROJECTS, restClient.getUrl());
+ try (final CloseableHttpResponse response = restClient.get(url)) {
+
+ final int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode >= 200 && statusCode < 300) {
+ final HttpEntity entity = response.getEntity();
+ String string = null;
+ try {
+ string = EntityUtils.toString(entity);
+ } catch (ParseException | IOException e) {
+ throw new IllegalArgumentException(
+ String.format("Bad response entity upon receipt of projects <%s>", url), e);
+ }
+
+ final JsonObject projObject = new JsonParser().parse(string).getAsJsonObject();
+ final JsonArray projArray = projObject.get("projects").getAsJsonArray();
+ for (int i = 0; i < projArray.size(); i++) {
+ final JsonObject project = projArray.get(i).getAsJsonObject();
+ final Long id = project.get("id").getAsLong();
+ final String projName = project.get("name").getAsString();
+ final JsonArray issueTypes = project.get("issuetypes").getAsJsonArray();
+
+ boolean issueTypeTesstExists = false;
+ for (int j = 0; j < issueTypes.size(); j++) {
+ final JsonObject issueType = issueTypes.get(j).getAsJsonObject();
+ final String issueTypeName = issueType.get("name").getAsString();
+
+ if (issueTypeName.trim().equalsIgnoreCase(TEST_ISSSUETYPE_NAME)) {
+ issueTypeTesstExists = true;
+ break;
+ }
+ }
+
+ if (!issueTypeTesstExists) {
+ continue;
+ }
+ projects.put(projName, id);
+ }
+
+ } else {
+ throw new IllegalArgumentException(String
+ .format("Unexpected response status <%s> upon receipt of projects <%s>", statusCode, url));
+ }
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ return projects;
+ }
+
+ public static Long getProjectIdByName(final String projectName, final ZephyrRestClient restClient) {
+ final Map<String, Long> projects = getAllProjects(restClient);
+ final Long projectId = projects.get(projectName);
+ if (projectId == null) {
+ throw new IllegalArgumentException(String.format("Project <%s> not found among <%s>", projectName,
+ String.join(", ", projects.keySet())));
+ }
+ return projectId;
+ }
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrRestClient.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrRestClient.java
new file mode 100644
index 0000000..05741db
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrRestClient.java
@@ -0,0 +1,255 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.internal.zephyr;
+
+import java.io.IOException;
+import java.lang.IllegalStateException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.util.EntityUtils;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+public final class ZephyrRestClient {
+
+ private static final String URL_GET_PROJECTS = "%s/rest/api/2/project?expand";
+ private static final String URL_GET_USERS = "%s/rest/api/2/user?username=%s";
+ private static final String URL_GET_ISSUETYPES = "%s/rest/api/2/issuetype";
+ private static final String TEST_ISSSUETYPE_NAME = "Test";
+ private static final long ISSUE_TYPE_ID = 10100L;
+
+ private CloseableHttpClient httpclient;
+ private HttpClientContext context;
+ private final String url;
+ private final String userName;
+ private final String password;
+
+ public ZephyrRestClient(String url, String userName, String password) {
+ super();
+ this.url = StringUtils.removeEnd(url, "/");
+ this.userName = userName;
+ this.password = password;
+ createClientContext(this.url, this.userName, this.password);
+ createHttpClient();
+ }
+
+ public void destroy() {
+ if (httpclient != null) {
+ try {
+ httpclient.close();
+ } catch (IOException e) {
+ ZephyrPlugin.log(e);
+ }
+ }
+ }
+
+ public boolean validateConnection() {
+ boolean status = false;
+
+ final String constructedURL = String.format(URL_GET_PROJECTS, getUrl());
+ try (final CloseableHttpResponse response = get(constructedURL)) {
+ int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode >= 200 && statusCode < 300) {
+ final HttpEntity entity = response.getEntity();
+ String string = null;
+ try {
+ string = EntityUtils.toString(entity);
+ if (string.startsWith("[") && string.endsWith("]"))
+ return true;
+ } catch (IOException e) {
+ ZephyrPlugin.log(e);
+ }
+
+ } else if (statusCode == 401) {
+ return true;
+ } else if (statusCode == 404) {
+ return false;
+ } else {
+ ZephyrPlugin.log(String.format("Unexpected response status <%s> upon validate connection <%s>",
+ statusCode, constructedURL));
+ }
+ } catch (IOException e) {
+ ZephyrPlugin.log(e);
+ return false;
+ }
+ return status;
+ }
+
+ public boolean validateCredentials() {
+ boolean status = true;
+
+ final String constructedURL = String.format(URL_GET_USERS, getUrl(), getUserName());
+ try (final CloseableHttpResponse response = get(constructedURL)) {
+ final int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode == 401) {
+ status = false;
+ }
+ } catch (IOException e) {
+ throw new IllegalStateException("Failed to get " + constructedURL, e);
+ }
+ return status;
+ }
+
+ public long findZephyrTypeId() {
+ long status = ISSUE_TYPE_ID;
+
+ final String url = String.format(URL_GET_ISSUETYPES, getUrl());
+
+ final Header[] headers = new Header[2];
+ headers[0] = new BasicHeader("Content-Type", "application/json");
+ headers[1] = new BasicHeader("Accept-Encoding", "gzip, deflate, sdch");
+
+ try (final CloseableHttpResponse response = get(url, headers)) {
+
+ int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode >= 200 && statusCode < 300) {
+ HttpEntity entity = response.getEntity();
+ String string = null;
+ try {
+ string = EntityUtils.toString(entity, "utf-8");
+
+ final JsonArray jArr = new JsonParser().parse(string).getAsJsonArray();
+ jArr.add(string);
+
+ for (int i = 0; i < jArr.size(); i++) {
+ final JsonObject jObj = jArr.get(i).getAsJsonObject();
+ if (jObj.get("name").getAsString().trim().equals(TEST_ISSSUETYPE_NAME)) {
+ return jObj.get("id").getAsLong();
+ }
+ }
+ } catch (IOException e) {
+ ZephyrPlugin.log(String.format("Bad response entity upon receipt of zephyr type id <%s>", url), e);
+ }
+
+ } else if (statusCode == 401 || statusCode == 404) {
+ return status;
+ } else {
+ ZephyrPlugin.log(String.format("Unexpected response status <%s> upon receipt of zephyr type id <%s>",
+ statusCode, url));
+ }
+ } catch (IOException e) {
+ throw new IllegalStateException("Failed to get " + url, e);
+ }
+ return status;
+ }
+
+ private HttpClientContext createClientContext(String hostAddressWithProtocol, String userName, String password) {
+ URL url;
+ try {
+ url = new URL(hostAddressWithProtocol);
+ final HttpHost targetHost = new HttpHost(url.getHost(), url.getPort(), url.getProtocol());
+ final CredentialsProvider credsProvider = new BasicCredentialsProvider();
+ credsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password));
+
+ final AuthCache authCache = new BasicAuthCache();
+ authCache.put(targetHost, new BasicScheme());
+
+ context = HttpClientContext.create();
+ context.setCredentialsProvider(credsProvider);
+ context.setAuthCache(authCache);
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException(e);
+ }
+
+ return context;
+ }
+
+ private void createHttpClient() {
+ try {
+ final SSLContextBuilder builder = new SSLContextBuilder();
+ builder.loadTrustMaterial(null, new TrustSelfSignedStrategy());
+ final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(builder.build(),
+ SSLConnectionSocketFactory.getDefaultHostnameVerifier());
+ httpclient = HttpClients.custom().setSSLSocketFactory(sslsf)/* .setDefaultRequestConfig(config) */.build();
+ } catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ public CloseableHttpResponse get(final String url) {
+ return get(new HttpGet(url));
+ }
+
+ public CloseableHttpResponse get(final String url, final Header[] headers) {
+ final HttpGet httpGet = new HttpGet(url);
+ for (final Header header : headers) {
+ httpGet.addHeader(header);
+ }
+ return get(httpGet);
+ }
+
+ private CloseableHttpResponse get(final HttpGet httpGet) {
+ try {
+ return this.httpclient.execute(httpGet, this.context);
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ public CloseableHttpResponse put(final String url, final Header[] headers, final HttpEntity entity) {
+ final HttpPut httpPut = new HttpPut(url);
+ for (final Header header : headers) {
+ httpPut.addHeader(header);
+ }
+ httpPut.setEntity(entity);
+ return put(httpPut);
+ }
+
+ private CloseableHttpResponse put(final HttpPut httpPut) {
+ try {
+ return this.httpclient.execute(httpPut, this.context);
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrTestCase.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrTestCase.java
new file mode 100644
index 0000000..75c2b6b
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrTestCase.java
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.internal.zephyr;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.util.EntityUtils;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+public final class ZephyrTestCase {
+
+ public static final int PASS = 1;
+ public static final int FAIL = 2;
+ private static final int MAX_ISSUE_SEARCH_COUNT = 250;
+
+ private static final String URL_GET_ALL_TESTS = "%s/rest/api/2/search?%sjql=project=%s&issuetype=%s&maxResults="
+ + MAX_ISSUE_SEARCH_COUNT + "&startAt=%s";
+ private static final String URL_CREATE_EXECUTIONS_URL = "%s/rest/zapi/latest/execution?projectId=%s&versionId=%s&cycleId=%s";
+ private static final String URL_EXECUTE_TEST = "%s/rest/zapi/latest/execution/%s/execute";
+
+ public static Long getTestCaseId(ZephyrConfigModel zephyrData) {
+ final String issueName = zephyrData.getIssueName();
+ if (issueName == null) {
+ return null;
+ }
+
+ final Map<String, Long> searchedTests = searchIssues(zephyrData);
+ return searchedTests.get(issueName);
+ }
+
+ private static Map<Long, Long> fetchExecutionIds(ZephyrConfigModel zephyrData) {
+
+ final Map<Long, Long> issueKeyExecutionIdMap = new HashMap<Long, Long>();
+ final String url = String.format(URL_CREATE_EXECUTIONS_URL, zephyrData.getRestClient().getUrl(),
+ zephyrData.getProjectId(), zephyrData.getVersionId(), zephyrData.getCycleId());
+
+ try (final CloseableHttpResponse response = zephyrData.getRestClient().get(url)) {
+
+ final int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode >= 200 && statusCode < 300) {
+ final HttpEntity entity = response.getEntity();
+ String string = null;
+ try {
+ string = EntityUtils.toString(entity);
+ } catch (IOException e) {
+ throw new IllegalArgumentException(
+ String.format("Bad response entity upon receipt of execution ids <%s>", url), e);
+ }
+
+ final JsonObject executionObject = new JsonParser().parse(string).getAsJsonObject();
+ final JsonArray executions = executionObject.get("executions").getAsJsonArray();
+
+ for (int i = 0; i < executions.size(); i++) {
+ final JsonObject execution = executions.get(i).getAsJsonObject();
+ final long issueKey = execution.get("issueId").getAsLong();
+ final long executionId = execution.get("id").getAsLong();
+
+ issueKeyExecutionIdMap.put(issueKey, executionId);
+ }
+
+ } else {
+ throw new IllegalArgumentException(String
+ .format("Unexpected response status <%s> upon receipt of execution ids <%s>", statusCode, url));
+ }
+
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+
+ return issueKeyExecutionIdMap;
+ }
+
+ public static void processTestCaseDetails(ZephyrConfigModel zephyrData) {
+ final Long testCaseId = getTestCaseId(zephyrData);
+
+ if (testCaseId == null) {
+ ZephyrPlugin.log("Invalid Issue: " + zephyrData.getIssueName());
+ return;
+ }
+
+ final Long testid = fetchExecutionIds(zephyrData).get(testCaseId);
+ executeTest(zephyrData, testid);
+ }
+
+ public static void executeTest(ZephyrConfigModel zephyrData, Long testId) {
+
+ final String url = String.format(URL_EXECUTE_TEST, zephyrData.getRestClient().getUrl(), testId);
+
+ final Header[] headers = new Header[1];
+ headers[0] = new BasicHeader("Content-Type", "application/json");
+
+ final TestCaseResultModel testCase = zephyrData.getTestcase();
+ final JsonObject obj = new JsonObject();
+ obj.addProperty("status", testCase.getIsPassed() ? PASS : FAIL);
+ obj.addProperty("comment", testCase.getComment());
+ StringEntity entity = null;
+ try {
+ entity = new StringEntity(obj.toString());
+ } catch (UnsupportedEncodingException e) {
+ throw new IllegalArgumentException(String.format("Bad response entity upon execute test <%s>", url), e);
+ }
+
+ try (final CloseableHttpResponse response = zephyrData.getRestClient().put(url, headers, entity)) {
+
+ final int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode < 200 && statusCode >= 300) {
+ throw new IllegalArgumentException(
+ String.format("Unexpected response status <%s> upon execute test <%s>", statusCode, url));
+ }
+
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ private static Map<String, Long> searchIssues(ZephyrConfigModel zephyrData) {
+
+ long searchIssueStartcount = -1L;
+ long totalIssueCount = 0L;
+ long searchedIsssuesCount = 0L;
+
+ final Map<String, Long> searchedTests = new HashMap<String, Long>();
+
+ do {
+ final String url = String.format(URL_GET_ALL_TESTS, zephyrData.getRestClient().getUrl(),
+ zephyrData.getProjectId(), zephyrData.getTestIssueTypeId(), searchIssueStartcount,
+ searchIssueStartcount);
+ JsonArray searchedIssues = null;
+
+ try (final CloseableHttpResponse response = zephyrData.getRestClient().get(url)) {
+
+ final int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode >= 200 && statusCode < 300) {
+ final HttpEntity entity = response.getEntity();
+ String string = null;
+ try {
+ string = EntityUtils.toString(entity);
+ } catch (IOException e) {
+ throw new IllegalArgumentException(
+ String.format("Bad response entity upon receipt of issues <%s>", url), e);
+ }
+
+ final JsonObject testCaseIssues = new JsonParser().parse(string).getAsJsonObject();
+ totalIssueCount = testCaseIssues.get("total").getAsLong();
+ searchedIssues = testCaseIssues.get("issues").getAsJsonArray();
+
+ searchedIsssuesCount += searchedIssues.size();
+ } else {
+ throw new IllegalArgumentException(String
+ .format("Unexpected response status <%s> upon receipt of issues <%s>", statusCode, url));
+ }
+
+ if (searchedIssues != null && searchedIssues.size() > 0) {
+ for (int i = 0; i < searchedIssues.size(); i++) {
+ final JsonObject jsonObject = searchedIssues.get(i).getAsJsonObject();
+ final long testId = jsonObject.get("id").getAsLong();
+ final String testKey = jsonObject.get("key").getAsString().trim();
+
+ searchedTests.put(testKey, testId);
+ }
+ }
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ } while (searchedIsssuesCount < totalIssueCount);
+
+ return searchedTests;
+ }
+}
\ No newline at end of file
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrVersion.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrVersion.java
new file mode 100644
index 0000000..3df4bf2
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/ZephyrVersion.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.internal.zephyr;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.ParseException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.util.EntityUtils;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParser;
+
+public final class ZephyrVersion {
+
+ private static final String URL_GET_VERSIONS = "%s/rest/api/2/project/%s/versions?expand";
+
+ public static Map<String, Long> getAllVersions(final ZephyrRestClient restClient, final Long projectID) {
+
+ final Map<String, Long> versions = new HashMap<>();
+
+ final String url = String.format(URL_GET_VERSIONS, restClient.getUrl(), projectID);
+ try (final CloseableHttpResponse response = restClient.get(url)) {
+
+ final int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode >= 200 && statusCode < 300) {
+ final HttpEntity entity = response.getEntity();
+ String string = null;
+ try {
+ string = EntityUtils.toString(entity);
+ } catch (ParseException | IOException e) {
+ throw new IllegalArgumentException(
+ String.format("Bad response entity upon receipt of versions <%s>", url), e);
+ }
+
+ final JsonArray projArray = new JsonParser().parse(string).getAsJsonArray();
+ for (int i = 0; i < projArray.size(); i++) {
+ final Long id = projArray.get(i).getAsJsonObject().get("id").getAsLong();
+ final String projName = projArray.get(i).getAsJsonObject().get("name").getAsString();
+ versions.put(projName, id);
+ }
+ } else {
+ throw new IllegalArgumentException(String
+ .format("Unexpected response status <%s> upon receipt of versions <%s>", statusCode, url));
+ }
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ return versions;
+ }
+
+ public static Long getVersionIdByName(final ZephyrRestClient restClient, final Long projectId,
+ final String versionName) {
+ final Map<String, Long> versions = getAllVersions(restClient, projectId);
+ final Long versionId = versions.get(versionName);
+ if (versionId == null) {
+ throw new IllegalArgumentException(String.format("Version <%s> not found among <%s>", versionName,
+ String.join(", ", versions.keySet())));
+ }
+ return versionId;
+ }
+}
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/messages.properties b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/messages.properties
new file mode 100644
index 0000000..1bddb02
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/internal/zephyr/messages.properties
@@ -0,0 +1,27 @@
+###############################################################################
+# Copyright (c) 2019 Xored Software Inc and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Xored Software Inc - initial API and implementation and/or initial documentation
+###############################################################################
+ZephyrPlugin_ErrorWhileSaving=Error while saving {0} parameter
+ZephyrPlugin_ErrorWhileGetting=Error while getting {0} parameter value
+ZephyrService_ZephyrIsNotEnabled=Zephyr engine is not enabled
+ZephyrService_SuccessfullyCreatedClient=Zephyr client was successfully created
+ZephyrService_ErrorWhileGettingLaunchProperty=Error while getting {0} property from Launch Configuration
+ZephyrService_TestCasePropertyIsNotSpecified=Test Case {0} property is not specified
+ZephyrService_TestCaseCanceled=Test Case was canceled and its results will not be added to Zephyr
+ZephyrService_ErrorWhileGettingTestCaseProperty=Error while getting {0} property from Test Case
+ZephyrService_FailedToSetUpConnection=Failed to set up connection to Test Rail
+ZephyrService_InvalidParameterValue=Invalid value of {0} parameter. {1}
+ZephyrService_InvalidZephyrId=Should start with "{0}" and end with positive number
+ZephyrService_InvalidURL=Should be valid URL
+ZephyrService_URLShouldEndsWithSlash=Should end with slash "/"
+ZephyrService_InvalidBoolean=Should be valid boolean value
+ZephyrService_UrlInvalid=This is not a valid URL
+ZephyrService_UrlSslError=SSL Exception
+ZephyrService_UrlConnectionError=Could not establish the connection
diff --git a/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/zephyr/ZephyrService.java b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/zephyr/ZephyrService.java
new file mode 100644
index 0000000..c754d85
--- /dev/null
+++ b/modules/zephyr/plugins/org.eclipse.rcptt.zephyr/src/org/eclipse/rcptt/zephyr/ZephyrService.java
@@ -0,0 +1,318 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.zephyr;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.net.ssl.SSLException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.rcptt.internal.core.model.Q7TestCase;
+import org.eclipse.rcptt.internal.launching.ExecutionSession;
+import org.eclipse.rcptt.internal.launching.ecl.EclScenarioExecutable;
+import org.eclipse.rcptt.internal.zephyr.ZephyrCycle;
+import org.eclipse.rcptt.internal.zephyr.Messages;
+import org.eclipse.rcptt.internal.zephyr.ZephyrProject;
+import org.eclipse.rcptt.internal.zephyr.ZephyrRestClient;
+import org.eclipse.rcptt.internal.zephyr.TestCaseResultModel;
+import org.eclipse.rcptt.internal.zephyr.ZephyrTestCase;
+import org.eclipse.rcptt.internal.zephyr.ZephyrVersion;
+import org.eclipse.rcptt.internal.zephyr.ZephyrConfigModel;
+import org.eclipse.rcptt.internal.zephyr.ZephyrPlugin;
+import org.eclipse.rcptt.launching.ITestEngine;
+import org.eclipse.rcptt.reporting.util.ReportUtils;
+import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Node;
+import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Report;
+
+public final class ZephyrService implements ITestEngine {
+ public static final String ZEPHYR_ISSUE = "zephyr-issue";
+
+ private static final String TEST_ENGINE_ENABLED = "enabled";
+ private static final String ZEPHYR_CONFIG_ADDRESS_PARAM = "baseUrl";
+ private static final String ZEPHYR_CONFIG_USERNAME_PARAM = "username";
+ private static final String ZEPHYR_CONFIG_PASSWORD_PARAM = "password";
+
+ private boolean zephyrEnabled;
+ private ZephyrConfigModel config;
+
+ @Override
+ public void testRunStarted(Map<String, String> config, List<Q7TestCase> tests) {
+ }
+
+ @Override
+ public void testRunCompleted() {
+ this.config.getRestClient().destroy();
+ }
+
+ @Override
+ public void sessionStarted(ExecutionSession session) {
+ }
+
+ @Override
+ public void sessionCompleted(ExecutionSession session) {
+
+ }
+
+ @Override
+ public void executionStarted(EclScenarioExecutable scenario, Map<String, String> config) {
+ applyConfig(scenario, config);
+
+ if (!zephyrEnabled) {
+ return;
+ }
+ final String issueName = this.getIssue((Q7TestCase) scenario.getActualElement());
+ this.config.setIssueName(issueName);
+ }
+
+ @Override
+ public void executionCompleted(EclScenarioExecutable scenario, Report report) {
+ if (!zephyrEnabled) {
+ return;
+ }
+
+ final Boolean passed = getZephyrStatus(scenario);
+ if (passed == null)
+ return;
+
+ final TestCaseResultModel testcase = new TestCaseResultModel(passed, getZephyrComment(scenario, report));
+
+ this.config.setTestcase(testcase);
+ ZephyrTestCase.processTestCaseDetails(this.config);
+
+ }
+
+ private void applyConfig(final EclScenarioExecutable scenario, final Map<String, String> config) {
+ final String address = config.get(ZEPHYR_CONFIG_ADDRESS_PARAM);
+ final String username = config.get(ZEPHYR_CONFIG_USERNAME_PARAM);
+ final String password = config.get(ZEPHYR_CONFIG_PASSWORD_PARAM);
+
+ final IProject rcpttProject = getIProject(scenario);
+ final String projectKey = ZephyrPlugin.getZephyrProject(rcpttProject);
+ final String versionKey = ZephyrPlugin.getZephyrVersion(rcpttProject);
+ final String cycleKey = ZephyrPlugin.getZephyrCycle(rcpttProject);
+
+ this.zephyrEnabled = true;
+ this.config = initializeZephyrData(address, username, password, projectKey, versionKey, cycleKey);
+ ZephyrPlugin.logInfo(Messages.ZephyrService_SuccessfullyCreatedClient);
+ }
+
+ private Boolean getZephyrStatus(final EclScenarioExecutable scenario) {
+ final int severity = scenario.getResultStatus().getSeverity();
+
+ switch (severity) {
+ case IStatus.OK:
+ case IStatus.INFO:
+ return true;
+ case IStatus.WARNING:
+ case IStatus.ERROR:
+ return false;
+ case IStatus.CANCEL:
+ return null;
+ }
+ return null;
+ }
+
+ private static final String TESTRESULT_CONTEXT_PREFIX = "__Contexts:__ ";
+ private static final String TESTRESULT_FAILMSG_PREFIX = "__Fail message:__\n";
+
+ private String getZephyrComment(EclScenarioExecutable scenario, Report report) {
+ String testCaseComment = "";
+
+ final List<String> variantName = scenario.getVariantName();
+ if (variantName != null && !variantName.isEmpty()) {
+ String contextNames = variantName.stream().collect(Collectors.joining(", ")).toString();
+ testCaseComment = TESTRESULT_CONTEXT_PREFIX + contextNames;
+ }
+
+ final int testCaseSeveriry = scenario.getResultStatus().getSeverity();
+ if (testCaseSeveriry == IStatus.ERROR) {
+ if (!testCaseComment.equals("")) {
+ testCaseComment += "\n\n";
+ }
+
+ final Node reportRoot = report.getRoot();
+ testCaseComment += TESTRESULT_FAILMSG_PREFIX + ReportUtils.getFailMessage(reportRoot);
+ }
+
+ return testCaseComment;
+ }
+
+ @Override
+ public String validateParameter(String name, String value) {
+ return null;
+ }
+
+ public Map<String, Long> getAllProjects() {
+ return ZephyrProject.getAllProjects(getRestClient());
+ }
+
+ public Map<String, Long> getAllVersions(final Long zephyrProject) {
+ return ZephyrVersion.getAllVersions(getRestClient(), zephyrProject);
+ }
+
+ public Map<String, Long> getAllCycles(final Long zephyrProject, final Long zephyrVersion) {
+ return ZephyrCycle.getAllCycles(getRestClient(), zephyrProject, zephyrVersion);
+ }
+
+ private ZephyrRestClient getRestClient() {
+ final String host = ZephyrPlugin.getZephyrAddress();
+ final String username = ZephyrPlugin.getZephyrUsername();
+ final String password = ZephyrPlugin.getZephyrPassword();
+ return new ZephyrRestClient(host, username, password);
+ }
+
+ private String getIssue(final Q7TestCase testCase) {
+ try {
+ final String testCaseId = testCase.getProperties().get(ZEPHYR_ISSUE);
+ if (testCaseId == null) {
+ ZephyrPlugin.logInfo(
+ MessageFormat.format(Messages.ZephyrService_TestCasePropertyIsNotSpecified, ZEPHYR_ISSUE));
+ return null;
+ }
+ return testCaseId;
+ } catch (Exception e) {
+ ZephyrPlugin.log(
+ MessageFormat.format(Messages.ZephyrService_ErrorWhileGettingTestCaseProperty, ZEPHYR_ISSUE), e);
+ return null;
+ }
+ }
+
+ public IStatus doTestConnection(final String host, final String username, final String password) {
+
+ final String serverAddress = StringUtils.removeEnd(host, "/");
+
+ if (StringUtils.isBlank(serverAddress)) {
+ return ZephyrPlugin.createStatus(IStatus.ERROR, "Please enter the server name");
+ }
+
+ if (StringUtils.isBlank(username)) {
+ return ZephyrPlugin.createStatus(IStatus.ERROR, "Please enter the username");
+ }
+
+ if (StringUtils.isBlank(password)) {
+ return ZephyrPlugin.createStatus(IStatus.ERROR, "Please enter the password");
+ }
+
+ if (!(serverAddress.trim().startsWith("https://") || serverAddress.trim().startsWith("http://"))) {
+ return ZephyrPlugin.createStatus(IStatus.ERROR, "Incorrect server address format");
+ }
+
+ final String jiraURL = validateURL(serverAddress);
+
+ if (!jiraURL.startsWith("http")) {
+ return ZephyrPlugin.createStatus(IStatus.ERROR, jiraURL);
+ }
+ final ZephyrRestClient restClient = new ZephyrRestClient(serverAddress, username, password);
+
+ if (!restClient.validateConnection()) {
+ return ZephyrPlugin.createStatus(IStatus.ERROR, "This is not a valid Jira Server");
+ }
+
+ if (!restClient.validateCredentials()) {
+ return ZephyrPlugin.createStatus(IStatus.ERROR, "Invalid user credentials");
+ }
+ restClient.destroy();
+ return ZephyrPlugin.createStatus(IStatus.OK, "Connection to JIRA has been validated");
+ }
+
+ public static String validateURL(String string) {
+ StringBuilder builder = new StringBuilder();
+ try {
+ final URL url = new URL(string);
+ final URLConnection conn = url.openConnection();
+ conn.connect();
+ conn.getInputStream().close();
+
+ builder.append(url.getProtocol());
+ builder.append("://");
+ builder.append(url.getHost());
+
+ final int port = url.getPort();
+ if (port > 0) {
+ builder.append(":");
+ builder.append(port);
+
+ }
+ } catch (MalformedURLException e) {
+ return Messages.ZephyrService_UrlInvalid;
+ } catch (SSLException e) {
+ return Messages.ZephyrService_UrlSslError;
+ } catch (IOException e) {
+ return Messages.ZephyrService_UrlConnectionError;
+ }
+ return builder.toString();
+ }
+
+ private ZephyrConfigModel initializeZephyrData(final String host, final String username, final String password,
+ final String projectKey, final String versionKey, final String cycleKey) {
+ final ZephyrConfigModel zephyrConfig = new ZephyrConfigModel();
+
+ zephyrConfig.setRestClient(new ZephyrRestClient(host, username, password));
+ zephyrConfig.setTestIssueTypeId(zephyrConfig.getRestClient().findZephyrTypeId());
+
+ zephyrConfig.setZephyrProjectId(ZephyrProject.getProjectIdByName(projectKey, zephyrConfig.getRestClient()));
+ zephyrConfig.setVersionId(ZephyrVersion.getVersionIdByName(zephyrConfig.getRestClient(),
+ zephyrConfig.getProjectId(), versionKey));
+ zephyrConfig.setCycleId(ZephyrCycle.getCycleIdByName(zephyrConfig.getRestClient(), zephyrConfig.getProjectId(),
+ zephyrConfig.getVersionId(), cycleKey));
+
+ return zephyrConfig;
+ }
+
+ private IProject getIProject(final EclScenarioExecutable scenario) {
+ return scenario.getActualElement().getParent().getParent().getQ7Project().getProject();
+ }
+
+ @Override
+ public void setConfiguration(Map<String, String> config) {
+ final String isEnabled = config.get(TEST_ENGINE_ENABLED);
+ final boolean state = isEnabled == null ? true : Boolean.getBoolean(isEnabled);
+ ZephyrPlugin.setZephyrEnabled(state);
+
+ final String address = config.get(ZEPHYR_CONFIG_ADDRESS_PARAM);
+ ZephyrPlugin.setZephyrAddress(address);
+
+ final String username = config.get(ZEPHYR_CONFIG_USERNAME_PARAM);
+ ZephyrPlugin.setZephyrUsername(username);
+
+ final String password = config.get(ZEPHYR_CONFIG_PASSWORD_PARAM);
+ ZephyrPlugin.setZephyrPassword(password);
+ }
+
+ @Override
+ public Map<String, String> getConfiguration() {
+ final Map<String, String> config = new HashMap<String, String>();
+
+ final boolean isEnabled = ZephyrPlugin.getZephyrEnabled();
+ config.put(TEST_ENGINE_ENABLED, Boolean.toString(isEnabled));
+
+ final String address = ZephyrPlugin.getZephyrAddress();
+ config.put(ZEPHYR_CONFIG_ADDRESS_PARAM, address);
+
+ final String username = ZephyrPlugin.getZephyrUsername();
+ config.put(ZEPHYR_CONFIG_USERNAME_PARAM, username);
+
+ final String password = ZephyrPlugin.getZephyrPassword();
+ config.put(ZEPHYR_CONFIG_PASSWORD_PARAM, password);
+
+ return config;
+ }
+}
diff --git a/modules/zephyr/pom.xml b/modules/zephyr/pom.xml
new file mode 100644
index 0000000..3f8c65f
--- /dev/null
+++ b/modules/zephyr/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2019 Xored Software Inc and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Xored Software Inc - initial API and implementation and/or initial documentation
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>rcptt-module-zephyr</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.eclipse.rcptt</groupId>
+ <artifactId>ide</artifactId>
+ <version>2.5.0-SNAPSHOT</version>
+ <relativePath>../../releng/ide/pom.xml</relativePath>
+ </parent>
+
+ <repositories combine.self="override">
+ <repository>
+ <id>rcptt-core-dep</id>
+ <layout>p2</layout>
+ <url>${coreRepository}</url>
+ </repository>
+ </repositories>
+
+ <modules>
+ <module>plugins/org.eclipse.rcptt.zephyr</module>
+ <module>plugins/org.eclipse.rcptt.zephyr.ui</module>
+ <module>features/org.eclipse.rcptt.module.zephyr</module>
+ <module>site</module>
+ </modules>
+</project>
diff --git a/modules/zephyr/site/pom.xml b/modules/zephyr/site/pom.xml
new file mode 100644
index 0000000..1ecae50
--- /dev/null
+++ b/modules/zephyr/site/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2019 Xored Software Inc and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Xored Software Inc - initial API and implementation and/or initial documentation
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>rcptt-module-zephyr</artifactId>
+ <groupId>org.eclipse.rcptt</groupId>
+ <version>2.5.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.rcptt.module.zephyr-site</artifactId>
+ <packaging>eclipse-update-site</packaging>
+</project>
diff --git a/modules/zephyr/site/site.xml b/modules/zephyr/site/site.xml
new file mode 100644
index 0000000..5ba973f
--- /dev/null
+++ b/modules/zephyr/site/site.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2019 Xored Software Inc and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Xored Software Inc - initial API and implementation and/or initial documentation
+ -->
+
+<site>
+ <feature url="features/org.eclipse.rcptt.module.zephyr_2.5.0.qualifier.jar" id="org.eclipse.rcptt.module.zephyr" version="2.5.0.qualifier">
+ <category name="rcptt"/>
+ </feature>
+ <category-def name="rcptt" label="RCP Testing Tool"/>
+</site>
diff --git a/rcp/org.eclipse.rcptt.platform-feature/feature.xml b/rcp/org.eclipse.rcptt.platform-feature/feature.xml
index f7efe2d..447f59f 100644
--- a/rcp/org.eclipse.rcptt.platform-feature/feature.xml
+++ b/rcp/org.eclipse.rcptt.platform-feature/feature.xml
@@ -43,6 +43,7 @@
<import plugin="org.eclipse.equinox.simpleconfigurator" version="0.0.0"/>
<import feature="org.eclipse.rcptt.module.nebula" version="2.5.0" match="compatible"/>
<import feature="org.eclipse.rcptt.module.testrail" version="2.5.0" match="compatible"/>
+ <import feature="org.eclipse.rcptt.module.zephyr" version="2.5.0" match="compatible"/>
<import feature="org.eclipse.rcptt.launching" version="2.5.0" match="compatible"/>
<import feature="org.eclipse.rcptt.core" version="2.5.0" match="compatible"/>
<import feature="org.eclipse.emf.transaction" version="0.0.0" match="greaterOrEqual"/>
diff --git a/rcp/org.eclipse.rcptt.ui/plugin.xml b/rcp/org.eclipse.rcptt.ui/plugin.xml
index 1a44708..51ca005 100644
--- a/rcp/org.eclipse.rcptt.ui/plugin.xml
+++ b/rcp/org.eclipse.rcptt.ui/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2009, 2016 Xored Software Inc and others.
+ Copyright (c) 2009, 2019 Xored Software Inc and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -1053,9 +1053,6 @@
</target>
</extension>
<extension
- point="org.eclipse.ui.preferencePages">
- </extension>
- <extension
point="org.eclipse.ui.editors.annotationTypes">
<type
name="org.eclipse.rcptt.ui.occurrences">
diff --git a/releng/ide/pom.xml b/releng/ide/pom.xml
index 7eb9b6b..4956545 100644
--- a/releng/ide/pom.xml
+++ b/releng/ide/pom.xml
@@ -23,6 +23,7 @@
<module>../../modules/nebula</module>
<module>../../launching</module>
<module>../../modules/testrail</module>
+ <module>../../modules/zephyr</module>
<module>../../rcp</module>
<module>../../testing</module>
diff --git a/releng/target-platforms/2019-12/ide.target b/releng/target-platforms/2019-12/ide.target
index 8f1d3a7..0bfc5a4 100644
--- a/releng/target-platforms/2019-12/ide.target
+++ b/releng/target-platforms/2019-12/ide.target
@@ -7,6 +7,7 @@
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="org.hamcrest" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
+<unit id="org.apache.commons.lang3" version="0.0.0"/>
<unit id="org.apache.poi" version="0.0.0"/>
<unit id="org.apache.poi.ooxml" version="0.0.0"/>
<unit id="com.sun.xml.bind" version="0.0.0"/>
diff --git a/repository/full/category.xml b/repository/full/category.xml
index b6d63e8..e8600e7 100644
--- a/repository/full/category.xml
+++ b/repository/full/category.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2009, 2016 Xored Software Inc and others.
+ Copyright (c) 2009, 2019 Xored Software Inc and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -56,5 +56,8 @@
<feature id="org.eclipse.rcptt.module.testrail">
<category name="rcptt"/>
</feature>
+ <feature id="org.eclipse.rcptt.module.zephyr">
+ <category name="rcptt"/>
+ </feature>
<category-def label="RCP Testing Tool" name="rcptt"/>
</site>
diff --git a/repository/full/org.eclipse.rcptt.product b/repository/full/org.eclipse.rcptt.product
index 897057e..15d57e6 100644
--- a/repository/full/org.eclipse.rcptt.product
+++ b/repository/full/org.eclipse.rcptt.product
@@ -310,6 +310,7 @@
<feature id="org.eclipse.emf.databinding"/>
<feature id="org.eclipse.rcptt.module.nebula"/>
<feature id="org.eclipse.rcptt.module.testrail"/>
+ <feature id="org.eclipse.rcptt.module.zephyr"/>
<feature id="org.eclipse.emf.validation"/>
<feature id="org.eclipse.emf.edit"/>
<feature id="org.eclipse.emf.transaction"/>
diff --git a/repository/rcptt/category.xml b/repository/rcptt/category.xml
index c8caecf..d677a0b 100644
--- a/repository/rcptt/category.xml
+++ b/repository/rcptt/category.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2009, 2016 Xored Software Inc and others.
+ Copyright (c) 2009, 2019 Xored Software Inc and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -53,6 +53,9 @@
<feature id="org.eclipse.rcptt.module.testrail">
<category name="rcptt"/>
</feature>
+ <feature id="org.eclipse.rcptt.module.zephyr">
+ <category name="rcptt"/>
+ </feature>
<feature id="org.eclipse.rcptt.rap.ui.feature">
<category name="rcptt"/>
diff --git a/runner/product/rcptt.runner.product b/runner/product/rcptt.runner.product
index e1e4bb9..41adba6 100644
--- a/runner/product/rcptt.runner.product
+++ b/runner/product/rcptt.runner.product
@@ -46,9 +46,10 @@
<plugin id="org.apache.ant"/>
<!-- <plugin id="org.apache.batik.css"/>
<plugin id="org.apache.batik.util.gui"/>
- <plugin id="org.apache.batik.util"/>
- --><plugin id="org.apache.commons.codec"/>
+ <plugin id="org.apache.batik.util"/> -->
+ <plugin id="org.apache.commons.codec"/>
<plugin id="org.apache.commons.jxpath"/>
+ <plugin id="org.apache.commons.lang3" />
<plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.runtime"/>
@@ -167,8 +168,8 @@
<!-- <plugin id="org.eclipse.equinox.p2.ui.importexport"/>
<plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/>
<plugin id="org.eclipse.equinox.p2.ui.sdk"/>
- <plugin id="org.eclipse.equinox.p2.ui"/>
- --><plugin id="org.eclipse.equinox.p2.updatechecker"/>
+ <plugin id="org.eclipse.equinox.p2.ui"/> -->
+ <plugin id="org.eclipse.equinox.p2.updatechecker"/>
<plugin id="org.eclipse.equinox.p2.updatesite"/>
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
@@ -237,8 +238,8 @@
<plugin id="org.eclipse.pde.ua.core"/>
<!-- <plugin id="org.eclipse.pde.ua.ui"/> -->
<!-- <plugin id="org.eclipse.pde.ui.templates"/>
- <plugin id="org.eclipse.pde.ui"/>
- --><plugin id="org.eclipse.pde"/>
+ <plugin id="org.eclipse.pde.ui"/> -->
+ <plugin id="org.eclipse.pde"/>
<!-- <plugin id="org.eclipse.platform.doc.user"/> -->
<plugin id="org.eclipse.platform"/>
<plugin id="org.eclipse.rcp"/>
@@ -303,6 +304,7 @@
<plugin id="org.eclipse.rcptt.testrail"/>
<plugin id="org.eclipse.rcptt.testrail.ecl"/>
<plugin id="org.eclipse.rcptt.module.testrail.updates"/>
+ <plugin id="org.eclipse.rcptt.zephyr"/>
<plugin id="org.eclipse.rcptt.tesla.nebula.ecl"/>
<plugin id="org.eclipse.rcptt.tesla.nebula"/>
<plugin id="org.eclipse.rcptt.tesla.recording.core.ecl"/>
