From 710cce162b342b1a4971b98516a0d398bb75b77e Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Fri, 2 Mar 2018 17:00:43 +0800
Subject: [PATCH] Include the agent into `dist`

---
 .gitignore                                             |  1 +
 .../bin/collectorService.bat                           |  0
 {apm-backend-dist => apm-dist}/bin/collectorService.sh |  0
 {apm-backend-dist => apm-dist}/bin/startup.bat         |  0
 {apm-backend-dist => apm-dist}/bin/startup.sh          |  0
 {apm-backend-dist => apm-dist}/bin/webappService.bat   |  0
 {apm-backend-dist => apm-dist}/bin/webappService.sh    |  0
 {apm-backend-dist => apm-dist}/pom.xml                 |  9 +++++++--
 .../src/main/assembly/binary.xml                       |  6 ++++++
 apm-sniffer/apm-agent/pom.xml                          | 10 +++++-----
 apm-sniffer/apm-sdk-plugin/pom.xml                     |  2 +-
 apm-sniffer/apm-toolkit-activation/pom.xml             |  4 ++--
 .../optional-plugins/optional-spring-plugins/pom.xml   |  2 +-
 apm-sniffer/optional-plugins/pom.xml                   |  2 +-
 pom.xml                                                |  2 +-
 15 files changed, 25 insertions(+), 13 deletions(-)
 rename {apm-backend-dist => apm-dist}/bin/collectorService.bat (100%)
 rename {apm-backend-dist => apm-dist}/bin/collectorService.sh (100%)
 rename {apm-backend-dist => apm-dist}/bin/startup.bat (100%)
 rename {apm-backend-dist => apm-dist}/bin/startup.sh (100%)
 rename {apm-backend-dist => apm-dist}/bin/webappService.bat (100%)
 rename {apm-backend-dist => apm-dist}/bin/webappService.sh (100%)
 rename {apm-backend-dist => apm-dist}/pom.xml (90%)
 rename {apm-backend-dist => apm-dist}/src/main/assembly/binary.xml (89%)

diff --git a/.gitignore b/.gitignore
index bdc57edb2..608628014 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ target/
 *~
 packages/
 **/dependency-reduced-pom.xml
+/skywalking-agent/
diff --git a/apm-backend-dist/bin/collectorService.bat b/apm-dist/bin/collectorService.bat
similarity index 100%
rename from apm-backend-dist/bin/collectorService.bat
rename to apm-dist/bin/collectorService.bat
diff --git a/apm-backend-dist/bin/collectorService.sh b/apm-dist/bin/collectorService.sh
similarity index 100%
rename from apm-backend-dist/bin/collectorService.sh
rename to apm-dist/bin/collectorService.sh
diff --git a/apm-backend-dist/bin/startup.bat b/apm-dist/bin/startup.bat
similarity index 100%
rename from apm-backend-dist/bin/startup.bat
rename to apm-dist/bin/startup.bat
diff --git a/apm-backend-dist/bin/startup.sh b/apm-dist/bin/startup.sh
similarity index 100%
rename from apm-backend-dist/bin/startup.sh
rename to apm-dist/bin/startup.sh
diff --git a/apm-backend-dist/bin/webappService.bat b/apm-dist/bin/webappService.bat
similarity index 100%
rename from apm-backend-dist/bin/webappService.bat
rename to apm-dist/bin/webappService.bat
diff --git a/apm-backend-dist/bin/webappService.sh b/apm-dist/bin/webappService.sh
similarity index 100%
rename from apm-backend-dist/bin/webappService.sh
rename to apm-dist/bin/webappService.sh
diff --git a/apm-backend-dist/pom.xml b/apm-dist/pom.xml
similarity index 90%
rename from apm-backend-dist/pom.xml
rename to apm-dist/pom.xml
index 88a90bdd7..49113a46c 100644
--- a/apm-backend-dist/pom.xml
+++ b/apm-dist/pom.xml
@@ -14,6 +14,11 @@
 
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.skywalking</groupId>
+            <artifactId>apm-agent-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
             <artifactId>apm-collector-boot</artifactId>
@@ -63,9 +68,9 @@
                         <configuration>
                             <tasks>
                                 <copy file="${project.build.directory}/skywalking-backend.tar.gz"
-                                      tofile="${project.basedir}/../packages/skywalking-backend.tar.gz" overwrite="true"/>
+                                      tofile="${project.basedir}/../dist/skywalking-backend.tar.gz" overwrite="true"/>
                                 <copy file="${project.build.directory}/skywalking-backend.zip"
-                                      tofile="${project.basedir}/../packages/skywalking-backend.zip" overwrite="true"/>
+                                      tofile="${project.basedir}/../dist/skywalking-backend.zip" overwrite="true"/>
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/apm-backend-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml
similarity index 89%
rename from apm-backend-dist/src/main/assembly/binary.xml
rename to apm-dist/src/main/assembly/binary.xml
index c491faf8e..d7a549963 100644
--- a/apm-backend-dist/src/main/assembly/binary.xml
+++ b/apm-dist/src/main/assembly/binary.xml
@@ -47,6 +47,12 @@
             <directory>${project.basedir}/../apm-collector/apm-collector-boot/target/skywalking-collector-assembly/skywalking-collector/libs</directory>
             <outputDirectory>/collector-libs</outputDirectory>
         </fileSet>
+
+        <!-- Agent repackage into the dist -->
+        <fileSet>
+            <directory>${project.basedir}/../packages/skywalking-agent</directory>
+            <outputDirectory>/agent</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index 492a97eaa..fd15778a9 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -108,13 +108,13 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.basedir}/../../packages/skywalking-agent"/>
+                                <mkdir dir="${project.basedir}/../../skywalking-agent"/>
                                 <copy file="${project.build.directory}/skywalking-agent.jar"
-                                      tofile="${project.basedir}/../../packages/skywalking-agent/skywalking-agent.jar" overwrite="true"/>
-                                <mkdir dir="${project.basedir}/../../packages/skywalking-agent/config"/>
-                                <mkdir dir="${project.basedir}/../../packages/skywalking-agent/logs"/>
+                                      tofile="${project.basedir}/../../skywalking-agent/skywalking-agent.jar" overwrite="true"/>
+                                <mkdir dir="${project.basedir}/../../skywalking-agent/config"/>
+                                <mkdir dir="${project.basedir}/../../skywalking-agent/logs"/>
                                 <copydir src="${project.basedir}/../config"
-                                         dest="${project.basedir}/../../packages/skywalking-agent/config" forceoverwrite="true"/>
+                                         dest="${project.basedir}/../../skywalking-agent/config" forceoverwrite="true"/>
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml
index 3a4f95a3f..92c39ae75 100644
--- a/apm-sniffer/apm-sdk-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/pom.xml
@@ -69,7 +69,7 @@
         <shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
         <shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
 
-        <agent.package.dest.dir>${project.build.directory}${sdk.plugin.related.dir}/../../../../packages/skywalking-agent</agent.package.dest.dir>
+        <agent.package.dest.dir>${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent</agent.package.dest.dir>
         <plugin.dest.dir>${agent.package.dest.dir}/plugins</plugin.dest.dir>
     </properties>
 
diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml
index c0bd677f4..ceebae973 100644
--- a/apm-sniffer/apm-toolkit-activation/pom.xml
+++ b/apm-sniffer/apm-toolkit-activation/pom.xml
@@ -120,9 +120,9 @@
                                 <if>
                                     <equals arg1="${project.packaging}" arg2="jar"/>
                                     <then>
-                                        <mkdir dir="${project.build.directory}/../../../../packages/skywalking-agent/plugins"/>
+                                        <mkdir dir="${project.build.directory}/../../../../skywalking-agent/plugins"/>
                                         <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
-                                              tofile="${project.build.directory}/../../../../packages/skywalking-agent/activations/${project.artifactId}-${project.version}.jar" overwrite="true"/>
+                                              tofile="${project.build.directory}/../../../../skywalking-agent/activations/${project.artifactId}-${project.version}.jar" overwrite="true"/>
                                     </then>
                                 </if>
 
diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
index d182813a9..301e1a2e6 100644
--- a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
+++ b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
@@ -30,7 +30,7 @@
 
     <artifactId>optional-spring-plugins</artifactId>
     <properties>
-        <plugin.dest.dir>${project.build.directory}/../../../../../packages/skywalking-agent/optional-plugins</plugin.dest.dir>
+        <plugin.dest.dir>${project.build.directory}/../../../../../skywalking-agent/optional-plugins</plugin.dest.dir>
     </properties>
 
     <modules>
diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml
index b2b8830c4..4876cc8e9 100644
--- a/apm-sniffer/optional-plugins/pom.xml
+++ b/apm-sniffer/optional-plugins/pom.xml
@@ -33,7 +33,7 @@
         <shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
         <shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
 
-        <plugin.dest.dir>${project.build.directory}/../../../../packages/skywalking-agent/optional-plugins</plugin.dest.dir>
+        <plugin.dest.dir>${project.build.directory}/../../../../skywalking-agent/optional-plugins</plugin.dest.dir>
     </properties>
 
     <modules>
diff --git a/pom.xml b/pom.xml
index bcbbff716..ed623e0ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <module>apm-collector</module>
         <module>apm-protocol</module>
         <module>apm-webapp</module>
-        <module>apm-backend-dist</module>
+        <module>apm-dist</module>
     </modules>
     <packaging>pom</packaging>