Split server update site into client + server update sites
diff --git a/core/releng/org.eclipse.hawk.updatesite/generate-composite-site.xml b/core/releng/org.eclipse.hawk.updatesite/generate-composite-site.xml
index f9596b2..7e113f4 100644
--- a/core/releng/org.eclipse.hawk.updatesite/generate-composite-site.xml
+++ b/core/releng/org.eclipse.hawk.updatesite/generate-composite-site.xml
@@ -11,7 +11,8 @@
<add>
<repository location="https://download.eclipse.org/hawk/${hawk.version.short}/core/"/>
<repository location="https://download.eclipse.org/hawk/${hawk.version.short}/greycat/"/>
- <repository location="https://download.eclipse.org/hawk/${hawk.version.short}/server/"/>
+ <repository location="https://download.eclipse.org/hawk/${hawk.version.short}/client/"/>
+ <!-- server components are not part of the main composite update site -->
</add>
</p2.composite.repository>
</target>
diff --git a/server/deploy-downloads.sh b/server/deploy-downloads.sh
index 5061301..6afa054 100755
--- a/server/deploy-downloads.sh
+++ b/server/deploy-downloads.sh
@@ -4,17 +4,24 @@
cut --delim=: -f2 | \
sed -re 's/ *([0-9]+)[.]([0-9]+)[.].*/\1.\2.0/')
DIST_DIR="/home/data/httpd/download.eclipse.org/hawk/$VERSION"
+CLIENT_DIR="$DIST_DIR/client"
SERVER_DIR="$DIST_DIR/server"
SSH_USER=genie.hawk@projects-storage.eclipse.org
echo "Creating downloads for Hawk Server ${VERSION} at ${DIST_DIR}"
# Use rsync with delete rather than a straight up 'rm', in case SSH fails intermittently
+ssh "$SSH_USER" mkdir -p "$CLIENT_DIR"
+rsync -rvhz "$WORKSPACE/server/releng/org.eclipse.hawk.service.client.updatesite/target/repository/" "$SSH_USER":"${CLIENT_DIR}/" --delete
ssh "$SSH_USER" mkdir -p "$SERVER_DIR"
-rsync -rvhz "$WORKSPACE/server/releng/org.eclipse.hawk.service.updatesite/target/repository/" "$SSH_USER":"${SERVER_DIR}/" --delete
+rsync -rvhz "$WORKSPACE/server/releng/org.eclipse.hawk.service.server.updatesite/target/repository/" "$SSH_USER":"${SERVER_DIR}/" --delete
+
+# Delete the old client+server zipped update site
+ssh "$SSH_USER" rm -f "${DIST_DIR}"/org.eclipse.hawk.service.updatesite-*.zip
# Copy the update site (version-based)
-scp "$WORKSPACE"/server/releng/org.eclipse.hawk.service.updatesite/target/org.eclipse.hawk.service.updatesite-*.zip "$SSH_USER":"${DIST_DIR}/"
+scp "$WORKSPACE"/server/releng/org.eclipse.hawk.service.client.updatesite/target/org.eclipse.hawk.service.client.updatesite-*.zip "$SSH_USER":"${DIST_DIR}/"
+scp "$WORKSPACE"/server/releng/org.eclipse.hawk.service.server.updatesite/target/org.eclipse.hawk.service.server.updatesite-*.zip "$SSH_USER":"${DIST_DIR}/"
# Refresh the server/CLI products (timestamped, so we need to remove old ones)
ssh "$SSH_USER" rm -f "${DIST_DIR}/"hawk-server-nogpl_*.zip
diff --git a/server/pom.xml b/server/pom.xml
index a795a9e..fbb6c4a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -30,18 +30,19 @@
<module>plugins/org.eclipse.hawk.service.server.users.servlet</module>
<module>plugins/org.eclipse.hawk.service.servlet</module>
- <module>releng/org.eclipse.hawk.service.updatesite</module>
<module>releng/org.eclipse.hawk.service.api.dt.feature</module>
<module>releng/org.eclipse.hawk.service.api.feature</module>
- <module>releng/org.eclipse.hawk.service.clients.cli.feature</module>
<module>releng/org.eclipse.hawk.service.cli.feature</module>
<module>releng/org.eclipse.hawk.service.cli.product</module>
+ <module>releng/org.eclipse.hawk.service.client.updatesite</module>
+ <module>releng/org.eclipse.hawk.service.clients.cli.feature</module>
<module>releng/org.eclipse.hawk.service.emf.dt.feature</module>
<module>releng/org.eclipse.hawk.service.emf.feature</module>
<module>releng/org.eclipse.hawk.service.remote.thrift.feature</module>
<module>releng/org.eclipse.hawk.service.remote.thrift.timeaware.feature</module>
<module>releng/org.eclipse.hawk.service.server.feature</module>
<module>releng/org.eclipse.hawk.service.server.product</module>
+ <module>releng/org.eclipse.hawk.service.server.updatesite</module>
<module>releng/org.eclipse.hawk.service.server.users.cli.feature</module>
<module>releng/org.eclipse.hawk.service.servlet.feature</module>
diff --git a/server/releng/org.eclipse.hawk.service.updatesite/.project b/server/releng/org.eclipse.hawk.service.client.updatesite/.project
similarity index 75%
rename from server/releng/org.eclipse.hawk.service.updatesite/.project
rename to server/releng/org.eclipse.hawk.service.client.updatesite/.project
index 8feb5dc..4adcbab 100644
--- a/server/releng/org.eclipse.hawk.service.updatesite/.project
+++ b/server/releng/org.eclipse.hawk.service.client.updatesite/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.hawk.service.updatesite</name>
+ <name>org.eclipse.hawk.service.client.updatesite</name>
<comment></comment>
<projects>
</projects>
diff --git a/server/releng/org.eclipse.hawk.service.updatesite/category.xml b/server/releng/org.eclipse.hawk.service.client.updatesite/category.xml
similarity index 71%
rename from server/releng/org.eclipse.hawk.service.updatesite/category.xml
rename to server/releng/org.eclipse.hawk.service.client.updatesite/category.xml
index dd52a77..ec88a74 100644
--- a/server/releng/org.eclipse.hawk.service.updatesite/category.xml
+++ b/server/releng/org.eclipse.hawk.service.client.updatesite/category.xml
@@ -21,19 +21,9 @@
<feature id="org.eclipse.hawk.service.remote.thrift.timeaware.feature">
<category name="hawk.api.clients"/>
</feature>
- <feature id="org.eclipse.hawk.service.server.feature">
- <category name="hawk.api.server"/>
- </feature>
- <feature id="org.eclipse.hawk.service.server.users.cli.feature">
- <category name="hawk.api.server"/>
- </feature>
- <feature id="org.eclipse.hawk.service.servlet.feature">
- <category name="hawk.api.server"/>
- </feature>
<feature id="org.eclipse.hawk.service.cli.feature">
<category name="hawk.api.clients"/>
</feature>
<category-def name="hawk.api" label="Thrift API Core"/>
<category-def name="hawk.api.clients" label="Thrift API Clients"/>
- <category-def name="hawk.api.server" label="Thrift API Server Components"/>
</site>
diff --git a/server/releng/org.eclipse.hawk.service.updatesite/pom.xml b/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml
similarity index 89%
copy from server/releng/org.eclipse.hawk.service.updatesite/pom.xml
copy to server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml
index 615aa9d..8febdd8 100644
--- a/server/releng/org.eclipse.hawk.service.updatesite/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml
@@ -9,7 +9,7 @@
<relativePath>..</relativePath>
</parent>
<groupId>org.eclipse.hawk</groupId>
- <artifactId>org.eclipse.hawk.service.updatesite</artifactId>
+ <artifactId>org.eclipse.hawk.service.client.updatesite</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
</project>
diff --git a/server/releng/org.eclipse.hawk.service.updatesite/.project b/server/releng/org.eclipse.hawk.service.server.updatesite/.project
similarity index 75%
copy from server/releng/org.eclipse.hawk.service.updatesite/.project
copy to server/releng/org.eclipse.hawk.service.server.updatesite/.project
index 8feb5dc..8750325 100644
--- a/server/releng/org.eclipse.hawk.service.updatesite/.project
+++ b/server/releng/org.eclipse.hawk.service.server.updatesite/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.hawk.service.updatesite</name>
+ <name>org.eclipse.hawk.service.server.updatesite</name>
<comment></comment>
<projects>
</projects>
diff --git a/server/releng/org.eclipse.hawk.service.server.updatesite/category.xml b/server/releng/org.eclipse.hawk.service.server.updatesite/category.xml
new file mode 100644
index 0000000..404dd40
--- /dev/null
+++ b/server/releng/org.eclipse.hawk.service.server.updatesite/category.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature id="org.eclipse.hawk.service.server.feature">
+ <category name="hawk.api.server"/>
+ </feature>
+ <feature id="org.eclipse.hawk.service.server.users.cli.feature">
+ <category name="hawk.api.server"/>
+ </feature>
+ <feature id="org.eclipse.hawk.service.servlet.feature">
+ <category name="hawk.api.server"/>
+ </feature>
+ <category-def name="hawk.api.server" label="Thrift API Server Components"/>
+</site>
diff --git a/server/releng/org.eclipse.hawk.service.updatesite/pom.xml b/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml
similarity index 89%
rename from server/releng/org.eclipse.hawk.service.updatesite/pom.xml
rename to server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml
index 615aa9d..95130cf 100644
--- a/server/releng/org.eclipse.hawk.service.updatesite/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml
@@ -9,7 +9,7 @@
<relativePath>..</relativePath>
</parent>
<groupId>org.eclipse.hawk</groupId>
- <artifactId>org.eclipse.hawk.service.updatesite</artifactId>
+ <artifactId>org.eclipse.hawk.service.server.updatesite</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
</project>
