From 361e040308af55c752f919313bf4f36afbb2e63f Mon Sep 17 00:00:00 2001
From: mar3kl <markl@tibco.com>
Date: Tue, 19 Dec 2023 09:01:37 -0800
Subject: [PATCH] TCS rebrand
---
.../tibco/ep/buildmavenplugin/BaseMojo.java | 4 +-
...ntMojo.java => PackageSWFragmentMojo.java} | 13 ++--
.../m2e/lifecycle-mapping-metadata.xml | 2 +-
.../resources/META-INF/plexus/components.xml | 8 +--
ep-maven/src/site/markdown/goals.md.vm | 6 +-
.../{tcs_examples.md.vm => sw_examples.md.vm} | 40 ++++++-------
.../{tcs-structure.svg => sw-structure.svg} | 4 +-
.../{tcs-structure.uxf => sw-structure.uxf} | 4 +-
ep-maven/src/site/markdown/usage.md | 16 ++---
ep-maven/src/site/site.xml | 4 +-
.../ep/buildmavenplugin/PackageTest.java | 60 +++++++++----------
.../src/test/projects/application/deploy.xml | 4 +-
.../src/test/projects/application/pom.xml | 4 +-
.../src/test/projects/{tcs => sw}/pom.xml | 7 +--
.../sw/src/main/configurations/engine.conf | 7 +++
.../src/main/configurations/flow.conf | 2 +-
.../com/tibco/ep/testmavenplugin/Test.schema | 0
.../src/main/resources/logback.xml | 0
.../tcs/src/main/configurations/engine.conf | 7 ---
19 files changed, 95 insertions(+), 97 deletions(-)
rename ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/{PackageTCSFragmentMojo.java => PackageSWFragmentMojo.java} (81%)
rename ep-maven/src/site/markdown/{tcs_examples.md.vm => sw_examples.md.vm} (70%)
rename ep-maven/src/site/markdown/uml/{tcs-structure.svg => sw-structure.svg} (98%)
rename ep-maven/src/site/markdown/uml/{tcs-structure.uxf => sw-structure.uxf} (83%)
rename ep-maven/src/test/projects/{tcs => sw}/pom.xml (85%)
create mode 100644 ep-maven/src/test/projects/sw/src/main/configurations/engine.conf
rename ep-maven/src/test/projects/{tcs => sw}/src/main/configurations/flow.conf (97%)
rename ep-maven/src/test/projects/{tcs => sw}/src/main/resources/com/tibco/ep/testmavenplugin/Test.schema (100%)
rename ep-maven/src/test/projects/{tcs => sw}/src/main/resources/logback.xml (100%)
delete mode 100644 ep-maven/src/test/projects/tcs/src/main/configurations/engine.conf
diff --git a/ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/BaseMojo.java b/ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/BaseMojo.java
index 4206c723..2594ba56 100644
--- a/ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/BaseMojo.java
+++ b/ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/BaseMojo.java
@@ -126,9 +126,9 @@ abstract class BaseMojo extends AbstractMojo {
*/
protected static String LIVEVIEW_TYPE = "ep-liveview-fragment";
/**
- * TIBCO Cloud Streaming packaging and type
+ * Streaming Web flow packaging and type
*/
- protected static String TCS_TYPE = "ep-tcs-fragment";
+ protected static String TCS_TYPE = "ep-sw-fragment";
/**
* system property for reports
*/
diff --git a/ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/PackageTCSFragmentMojo.java b/ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/PackageSWFragmentMojo.java
similarity index 81%
rename from ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/PackageTCSFragmentMojo.java
rename to ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/PackageSWFragmentMojo.java
index ae971e34..865eee1a 100644
--- a/ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/PackageTCSFragmentMojo.java
+++ b/ep-maven/src/main/java/com/tibco/ep/buildmavenplugin/PackageSWFragmentMojo.java
@@ -1,8 +1,7 @@
/*******************************************************************************
*
* COPYRIGHT
- * Copyright 2019-2020 TIBCO Software Inc. ALL RIGHTS RESERVED.
- * TIBCO Software Inc. Confidential Information
+ * Copyright (c) 2019-2023 Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
*
*******************************************************************************/
package com.tibco.ep.buildmavenplugin;
@@ -14,7 +13,7 @@
import static org.apache.maven.plugins.annotations.LifecyclePhase.PACKAGE;
/**
- * <p>Build a TCS fragment</p>
+ * <p>Build a Streaming Web flow fragment</p>
*
* <p>The packaging rules are as follows :-</p>
* <ol>
@@ -42,14 +41,14 @@
* from the nar AOL values (http://maven-nar.github.io/aol.html) to internal
* values.</p>
*
- * <p>The generated filename is <artifactId>-<version>-ep-tcs-fragment.zip</p>
+ * <p>The generated filename is <artifactId>-<version>-ep-sw-fragment.zip</p>
*/
-@Mojo(name = "package-tcs-fragment", defaultPhase = PACKAGE, requiresDependencyResolution = ResolutionScope.RUNTIME, threadSafe = true)
-public class PackageTCSFragmentMojo extends BasePackageMojo {
+@Mojo(name = "package-sw-fragment", defaultPhase = PACKAGE, requiresDependencyResolution = ResolutionScope.RUNTIME, threadSafe = true)
+public class PackageSWFragmentMojo extends BasePackageMojo {
@Override
public void execute() throws MojoExecutionException {
- getLog().debug("Creating TCS fragment");
+ getLog().debug("Creating Streaming Web flow fragment");
prechecks();
diff --git a/ep-maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/ep-maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
index 6d89acd6..904e4385 100644
--- a/ep-maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
+++ b/ep-maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
@@ -38,7 +38,7 @@
<goal>generate-test-eventflow</goal>
<goal>package-liveview-fragment</goal>
<goal>package-eventflow-fragment</goal>
- <goal>package-tcs-fragment</goal>
+ <goal>package-sw-fragment</goal>
<goal>package-application</goal>
</goals>
</pluginExecutionFilter>
diff --git a/ep-maven/src/main/resources/META-INF/plexus/components.xml b/ep-maven/src/main/resources/META-INF/plexus/components.xml
index 7d834c63..19569706 100644
--- a/ep-maven/src/main/resources/META-INF/plexus/components.xml
+++ b/ep-maven/src/main/resources/META-INF/plexus/components.xml
@@ -60,12 +60,12 @@
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>ep-tcs-fragment</role-hint>
+ <role-hint>ep-sw-fragment</role-hint>
<implementation>
org.apache.maven.artifact.handler.DefaultArtifactHandler
</implementation>
<configuration>
- <type>ep-tcs-fragment</type>
+ <type>ep-sw-fragment</type>
<extension>zip</extension>
<language>java</language>
<addedToClasspath>true</addedToClasspath>
@@ -312,7 +312,7 @@
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>ep-tcs-fragment</role-hint>
+ <role-hint>ep-sw-fragment</role-hint>
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
<configuration>
<lifecycles>
@@ -345,7 +345,7 @@
org.apache.maven.plugins:maven-compiler-plugin:testCompile
</test-compile>
<package>
- ${project.groupId}:${project.artifactId}:${project.version}:package-tcs-fragment
+ ${project.groupId}:${project.artifactId}:${project.version}:package-sw-fragment
</package>
<install>
org.apache.maven.plugins:maven-install-plugin:install
diff --git a/ep-maven/src/site/markdown/goals.md.vm b/ep-maven/src/site/markdown/goals.md.vm
index c9bfd599..5ebcb481 100644
--- a/ep-maven/src/site/markdown/goals.md.vm
+++ b/ep-maven/src/site/markdown/goals.md.vm
@@ -21,7 +21,7 @@ The maven goals available are :
* [com.tibco.ep:ep-maven-plugin:test-eventflow-fragment](${context.get("site.ep-maven-plugin.url")}/test-eventflow-fragment-mojo.html)
-* [com.tibco.ep:ep-maven-plugin:package-tcs-fragment](${context.get("site.ep-maven-plugin.url")}/package-tcs-fragment-mojo.html)
+* [com.tibco.ep:ep-maven-plugin:package-sw-fragment](${context.get("site.ep-maven-plugin.url")}/package-sw-fragment-mojo.html)
* [com.tibco.ep:ep-maven-plugin:package-liveview-fragment](${context.get("site.ep-maven-plugin.url")}/package-liveview-fragment-mojo.html)
@@ -124,7 +124,7 @@ Clean lifecycle :-
| pre-clean | [com.tibco.ep:ep-maven-plugin:install-product](${context.get("site.ep-maven-plugin.url")}/install-product-mojo.html)
| clean | <br>[com.tibco.ep:ep-maven-plugin:stop-nodes](${context.get("site.ep-maven-plugin.url")}/stop-nodes-mojo.html),</br><br>[org.apache.maven.plugins:maven-clean-plugin:clean](https://maven.apache.org/plugins/maven-clean-plugin/clean-mojo.html)</br>
-* Packaging **ep-tcs-fragment**
+* Packaging **ep-sw-fragment**
Default lifecycle :
@@ -135,7 +135,7 @@ Default lifecycle :
| compile | [org.apache.maven.plugins:maven-compiler-plugin:compile](https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html)
| process-test-resources | <br>[org.apache.maven.plugins:maven-resources-plugin:testResources](https://maven.apache.org/plugins/maven-resources-plugin/)</br>,<br>[org.apache.maven.plugins:maven-compiler-plugin:testCompile](https://maven.apache.org/plugins/maven-compiler-plugin/testCompile-mojo.html)</br><br>[com.tibco.ep:ep-maven-plugin:generate-main-eventflow](${context.get("site.ep-maven-plugin.url")}/generate-main-eventflow-mojo.html),</br>
| test-compile | [org.apache.maven.plugins:maven-compiler-plugin:testCompile](https://maven.apache.org/plugins/maven-compiler-plugin/testCompile-mojo.html)
-| package | [com.tibco.ep:ep-maven-plugin:package-tcs-fragment](${context.get("site.ep-maven-plugin.url")}/package-tcs-fragment-mojo.html)
+| package | [com.tibco.ep:ep-maven-plugin:package-sw-fragment](${context.get("site.ep-maven-plugin.url")}/package-sw-fragment-mojo.html)
| install | [org.apache.maven.plugins:maven-install-plugin:install](https://maven.apache.org/plugins/maven-install-plugin/install-mojo.html)
| deploy | [org.apache.maven.plugins:maven-deploy-plugin:deploy](https://maven.apache.org/plugins/maven-deploy-plugin/)
diff --git a/ep-maven/src/site/markdown/tcs_examples.md.vm b/ep-maven/src/site/markdown/sw_examples.md.vm
similarity index 70%
rename from ep-maven/src/site/markdown/tcs_examples.md.vm
rename to ep-maven/src/site/markdown/sw_examples.md.vm
index 54db08a3..5eca8d89 100644
--- a/ep-maven/src/site/markdown/tcs_examples.md.vm
+++ b/ep-maven/src/site/markdown/sw_examples.md.vm
@@ -1,4 +1,4 @@
-# TIBCO Cloud Streaming fragment examples
+# Streaming Web flow fragment examples
* [Directory structure](#directory-structure)
* [Basic build and install](#basic-build-and-install)
@@ -8,9 +8,9 @@
# Directory structure
-The recommended TIBCO Cloud Streaming directory structure is :
+The recommended Spotfire Streaming directory structure is :
-
+
Note that the default source directory is set by the plugin to
src/main/eventflow.
@@ -31,15 +31,15 @@ repository, a TIBCO Cloud Streaming fragment.
<modelVersion>4.0.0</modelVersion>
<groupId>com.tibco.ep</groupId>
- <artifactId>tcsfrag</artifactId>
- <packaging>ep-tcs-fragment</packaging>
+ <artifactId>swfrag</artifactId>
+ <packaging>ep-sw-fragment</packaging>
<version>1.0.0</version>
<name>hello world</name>
<!-- common definitions for this version of StreamBase -->
<parent>
<groupId>com.tibco.ep.sb.parent</groupId>
- <artifactId>ep-tcs-fragment</artifactId>
+ <artifactId>ep-sw-fragment</artifactId>
<version>${sbrtVersion}</version>
</parent>
@@ -54,8 +54,8 @@ maven to perform the following steps :
installed. If its not, maven will download the archive and the plugin
will extract into $TIBCO_EP_HOME.
-2. Uses [package-tcs-fragment](${context.get("site.ep-maven-plugin.url")}/package-tcs-fragment-mojo.html) to create
- a TIBCO Cloud Streaming fragment zip file in the build directory (by default, set to target)
+2. Uses [package-sw-fragment](${context.get("site.ep-maven-plugin.url")}/package-sw-fragment-mojo.html) to create
+ a Streaming Web flow fragment zip file in the build directory (by default, set to target)
and attaches it to the build.
3. Uses the standard maven plugin [maven-install-plugin:install](https://maven.apache.org/plugins/maven-install-plugin/install-mojo.html)
@@ -68,30 +68,30 @@ $ mvn install
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
-[INFO] Building TCS Fragment - GoldyLocks 3.0.0
+[INFO] Building Streaming Web Flow Fragment - GoldyLocks 3.0.0
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- ep-maven-plugin:1.0.0:install-product (default-install-product-1) @ goldylocks ---
[INFO] com.tibco.ep.thirdparty:tibco-sb_osxx86_64:zip:7.6.0:test already installed
[INFO]
-[INFO] --- ep-maven-plugin:1.3.1-SNAPSHOT:package-tcs-fragment (default-package-tcs-fragment) @ tcs ---
-[INFO] Building zip: /Users/markl/examples/tcs/target/tcs-10.5.0-SNAPSHOT-ep-tcs-fragment.zip
+[INFO] --- ep-maven-plugin:1.3.1-SNAPSHOT:package-sw-fragment (default-package-sw-fragment) @ sw ---
+[INFO] Building zip: /Users/me/examples/sw/target/sw-10.5.0-SNAPSHOT-ep-sw-fragment.zip
[INFO]
-[INFO] >>> maven-source-plugin:3.0.1:jar (attach-sources) > generate-sources @ tcs >>>
+[INFO] >>> maven-source-plugin:3.0.1:jar (attach-sources) > generate-sources @ sw >>>
[INFO]
-[INFO] --- ep-maven-plugin:1.3.1-SNAPSHOT:install-product (default-install-product-1) @ tcs ---
-[INFO] com.tibco.ep.sb.rt:platform_osxx86_64:zip:10.5.0-SNAPSHOT:test already installed manually to /Users/markl/work/sb10dist
+[INFO] --- ep-maven-plugin:1.3.1-SNAPSHOT:install-product (default-install-product-1) @ sw ---
+[INFO] com.tibco.ep.sb.rt:platform_osxx86_64:zip:10.5.0-SNAPSHOT:test already installed manually to /Users/me/work/sb10dist
[INFO]
[INFO] --- buildnumber-maven-plugin:1.4:create-timestamp (default) @ goldylocks ---
[INFO]
-[INFO] --- maven-source-plugin:3.0.1:jar (attach-sources) @ tcs ---
+[INFO] --- maven-source-plugin:3.0.1:jar (attach-sources) @ sw ---
[INFO]
-[INFO] --- maven-javadoc-plugin:3.0.1:jar (attach-javadocs) @ tcs ---
+[INFO] --- maven-javadoc-plugin:3.0.1:jar (attach-javadocs) @ sw ---
[INFO]
-[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ tcs ---
-[INFO] Installing /Users/markl/examples/tcs/target/tcs-10.5.0-SNAPSHOT-ep-tcs-fragment.zip to /Users/markl/workspace/BUILD/repository/com/tibco/example/tcs/10.5.0-SNAPSHOT/tcs-10.5.0-SNAPSHOT.zip
-[INFO] Installing /Users/markl/examples/tcs/pom.xml to /Users/markl/workspace/BUILD/repository/com/tibco/example/tcs/10.5.0-SNAPSHOT/tcs-10.5.0-SNAPSHOT.pom
-[INFO] Installing /Users/markl/examples/tcs/target/tcs-10.5.0-SNAPSHOT-sources.jar to /Users/markl/workspace/BUILD/repository/com/tibco/example/tcs/10.5.0-SNAPSHOT/tcs-10.5.0-SNAPSHOT-sources.jar
+[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ sw ---
+[INFO] Installing /Users/me/examples/sw/target/sw-10.5.0-SNAPSHOT-ep-sw-fragment.zip to /Users/me/workspace/BUILD/repository/com/tibco/example/sw/10.5.0-SNAPSHOT/sw-10.5.0-SNAPSHOT.zip
+[INFO] Installing /Users/me/examples/sw/pom.xml to /Users/me/workspace/BUILD/repository/com/tibco/example/sw/10.5.0-SNAPSHOT/sw-10.5.0-SNAPSHOT.pom
+[INFO] Installing /Users/me/examples/sw/target/sw-10.5.0-SNAPSHOT-sources.jar to /Users/me/workspace/BUILD/repository/com/tibco/example/sw/10.5.0-SNAPSHOT/sw-10.5.0-SNAPSHOT-sources.jar
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
diff --git a/ep-maven/src/site/markdown/uml/tcs-structure.svg b/ep-maven/src/site/markdown/uml/sw-structure.svg
similarity index 98%
rename from ep-maven/src/site/markdown/uml/tcs-structure.svg
rename to ep-maven/src/site/markdown/uml/sw-structure.svg
index 5dcaea6c..de59aae1 100644
--- a/ep-maven/src/site/markdown/uml/tcs-structure.svg
+++ b/ep-maven/src/site/markdown/uml/sw-structure.svg
@@ -25,7 +25,7 @@
><path fill="none" d="M10.5 10.5 L20.5 10.5 L20.5 15.5 L40.5 15.5 L40.5 30.5 L10.5 30.5 Z" clip-path="url(#clipPath2)"
/><path fill="none" d="M10.5 15.5 L20.5 15.5" clip-path="url(#clipPath2)"
/><text x="44.5" font-size="14px" y="26" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" xml:space="preserve"
- >ep-tcs-fragment - pom.xml</text
+ >ep-sw-fragment - pom.xml</text
></g
><g font-size="14px" transform="translate(40,10)" fill-opacity="0" fill="rgb(255,255,255)" font-family="sans-serif" stroke="rgb(255,255,255)" stroke-opacity="0"
><path d="M52.5 42.5 L62.5 42.5 L62.5 47.5 L82.5 47.5 L82.5 62.5 L52.5 62.5 Z" stroke="none" clip-path="url(#clipPath2)"
@@ -79,7 +79,7 @@
/><path fill="none" d="M103.5 96.5 L103.5 102.5" clip-path="url(#clipPath2)"
/><path fill="none" d="M100.5 99.5 L106.5 99.5" clip-path="url(#clipPath2)"
/><text x="170.5" xml:space="preserve" y="122" clip-path="url(#clipPath2)" stroke="none"
- >configurations - HOCON configuration files, including TCS flow definition</text
+ >configurations - HOCON configuration files, including Streaming Web flow definition</text
></g
><g font-size="14px" transform="translate(40,10)" fill-opacity="0" fill="rgb(255,255,255)" font-family="sans-serif" stroke="rgb(255,255,255)" stroke-opacity="0"
><path d="M136.5 138.5 L146.5 138.5 L146.5 143.5 L166.5 143.5 L166.5 158.5 L136.5 158.5 Z" stroke="none" clip-path="url(#clipPath2)"
diff --git a/ep-maven/src/site/markdown/uml/tcs-structure.uxf b/ep-maven/src/site/markdown/uml/sw-structure.uxf
similarity index 83%
rename from ep-maven/src/site/markdown/uml/tcs-structure.uxf
rename to ep-maven/src/site/markdown/uml/sw-structure.uxf
index a269a6cc..4d5d0b12 100644
--- a/ep-maven/src/site/markdown/uml/tcs-structure.uxf
+++ b/ep-maven/src/site/markdown/uml/sw-structure.uxf
@@ -10,11 +10,11 @@
<h>460</h>
</coordinates>
<panel_attributes>type=Package
-ep-tcs-fragment - pom.xml
+ep-sw-fragment - pom.xml
src
main
- configurations - HOCON configuration files, including TCS flow definition
+ configurations - HOCON configuration files, including Streaming Web flow definition
resources - HOCON schemas, Logback configurations
test
configurations - HOCON test configuration files
diff --git a/ep-maven/src/site/markdown/usage.md b/ep-maven/src/site/markdown/usage.md
index 0557d187..6ad97835 100644
--- a/ep-maven/src/site/markdown/usage.md
+++ b/ep-maven/src/site/markdown/usage.md
@@ -35,7 +35,7 @@ The maven plugin supports the following packaging types :
* **ep-liveview-fragment** - LiveView fragment
-* **ep-tcs-fragment** - TIBCO Cloud Streaming fragment
+* **ep-sw-fragment** - Streaming Web flow fragment
* **ep-application** - Application archive
@@ -246,8 +246,8 @@ This is sufficient to build the eventflow fragment, unit test using sbunit on
a default environment and install the fragment to the local maven repository
for use by other modules.
-A TIBCO Cloud Streaming fragment module has a packaging type of
-**ep-tcs-fragment**, a list of project dependencies and build rules.
+A Spotfire Streaming Web flow fragment module has a packaging type of
+**ep-sw-fragment**, a list of project dependencies and build rules.
``` xml
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -255,15 +255,15 @@ A TIBCO Cloud Streaming fragment module has a packaging type of
<modelVersion>4.0.0</modelVersion>
<groupId>com.tibco.ep.dtmexamples.eventflowfragment</groupId>
- <artifactId>my-tcs-project</artifactId>
- <packaging>ep-tcs-fragment</packaging>
+ <artifactId>my-sw-project</artifactId>
+ <packaging>ep-sw-fragment</packaging>
<version>3.0.0</version>
- <name>TCS Fragment - my-tcs-project</name>
+ <name>Streaming Web Flow Fragment - my-sw-project</name>
<!-- common definitions for this version of StreamBase -->
<parent>
<groupId>com.tibco.ep.sb.parent</groupId>
- <artifactId>ep-tcs-fragment</artifactId>
+ <artifactId>ep-sw-fragment</artifactId>
<version>${sbrtVersion}</version>
</parent>
@@ -282,7 +282,7 @@ A TIBCO Cloud Streaming fragment module has a packaging type of
</project>
```
-This is sufficient to build the TCS fragment and install the fragment to the local maven
+This is sufficient to build the Streaming Web flow fragment and install the fragment to the local maven
repository for use by other modules.
diff --git a/ep-maven/src/site/site.xml b/ep-maven/src/site/site.xml
index b30a9553..01a25d5d 100644
--- a/ep-maven/src/site/site.xml
+++ b/ep-maven/src/site/site.xml
@@ -57,7 +57,7 @@
<item name="Java fragment examples" href="java_examples.html" />
<item name="Java jar examples" href="java_jar_examples.html" />
<item name="EventFlow fragment examples" href="eventflow_examples.html" />
- <item name="TIBCO Cloud Streaming fragment examples" href="tcs_examples.html" />
+ <item name="Streaming Web flow fragment examples" href="sw_examples.html" />
<item name="LiveView fragment examples" href="liveview_examples.html" />
<item name="Application examples" href="application_examples.html" />
<item name="CI examples" href="contint_examples.html" />
@@ -74,7 +74,7 @@
<item name="LiveView - compile" href="compile-liveview-fragment-mojo.html" />
<item name="LiveView - package" href="package-liveview-fragment-mojo.html" />
<item name="LiveView - unit test" href="test-liveview-fragment-mojo.html" />
- <item name="TIBCO Cloud Streaming - package" href="package-tcs-fragment-mojo.html" />
+ <item name="Streaming Web - package" href="package-sw-fragment-mojo.html" />
<item name="Application - package" href="package-application-mojo.html" />
<item name="Manage - start nodes" href="start-nodes-mojo.html" />
<item name="Manage - stop nodes" href="stop-nodes-mojo.html" />
diff --git a/ep-maven/src/test/java/com/tibco/ep/buildmavenplugin/PackageTest.java b/ep-maven/src/test/java/com/tibco/ep/buildmavenplugin/PackageTest.java
index 98ad34cd..3f3b04ac 100644
--- a/ep-maven/src/test/java/com/tibco/ep/buildmavenplugin/PackageTest.java
+++ b/ep-maven/src/test/java/com/tibco/ep/buildmavenplugin/PackageTest.java
@@ -242,57 +242,57 @@ public void testPackaging() throws Exception {
//
assertFalse(zipContains("target/projects/eventflow2/target/eventflow2-" + pomVersion + "-ep-eventflow-fragment.zip", "engine.conf"));
- LOGGER.info("TCS packaging");
+ LOGGER.info("Streaming Web packaging");
simulatedLog = new SimulatedLog(false);
- pom = new File("target/projects/tcs", "pom.xml");
+ pom = new File("target/projects/sw", "pom.xml");
Assert.assertNotNull(pom);
Assert.assertTrue(pom.exists());
// simulate process resources
//
- new File("target/projects/tcs/target/classes").mkdirs();
- Files.copy(new File("target/projects/tcs/src/main/configurations/engine.conf")
- .toPath(), new File("target/projects/tcs/target/classes/engine.conf")
+ new File("target/projects/sw/target/classes").mkdirs();
+ Files.copy(new File("target/projects/sw/src/main/configurations/engine.conf")
+ .toPath(), new File("target/projects/sw/target/classes/engine.conf")
.toPath(), StandardCopyOption.REPLACE_EXISTING);
- Files.copy(new File("target/projects/tcs/src/main/configurations/flow.conf")
- .toPath(), new File("target/projects/tcs/target/classes/flow.conf")
+ Files.copy(new File("target/projects/sw/src/main/configurations/flow.conf")
+ .toPath(), new File("target/projects/sw/target/classes/flow.conf")
.toPath(), StandardCopyOption.REPLACE_EXISTING);
- Files.copy(new File("target/projects/tcs/src/main/resources/logback.xml")
- .toPath(), new File("target/projects/tcs/target/classes/logback.xml")
+ Files.copy(new File("target/projects/sw/src/main/resources/logback.xml")
+ .toPath(), new File("target/projects/sw/target/classes/logback.xml")
.toPath(), StandardCopyOption.REPLACE_EXISTING);
- new File("target/projects/tcs/target/classes/com/tibco/ep/testmavenplugin").mkdirs();
+ new File("target/projects/sw/target/classes/com/tibco/ep/testmavenplugin").mkdirs();
Files
- .copy(new File("target/projects/tcs/src/main/resources/com/tibco/ep/testmavenplugin/Test.schema")
+ .copy(new File("target/projects/sw/src/main/resources/com/tibco/ep/testmavenplugin/Test.schema")
.toPath(),
- new File("target/projects/tcs/target/classes/com/tibco/ep/testmavenplugin/Test.schema")
+ new File("target/projects/sw/target/classes/com/tibco/ep/testmavenplugin/Test.schema")
.toPath(), StandardCopyOption.REPLACE_EXISTING);
LOGGER.info(" Package");
- PackageTCSFragmentMojo packageTCS = (PackageTCSFragmentMojo) lookupConfiguredMojo(pom, "package-tcs-fragment");
- Assert.assertNotNull(packageTCS);
- pomVersion = packageTCS.project.getVersion();
+ PackageSWFragmentMojo packageSW = (PackageSWFragmentMojo) lookupConfiguredMojo(pom, "package-sw-fragment");
+ Assert.assertNotNull(packageSW);
+ pomVersion = packageSW.project.getVersion();
simulatedLog.reset();
- packageTCS.setLog(simulatedLog);
- packageTCS.execute();
+ packageSW.setLog(simulatedLog);
+ packageSW.execute();
assertEquals(simulatedLog.getErrorLog(), 0, simulatedLog.getErrorLog().length());
assertEquals(simulatedLog.getWarnLog(), 0, simulatedLog.getWarnLog().length());
- assertTrue(new File("target/projects/tcs/target/tcs-" + pomVersion + "-ep-tcs-fragment.zip")
+ assertTrue(new File("target/projects/sw/target/sw-" + pomVersion + "-ep-sw-fragment.zip")
.exists());
- assertTrue(zipContains("target/projects/tcs/target/tcs-" + pomVersion + "-ep-tcs-fragment.zip", "engine.conf"));
- assertTrue(zipContains("target/projects/tcs/target/tcs-" + pomVersion + "-ep-tcs-fragment.zip", "flow.conf"));
- assertTrue(zipContains("target/projects/tcs/target/tcs-" + pomVersion + "-ep-tcs-fragment.zip", "logback.xml"));
- assertTrue(zipContains("target/projects/tcs/target/tcs-" + pomVersion + "-ep-tcs-fragment.zip", "com/tibco/ep/testmavenplugin/Test.schema"));
- assertTrue(zipContains("target/projects/tcs/target/tcs-" + pomVersion + "-ep-tcs-fragment.zip", "META-INF/maven/com.tibco.ep.testmavenplugin/tcs/pom.xml"));
- assertTrue(zipContains("target/projects/tcs/target/tcs-" + pomVersion + "-ep-tcs-fragment.zip", "META-INF/maven/com.tibco.ep.testmavenplugin/tcs/pom.properties"));
+ assertTrue(zipContains("target/projects/sw/target/sw-" + pomVersion + "-ep-sw-fragment.zip", "engine.conf"));
+ assertTrue(zipContains("target/projects/sw/target/sw-" + pomVersion + "-ep-sw-fragment.zip", "flow.conf"));
+ assertTrue(zipContains("target/projects/sw/target/sw-" + pomVersion + "-ep-sw-fragment.zip", "logback.xml"));
+ assertTrue(zipContains("target/projects/sw/target/sw-" + pomVersion + "-ep-sw-fragment.zip", "com/tibco/ep/testmavenplugin/Test.schema"));
+ assertTrue(zipContains("target/projects/sw/target/sw-" + pomVersion + "-ep-sw-fragment.zip", "META-INF/maven/com.tibco.ep.testmavenplugin/sw/pom.xml"));
+ assertTrue(zipContains("target/projects/sw/target/sw-" + pomVersion + "-ep-sw-fragment.zip", "META-INF/maven/com.tibco.ep.testmavenplugin/sw/pom.properties"));
// simulate install
//
- File tcsDestDir = new File(this.regressionRepository, "com/tibco/ep/testmavenplugin/tcs/" + pomVersion + "");
- tcsDestDir.mkdirs();
- Files.copy(new File("target/projects/tcs/target/tcs-" + pomVersion + "-ep-tcs-fragment.zip")
- .toPath(), new File(tcsDestDir, "tcs-" + pomVersion + ".zip")
+ File swDestDir = new File(this.regressionRepository, "com/tibco/ep/testmavenplugin/sw/" + pomVersion + "");
+ swDestDir.mkdirs();
+ Files.copy(new File("target/projects/sw/target/sw-" + pomVersion + "-ep-sw-fragment.zip")
+ .toPath(), new File(swDestDir, "sw-" + pomVersion + ".zip")
.toPath(), StandardCopyOption.REPLACE_EXISTING);
LOGGER.info("LiveView packaging");
@@ -380,10 +380,10 @@ public void testPackaging() throws Exception {
assertTrue(new File("target/projects/application/target/application-" + pomVersion + "-ep-application.zip")
.exists());
assertTrue(zipContains("target/projects/application/target/application-" + pomVersion + "-ep-application.zip", "com.tibco.ep.testmavenplugin-java-" + pomVersion + "-ep-java-fragment.zip"));
- // tcs dep already includes the fragment so we shouldn't see it again
+ // sw dep already includes the fragment so we shouldn't see it again
assertFalse(zipContains("target/projects/application/target/application-" + pomVersion + "-ep-application.zip", "com.tibco.ep.testmavenplugin-eventflow-" + pomVersion + "-ep-eventflow-fragment.zip"));
assertTrue(zipContains("target/projects/application/target/application-" + pomVersion + "-ep-application.zip", "com.tibco.ep.testmavenplugin-liveview-" + pomVersion + "-ep-liveview-fragment.zip"));
- assertTrue(zipContains("target/projects/application/target/application-" + pomVersion + "-ep-application.zip", "com.tibco.ep.testmavenplugin-tcs-" + pomVersion + "-ep-tcs-fragment.zip"));
+ assertTrue(zipContains("target/projects/application/target/application-" + pomVersion + "-ep-application.zip", "com.tibco.ep.testmavenplugin-sw-" + pomVersion + "-ep-sw-fragment.zip"));
assertTrue(zipContains("target/projects/application/target/application-" + pomVersion + "-ep-application.zip", "org.slf4j-slf4j-api-1.7.26.jar"));
assertTrue(zipContains("target/projects/application/target/application-" + pomVersion + "-ep-application.zip", "app.conf"));
assertTrue(zipContains("target/projects/application/target/application-" + pomVersion + "-ep-application.zip", "META-INF/maven/com.tibco.ep.testmavenplugin/application/pom.xml"));
diff --git a/ep-maven/src/test/projects/application/deploy.xml b/ep-maven/src/test/projects/application/deploy.xml
index c386f57e..a8a51aaf 100644
--- a/ep-maven/src/test/projects/application/deploy.xml
+++ b/ep-maven/src/test/projects/application/deploy.xml
@@ -60,8 +60,8 @@
</dependency>
<dependency>
<groupId>com.tibco.ep.testmavenplugin</groupId>
- <artifactId>tcs</artifactId>
- <type>ep-tcs-fragment</type>
+ <artifactId>sw</artifactId>
+ <type>ep-sw-fragment</type>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/ep-maven/src/test/projects/application/pom.xml b/ep-maven/src/test/projects/application/pom.xml
index 72a8fbf7..7c4e2bf6 100644
--- a/ep-maven/src/test/projects/application/pom.xml
+++ b/ep-maven/src/test/projects/application/pom.xml
@@ -60,8 +60,8 @@
</dependency>
<dependency>
<groupId>com.tibco.ep.testmavenplugin</groupId>
- <artifactId>tcs</artifactId>
- <type>ep-tcs-fragment</type>
+ <artifactId>sw</artifactId>
+ <type>ep-sw-fragment</type>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/ep-maven/src/test/projects/tcs/pom.xml b/ep-maven/src/test/projects/sw/pom.xml
similarity index 85%
rename from ep-maven/src/test/projects/tcs/pom.xml
rename to ep-maven/src/test/projects/sw/pom.xml
index 426b9b8a..9791df24 100644
--- a/ep-maven/src/test/projects/tcs/pom.xml
+++ b/ep-maven/src/test/projects/sw/pom.xml
@@ -2,14 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- vim: set tabstop=4 softtabstop=0 expandtab shiftwidth=4 smarttab : -->
- <!-- Copyright 2019 TIBCO Software Inc. ALL RIGHTS RESERVED -->
- <!-- TIBCO Software Inc. Confidential Information -->
+ <!-- Copyright (c) 2019-2023 Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary. -->
<modelVersion>4.0.0</modelVersion>
<groupId>com.tibco.ep.testmavenplugin</groupId>
- <artifactId>tcs</artifactId>
- <packaging>ep-tcs-fragment</packaging>
+ <artifactId>sw</artifactId>
+ <packaging>ep-sw-fragment</packaging>
<parent>
<groupId>com.tibco.ep.testmavenplugin</groupId>
diff --git a/ep-maven/src/test/projects/sw/src/main/configurations/engine.conf b/ep-maven/src/test/projects/sw/src/main/configurations/engine.conf
new file mode 100644
index 00000000..064c1eab
--- /dev/null
+++ b/ep-maven/src/test/projects/sw/src/main/configurations/engine.conf
@@ -0,0 +1,7 @@
+name = "engineconfig"
+version = "1.0.0"
+type = "com.spotfire.sw.flowengine.configuration"
+configuration = {
+ FlowEngine = {
+ }
+}
diff --git a/ep-maven/src/test/projects/tcs/src/main/configurations/flow.conf b/ep-maven/src/test/projects/sw/src/main/configurations/flow.conf
similarity index 97%
rename from ep-maven/src/test/projects/tcs/src/main/configurations/flow.conf
rename to ep-maven/src/test/projects/sw/src/main/configurations/flow.conf
index 5c04959d..7e2a927f 100644
--- a/ep-maven/src/test/projects/tcs/src/main/configurations/flow.conf
+++ b/ep-maven/src/test/projects/sw/src/main/configurations/flow.conf
@@ -1,5 +1,5 @@
name = "my-flow-config"
-type = "com.tibco.ep.tcs.configuration.tcsengine"
+type = "com.spotfire.sw.flowengine.configuration"
version = "1.0.0"
configuration = {
Flow = {
diff --git a/ep-maven/src/test/projects/tcs/src/main/resources/com/tibco/ep/testmavenplugin/Test.schema b/ep-maven/src/test/projects/sw/src/main/resources/com/tibco/ep/testmavenplugin/Test.schema
similarity index 100%
rename from ep-maven/src/test/projects/tcs/src/main/resources/com/tibco/ep/testmavenplugin/Test.schema
rename to ep-maven/src/test/projects/sw/src/main/resources/com/tibco/ep/testmavenplugin/Test.schema
diff --git a/ep-maven/src/test/projects/tcs/src/main/resources/logback.xml b/ep-maven/src/test/projects/sw/src/main/resources/logback.xml
similarity index 100%
rename from ep-maven/src/test/projects/tcs/src/main/resources/logback.xml
rename to ep-maven/src/test/projects/sw/src/main/resources/logback.xml
diff --git a/ep-maven/src/test/projects/tcs/src/main/configurations/engine.conf b/ep-maven/src/test/projects/tcs/src/main/configurations/engine.conf
deleted file mode 100644
index afa8d6c4..00000000
--- a/ep-maven/src/test/projects/tcs/src/main/configurations/engine.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-name = "engineconfig"
-version = "1.0.0"
-type = "com.tibco.ep.tcs.configuration.tcsengine"
-configuration = {
- TCSEngine = {
- }
-}