This is an automated email from the ASF dual-hosted git repository.
obermeier pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new befc1b1e1 Streamline module names (#2183) (#2184)
befc1b1e1 is described below
commit befc1b1e11386f44b6f1cd7a41dbf26860a9db67
Author: Stefan Obermeier <[email protected]>
AuthorDate: Thu Nov 16 13:08:56 2023 +0100
Streamline module names (#2183) (#2184)
* Streamline module names (#2183)
* Remove some incubator labels
---
installer/cli/README.md | 8 ++++----
installer/cli/bin/commands/info | 2 +-
installer/cli/environments/full | 4 +---
installer/scripts/epsg/Readme.md | 6 +++---
run-validation-system.sh | 2 +-
streampipes-extensions/docker-compose.yml | 16 ++++++++--------
streampipes-maven-plugin/README.md | 2 +-
7 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/installer/cli/README.md b/installer/cli/README.md
index 478b22d8d..e189c71a8 100644
--- a/installer/cli/README.md
+++ b/installer/cli/README.md
@@ -152,12 +152,12 @@ streampipes pull
**Stop** existing StreamPipes containers
```bash
-streampipes stop pipeline-elements-all-jvm
+streampipes stop extensions-all-jvm
```
**Start** existing StreamPipes containers
```bash
-streampipes start pipeline-elements-all-jvm
+streampipes start extensions-all-jvm
```
**Restart** existing services
@@ -165,7 +165,7 @@ streampipes start pipeline-elements-all-jvm
# restart backend consul container
streampipes restart backend consul
# restart existing services by removing and recreating container instance
-streampipes restart --force-create pipeline-elements-all-jvm
+streampipes restart --force-create extensions-all-jvm
```
**Clean** your system and remove created StreamPipes Docker volumes,
StreamPipes docker network and dangling StreamPipes images of old image layers.
@@ -215,7 +215,7 @@ As of now, this step has to be done **manually**. All
environments are located i
├── backend # developing core backend features
├── basic # wanna run core, UI, connect etc from the IDE?
├── full # full version containing more pipeline elements
-├── lite # few pipeline elements, less memory
+├── lite # few pipeline elements, less memory
├── pipeline-element # developing new pipeline-elements
└── ui # developing UI features
```
diff --git a/installer/cli/bin/commands/info b/installer/cli/bin/commands/info
index 75b39ac8e..1ded1a074 100755
--- a/installer/cli/bin/commands/info
+++ b/installer/cli/bin/commands/info
@@ -34,7 +34,7 @@ fi
cat <<EOF
Version: $(show_version)
-GitHub: https://github.com/apache/incubator-streampipes-installer
+GitHub: https://github.com/apache/streampipes-installer
Website: https://streampipes.apache.org
Bug Report: [email protected]
diff --git a/installer/cli/environments/full b/installer/cli/environments/full
index fee496d0e..f751a5086 100644
--- a/installer/cli/environments/full
+++ b/installer/cli/environments/full
@@ -16,8 +16,7 @@
[environment:full]
ui
backend
-connect-adapters
-connect-adapters-iiot
+extensions-all-jvm
consul
couchdb
jobmanager
@@ -25,5 +24,4 @@ taskmanager
zookeeper
kafka
influxdb
-pipeline-elements-all-jvm
pipeline-elements-all-flink
diff --git a/installer/scripts/epsg/Readme.md b/installer/scripts/epsg/Readme.md
index f14236bb7..95effeeee 100644
--- a/installer/scripts/epsg/Readme.md
+++ b/installer/scripts/epsg/Readme.md
@@ -67,7 +67,7 @@ Coming soon
The database, in which the epsg data will be imported, is already included as
a service (Postgres DB). The Only step the user has to do is to fill the
database with the required scripts.
-Therefore, the following empty scripts must be replaced in the
`incubator-streampipes/installer/scripts/epsg` folder
+Therefore, the following empty scripts must be replaced in the
`streampipes/installer/scripts/epsg` folder
* PostgreSQL_Table_Script.sql
* PostgreSQL_Data_Script.sql
@@ -90,14 +90,14 @@ Unzip the folder and replace files
* PostgreSQL_Data_Script.sql
* PostgreSQL_FKey_Script.sql
-in the `incubator-streampipes/installer/scripts/epsg` folder.
+in the `streampipes/installer/scripts/epsg` folder.
For indexing the imported data and get better performance, go to
<a
href="https://github.com/apache/sis/blob/master/core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/EPSG_Finish.sql";
target="_blank">this file</a>
and replace it with the
* EPSG_FINISH.sql
-in the `incubator-streampipes/installer/scripts/epsg` folder.
+in the `streampipes/installer/scripts/epsg` folder.
# Import into Database
diff --git a/run-validation-system.sh b/run-validation-system.sh
index 6d0f334c5..f950977b7 100644
--- a/run-validation-system.sh
+++ b/run-validation-system.sh
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-docker-compose up -d && ../incubator-streampipes-extensions/docker-compose up
-d
+docker-compose up -d && ../streampipes-extensions/docker-compose up -d
diff --git a/streampipes-extensions/docker-compose.yml
b/streampipes-extensions/docker-compose.yml
index aba955dbf..302a1d651 100644
--- a/streampipes-extensions/docker-compose.yml
+++ b/streampipes-extensions/docker-compose.yml
@@ -33,14 +33,14 @@ x-logging:
services:
- #### apache/incubator-streampipes-extensions
+ #### apache/streampipes-extensions
connect-worker-main:
build:
context: ./streampipes-connect-adapters
dockerfile: Dockerfile
args:
BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine
- image: incubator-streampipes_connect-worker-main:release-validation
+ image: streampipes_connect-worker-main:release-validation
environment:
- SP_CONNECT_CONTAINER_HOST=connect-master
- SP_CONNECT_CONTAINER_WORKER=connect-worker-main
@@ -48,26 +48,26 @@ services:
networks:
spnet:
- pipeline-elements-all-jvm:
+ extensions-all-jvm:
build:
- context: ./streampipes-pipeline-elements-all-jvm
+ context: ./streampipes-extensions-all-jvm
dockerfile: Dockerfile
args:
BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine
- image: incubator-streampipes_pipeline-elements-all-jvm:release-validation
+ image: streampipes_extensions-all-jvm:release-validation
volumes:
- files:/spImages
logging: *default-logging
networks:
spnet:
- pipeline-elements-all-flink:
+ pipeline-elements-experimental-flink:
build:
- context: ./streampipes-pipeline-elements-all-flink
+ context: ./streampipes-pipeline-elements-experimental-flink
dockerfile: Dockerfile
args:
BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine
- image: incubator-streampipes_pipeline-elements-all-flink:release-validation
+ image: streampipes_pipeline-elements-experimental-flink:release-validation
logging: *default-logging
networks:
spnet:
diff --git a/streampipes-maven-plugin/README.md
b/streampipes-maven-plugin/README.md
index 01f30b6f1..70c9fffb5 100644
--- a/streampipes-maven-plugin/README.md
+++ b/streampipes-maven-plugin/README.md
@@ -37,7 +37,7 @@ By default, the goal runs in the `package` phase.
### Command line
```bash
-# Switch to a directory containing StreamPipes extensions and an Init class,
e.g., streampipes-extensions-all-jvm
+# Switch to a directory containing StreamPipes extensions and an Init class,
e.g., extensions-all-jvm
mvn streampipes:extract-docs
-DinitClass=org.apache.streampipes.extensions.all.jvm.AllExtensionsInit
```
