fixed portal references

SmartBear · Sep 30, 2019 · 9459ce0 · 9459ce0
1 parent 1a1ddae
commit 9459ce0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Configuration parameters are:
 * username (required) : the TestEngine username to use for authentication
 * password (required) : the TestEngine password to use for authentication
 * server (required) : endpoint of the TestEngine (no trailing slash!)
-* projectsDirectpry : the folder to scan recursively for projects and recipes, defaults to ${project.basedir}/src/test/resources/test-projects
+* projectsDirectory : the folder to scan recursively for projects and recipes, defaults to ${project.basedir}/src/test/resources/test-projects
 * targetDirectory : the folder to which filtered recipes will be copied before executing, defaults
 to ${project.basedir}/target/test-recipes
 * properties : an optional set of additional properties that will be used during filtering (see below)

diff --git a/pom.xml b/pom.xml
@@ -39,12 +39,12 @@
     </licenses>
 
     <properties>
-        <portal.app.conf>config</portal.app.conf>
-        <portal.api.swagger.file>testengine-api.yml</portal.api.swagger.file>
-        <portal.api.name>readyapi-testengine</portal.api.name>
-        <portal-api.apis.owner>smartbear</portal-api.apis.owner>
-        <portal.api.version>1.0.1</portal.api.version>
-        <portal.api.folder>testengine</portal.api.folder>
+        <testengine.app.conf>config</testengine.app.conf>
+        <testengine.api.swagger.file>testengine-api.yml</testengine.api.swagger.file>
+        <testengine.api.name>readyapi-testengine</testengine.api.name>
+        <testengine-api.apis.owner>smartbear</testengine-api.apis.owner>
+        <testengine.api.version>1.0.1</testengine.api.version>
+        <testengine.api.folder>testengine</testengine.api.folder>
 
         <swaggerhub.apis.host>https://api.swaggerhub.com/apis</swaggerhub.apis.host>
 
@@ -147,10 +147,12 @@
             <version>2.0.0.Final</version>
         </dependency>
 
+        <!-- required by codegen generated classes -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <version>4.1.6.RELEASE</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 
@@ -205,38 +207,37 @@
                 <executions>
 
                     <execution>
-                        <id>portal-api-spec-generator</id>
+                        <id>testengine-api-spec-generator</id>
                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <inputSpec>${swaggerhub.apis.host}/${portal-api.apis.owner}/${portal.api.name}/${portal.api.version}</inputSpec>
+                            <inputSpec>${swaggerhub.apis.host}/${testengine-api.apis.owner}/${testengine.api.name}/${testengine.api.version}</inputSpec>
                             <language>openapi-yaml</language>
-                            <output>${codegen.directory}/${portal.api.folder}</output>
+                            <output>${codegen.directory}/${testengine.api.folder}</output>
                             <configOptions>
-                                <outputFile>${portal.api.swagger.file}</outputFile>
+                                <outputFile>${testengine.api.swagger.file}</outputFile>
                             </configOptions>
                         </configuration>
                     </execution>
 
                     <execution>
-                        <id>generate-portal-api</id>
+                        <id>generate-testengine-api</id>
                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <inputSpec>${codegen.directory}/${portal.api.folder}/${portal.api.swagger.file}</inputSpec>
+                            <inputSpec>${codegen.directory}/${testengine.api.folder}/${testengine.api.swagger.file}</inputSpec>
                             <generateSupportingFiles>false</generateSupportingFiles>
                             <generateApiTests>false</generateApiTests>
                             <language>spring</language>
 
                             <configOptions>
                                 <output>${project.build.directory}/generated-sources</output>
-                                <modelPackage>${project.groupId}.portal.model</modelPackage>
-                                <apiPackage>${project.groupId}.portal.api</apiPackage>
+                                <modelPackage>${project.groupId}.testengine.model</modelPackage>
+                                <apiPackage>${project.groupId}.testengine.api</apiPackage>
                                 <java8>true</java8>
                                 <interfaceOnly>true</interfaceOnly>
-
                             </configOptions>
 
                         </configuration>

diff --git a/src/main/java/com/smartbear/readyapi/maven/RunMojo.java b/src/main/java/com/smartbear/readyapi/maven/RunMojo.java
@@ -20,7 +20,10 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.io.CharStreams;
-import com.smartbear.readyapi.portal.model.*;
+import com.smartbear.readyapi.testengine.model.TestCaseResultReport;
+import com.smartbear.readyapi.testengine.model.TestJobReport;
+import com.smartbear.readyapi.testengine.model.TestStepResultReport;
+import com.smartbear.readyapi.testengine.model.TestSuiteResultReport;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;