Merge service project to server to make development pipeline simple

pom.xml

@@ -76,6 +76,7 @@
         <defaultGoal>install</defaultGoal>
         <directory>${build.dir}</directory>
         <finalName>${finalName}</finalName>
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -84,7 +85,7 @@
                 <directory>src/main/java</directory>
                 <includes>
                     <include>**/*.xml</include>
-                </includes>
+                </includes>           
             </resource>
         </resources>
         <testResources>
@@ -101,29 +102,26 @@
         <pluginManagement>
         <plugins>
             <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/red5_codeformat_eclipse.xml</exclude>
-                        <exclude>**/red5_codetemplate.xml</exclude>
-                    </excludes>
-                    <archive>
-                        <manifest>
-                            <mainClass>io.antmedia.Version</mainClass>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                        <manifestEntries>
-                            <Build-OS>${os.name} ${os.version}</Build-OS>
-                            <Build-Java>Java ${java.version}</Build-Java>
-                            <Build-Number>${buildNumber}</Build-Number>
-                            <Main-Class>io.antmedia.Version</Main-Class>
-                            <Class-Path>lib/slf4j-api-${slf4j.version}.jar lib/logback-classic-${logback.version}.jar
-                                lib/logback-core-${logback.version}.jar
-                                lib/red5-server-common-${project.parent.version}.jar
-                            </Class-Path>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
+                <artifactId>maven-jar-plugin</artifactId>           
+                 <executions>
+			          <execution>
+			            <id>service</id> <!-- This part creates the ant-media-server-service.jar -->
+			            <goals><goal>jar</goal></goals>
+			            <phase>package</phase>
+			            <configuration>
+			              <classifier>service</classifier>			       
+			              <includes>
+			              	<include>org/red5/server/classloading/*</include>
+			              	<include>org/red5/server/Bootstrap.class</include>
+			              	<include>org/red5/server/Shutdown.class</include>
+			              </includes>
+			            </configuration>
+			          </execution>
+
+
+                 <!--  ant-media-server.jar is created by default -->
+
+                 </executions>
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>

redeploy.sh

@@ -11,11 +11,13 @@ fi
 ANT_MEDIA_SERVER_DIR=~/softwares/ant-media-server
 
 ANT_MEDIA_SERVER_JAR=./target/ant-media-server.jar
+ANT_MEDIA_SERVER_SERVICE_JAR=./target/ant-media-server-service.jar
 
 SRC_CONF_DIR=./src/main/server/conf/
 
 #copy red5 jar from target dir to red5 dir
 cp  $ANT_MEDIA_SERVER_JAR  $ANT_MEDIA_SERVER_DIR/ant-media-server.jar
+cp  $ANT_MEDIA_SERVER_SERVICE_JAR  $ANT_MEDIA_SERVER_DIR/ant-media-server-service.jar
 
 OUT=$?
 

src/main/assembly/server.xml

@@ -16,6 +16,11 @@
 			<outputDirectory></outputDirectory>
 			<destName>ant-media-server.jar</destName>
 		</file>
+		<file>
+			<source>${project.build.directory}/${finalName}-service.jar</source>
+			<outputDirectory></outputDirectory>
+			<destName>ant-media-server-service.jar</destName>
+		</file>
 	</files>
 	<fileSets>
 		<fileSet>
@@ -50,7 +55,6 @@
 				<exclude>servlet-api-*.jar</exclude>
 				<exclude>junit-${junit.version}.jar</exclude>
 				<exclude>logback-access-*.jar</exclude>
-				<exclude>ant-media-server-service-${project.parent.version}.jar</exclude>
 				<exclude>red5-server-${red5-service.version}.jar</exclude>
 				<exclude>red5-server-common-*.jar</exclude>
 				<exclude>red5-server-1*.jar</exclude>
@@ -108,7 +112,7 @@
 			<directory>${project.basedir}/src/main/server</directory>
 			<outputDirectory></outputDirectory>
 			<includes>
-				<include>*.bat</include>
+				<include>antmedia.service</include>
 			</includes>
 		</fileSet>
 		<fileSet>
@@ -130,6 +134,7 @@
 				<include>*.globals</include>
 				<include>*.jmx</include>
 				<include>*.json</include>
+				<include>*.sh</include>
 			</includes>
 			<excludes>
 				<exclude>build_standalone.properties</exclude>

src/main/assembly/server_enterprise.xml

@@ -15,6 +15,11 @@
 			<outputDirectory></outputDirectory>
 			<destName>ant-media-server.jar</destName>
 		</file>
+		<file>
+			<source>${project.build.directory}/${finalName}-service.jar</source>
+			<outputDirectory></outputDirectory>
+			<destName>ant-media-server-service.jar</destName>
+		</file>
 	</files>
 	<fileSets>
 		<fileSet>
@@ -24,10 +29,7 @@
 				<include>license.txt</include>
 			</includes>
 		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/ant-media-server-service-${project.parent.version}</directory>
-			<outputDirectory></outputDirectory>
-		</fileSet>
+
 		<fileSet>
 			<directory>${project.build.directory}/lib</directory>
 			<outputDirectory>lib</outputDirectory>
@@ -49,7 +51,6 @@
 				<exclude>servlet-api-*.jar</exclude>
 				<exclude>junit-${junit.version}.jar</exclude>
 				<exclude>logback-access-*.jar</exclude>
-				<exclude>ant-media-server-service-${project.parent.version}.jar</exclude>
 				<exclude>red5-server-${red5-service.version}.jar</exclude>
 				<exclude>red5-server-common-*.jar</exclude>
 				<exclude>red5-server-1*.jar</exclude>
@@ -108,7 +109,7 @@
 			<directory>${project.basedir}/src/main/server</directory>
 			<outputDirectory></outputDirectory>
 			<includes>
-				<include>*.bat</include>
+				<include>antmedia.service</include>
 			</includes>
 		</fileSet>
 		<fileSet>