Assembly improvements

Author: Rustam Aliyev

assembly/pom.xml

@@ -62,7 +62,7 @@
 						<id>package-provision</id>
 						<phase>package</phase>
 						<goals>
-							<goal>run</goal>
+							<goal>directory</goal>
 						</goals>
 					</execution>
 				</executions>

assembly/src/main/etc/assembly/assembly.xml

@@ -13,14 +13,14 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>${project.parent.parent.parent.basedir}/runner/bundles</directory>
+			<directory>${project.parent.parent.parent.basedir}/target/pax-runner-dir/bundles</directory>
 			<outputDirectory>/elasticinbox-${project.version}/lib/bundles</outputDirectory>
 			<includes>
 				<include>*.jar</include>
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>${project.parent.parent.parent.basedir}/runner/equinox</directory>
+			<directory>${project.parent.parent.parent.basedir}/target/pax-runner-dir/equinox</directory>
 			<outputDirectory>/elasticinbox-${project.version}/lib/equinox</outputDirectory>
 			<includes>
 				<include>*.ini</include>

pom.xml

@@ -92,7 +92,9 @@
 
     <!-- Default settings -->
     <boot.delegation.packages />
+    <!-- JMX enabled through startup script
     <vm.properties>-Dcom.sun.management.jmxremote.port=9099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false</vm.properties>
+    -->
     <vm.loglevel />
     <default.osgi.framework>equinox</default.osgi.framework>
     <default.osgi.framework.version>3.6.2</default.osgi.framework.version>