Skip to content

Commit

Permalink
chore(distribution): rename project to automq-for-rocketmq
Browse files Browse the repository at this point in the history
Signed-off-by: SSpirits <[email protected]>
  • Loading branch information
ShadowySpirits committed Nov 1, 2023
1 parent 86411e1 commit aadbbb4
Show file tree
Hide file tree
Showing 20 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion broker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.automq.rocketmq</groupId>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<version>5.1.3-automq-0-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.automq.rocketmq</groupId>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<version>5.1.3-automq-0-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.automq.rocketmq</groupId>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<version>5.1.3-automq-0-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion controller/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.automq.rocketmq</groupId>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<version>5.1.3-automq-0-SNAPSHOT</version>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions distribution/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM amazoncorretto:21
WORKDIR /root
RUN yum install which bash -y
ADD rocketmq-on-s3.tar.gz .
CMD ["/root/rocketmq-on-s3/bin/start-broker.sh"]
ADD automq-for-rocketmq.tar.gz .
CMD ["/root/automq-for-rocketmq/bin/start-broker.sh"]
2 changes: 1 addition & 1 deletion distribution/docker/Dockerfile-ci
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ENV ROCKETMQ_VERSION ${version}

ARG ROCKETMQ_DIR

ENV ROCKETMQ_NAME rocketmq-on-s3
ENV ROCKETMQ_NAME automq-for-rocketmq
ENV ROCKETMQ_HOME /home/rocketmq/${ROCKETMQ_NAME}-${ROCKETMQ_VERSION}

WORKDIR ${ROCKETMQ_HOME}
Expand Down
4 changes: 2 additions & 2 deletions distribution/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
REPO_DIR=$(dirname "$(dirname "$SCRIPT_DIR")")
cd "$REPO_DIR" || exit 1
mvn package -Dmaven.test.skip=true
cp distribution/target/rocketmq-on-s3.tar.gz "$SCRIPT_DIR"
cp distribution/target/automq-for-rocketmq.tar.gz "$SCRIPT_DIR"
cd "$SCRIPT_DIR" || exit 1
docker build -t rocketmq-on-s3:0.0.1 -f Dockerfile .
docker build -t automq-for-rocketmq:0.0.1 -f Dockerfile .


4 changes: 2 additions & 2 deletions distribution/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
broker-1:
image: "rocketmq-on-s3:0.0.1"
image: "automq-for-rocketmq:0.0.1"
# https://docs.docker.com/compose/compose-file/05-services/#entrypoint
environment:
- ROCKETMQ_NODE_NAME=broker-1
Expand All @@ -15,7 +15,7 @@ services:
mysql-server:
condition: service_healthy
broker-2:
image: "rocketmq-on-s3:0.0.1"
image: "automq-for-rocketmq:0.0.1"
# https://docs.docker.com/compose/compose-file/05-services/#entrypoint
environment:
- ROCKETMQ_NODE_NAME=broker-2
Expand Down
2 changes: 1 addition & 1 deletion distribution/helm/clean-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

helm uninstall s3-localstack
helm uninstall mysql
helm uninstall rocketmq-on-s3
helm uninstall automq-for-rocketmq

kubectl delete -f deploy/init-db-configmap.yaml
rm deploy/init-db-configmap.yaml
Expand Down
4 changes: 2 additions & 2 deletions distribution/helm/deploy-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ helm install mysql bitnami/mysql -f deploy/mysql.yaml

sleep 10
echo "Deploying rocketmq..."
# deploy rocketmq-on-s3
helm install rocketmq-on-s3 . -f deploy/helm_sample_values.yaml
# deploy automq-for-rocketmq
helm install automq-for-rocketmq . -f deploy/helm_sample_values.yaml


4 changes: 2 additions & 2 deletions distribution/helm/templates/broker/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
imagePullPolicy: {{ $.Values.broker.image.pullPolicy }}
{{- end }}
command: [ "/bin/sh" ]
args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker/$(CLUSTER_NAME)-$(POD_NAME)" ]
args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker/$(CLUSTER_NAME)-$(POD_NAME)" ]
env:
- name: POD_NAME
valueFrom:
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
resources:
{{- toYaml .Values.broker.resources | nindent 12 }}
volumeMounts:
- mountPath: /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker
- mountPath: /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker
name: broker-config
- mountPath: /root/logs/rocketmqlogs
name: broker-storage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ metadata:
labels:
{{- include "rocketmq-broker.selectorLabels" . | nindent 8 }}
spec:
type: rocketmq-on-s3
type: automq-for-rocketmq
componentDefs:
- name: rocketmq-on-s3-broker
- name: automq-for-rocketmq-broker
description: |-
Rocketmq broker that act as both brokers and controllers are referred to as "combined" servers.
workloadType: Stateful
Expand All @@ -44,7 +44,7 @@ spec:
containers:
- name: broker
command: [ "/bin/sh" ]
args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker/$(POD_NAME)" ]
args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker/$(POD_NAME)" ]
env:
- name: POD_NAME
valueFrom:
Expand Down Expand Up @@ -93,7 +93,7 @@ spec:
tcpSocket:
port: rocketmq-broker
volumeMounts:
- mountPath: /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker
- mountPath: /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker
name: broker-conf
- mountPath: /root/logs/rocketmqlogs
name: broker-storage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ metadata:
spec:
clusterDefinitionRef: {{ .Release.Name }}
componentVersions:
- componentDefRef: rocketmq-on-s3-broker
- componentDefRef: automq-for-rocketmq-broker
versionsContext:
containers:
- name: broker
Expand Down
4 changes: 2 additions & 2 deletions distribution/kubeblocks/templates/broker/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
imagePullPolicy: {{ $.Values.broker.image.pullPolicy }}
{{- end }}
command: [ "/bin/sh" ]
args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker/$(CLUSTER_NAME)-$(POD_NAME)" ]
args: [ "-c", "./run-server.sh com.automq.rocketmq.broker.BrokerStartup -c /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker/$(CLUSTER_NAME)-$(POD_NAME)" ]
env:
- name: POD_NAME
valueFrom:
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
resources:
{{- toYaml .Values.broker.resources | nindent 12 }}
volumeMounts:
- mountPath: /home/rocketmq/rocketmq-on-s3-5.1.3/conf/broker
- mountPath: /home/rocketmq/automq-for-rocketmq-5.1.3/conf/broker
name: broker-config
- mountPath: /root/logs/rocketmqlogs
name: broker-storage
Expand Down
4 changes: 2 additions & 2 deletions distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.automq.rocketmq</groupId>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<version>5.1.3-automq-0-SNAPSHOT</version>
</parent>

Expand Down Expand Up @@ -61,6 +61,6 @@
</executions>
</plugin>
</plugins>
<finalName>rocketmq-on-s3</finalName>
<finalName>automq-for-rocketmq</finalName>
</build>
</project>
2 changes: 1 addition & 1 deletion metadata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.automq.rocketmq</groupId>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<version>5.1.3-automq-0-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.automq.rocketmq</groupId>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<version>5.1.3-automq-0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion proto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
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">
<parent>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<groupId>com.automq.rocketmq</groupId>
<version>5.1.3-automq-0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion proxy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.automq.rocketmq</groupId>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<version>5.1.3-automq-0-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion store/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.automq.rocketmq</groupId>
<artifactId>rocketmq-on-s3</artifactId>
<artifactId>automq-for-rocketmq</artifactId>
<version>5.1.3-automq-0-SNAPSHOT</version>
</parent>

Expand Down

0 comments on commit aadbbb4

Please sign in to comment.