configured appassembler to only use booter scripts for windows; renamed lib --> repo since appassembler's scripts don't support configurable repo names for booters
diff --git a/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java b/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java
index 2e04bbf..39b4ca9 100644
--- a/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java
+++ b/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java
@@ -136,7 +136,7 @@
writeAsterixConfigurationFile(asterixInstance);
String asterixInstanceDir = InstallerDriver.getAsterixDir() + File.separator + asterixInstance.getName();
unzip(origZipFile, asterixInstanceDir);
- File sourceJar = new File(asterixInstanceDir + File.separator + "lib" + File.separator + "asterix-app-"
+ File sourceJar = new File(asterixInstanceDir + File.separator + "repo" + File.separator + "asterix-app-"
+ asterixInstance.getAsterixVersion() + ".jar");
File replacementFile = new File(asterixInstanceDir + File.separator + ASTERIX_CONFIGURATION_FILE);
replaceInJar(sourceJar, ASTERIX_CONFIGURATION_FILE, replacementFile);
@@ -151,7 +151,7 @@
throws IOException, InstallerException {
String asterixInstanceDir = InstallerDriver.getAsterixDir() + File.separator + asterixInstance.getName();
unzip(origZipFile, asterixInstanceDir);
- File sourceJar1 = new File(asterixInstanceDir + File.separator + "lib" + File.separator + "asterix-app-"
+ File sourceJar1 = new File(asterixInstanceDir + File.separator + "repo" + File.separator + "asterix-app-"
+ asterixInstance.getAsterixVersion() + ".jar");
Properties txnLogProperties = new Properties();
URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { sourceJar1.toURI().toURL() });
@@ -162,7 +162,7 @@
writeAsterixLogConfigurationFile(asterixInstance, txnLogProperties);
- File sourceJar2 = new File(asterixInstanceDir + File.separator + "lib" + File.separator + "asterix-app-"
+ File sourceJar2 = new File(asterixInstanceDir + File.separator + "repo" + File.separator + "asterix-app-"
+ asterixInstance.getAsterixVersion() + ".jar");
File replacementFile = new File(asterixInstanceDir + File.separator + "log.properties");
replaceInJar(sourceJar2, TXN_LOG_CONFIGURATION_FILE, replacementFile);
diff --git a/asterix-server/pom.xml b/asterix-server/pom.xml
index 8500228..f6962c3 100644
--- a/asterix-server/pom.xml
+++ b/asterix-server/pom.xml
@@ -30,14 +30,38 @@
<version>1.3</version>
<configuration>
<assembleDirectory>
- ${project.build.directory}/generated-resources/appassembler
+ ${project.build.directory}/appassembler
</assembleDirectory>
+ <repositoryLayout>flat</repositoryLayout>
+ <programs>
+ <program>
+ <platforms>
+ <platform>unix</platform>
+ </platforms>
+ <name>asterixcc</name>
+ <mainClass>edu.uci.ics.hyracks.control.cc.CCDriver</mainClass>
+ <commandLineArguments>
+ <commandLineArgument>-app-cc-main-class</commandLineArgument>
+ <commandLineArgument>edu.uci.ics.asterix.hyracks.bootstrap.CCApplicationEntryPoint</commandLineArgument>
+ </commandLineArguments>
+ </program>
+ <program>
+ <platforms>
+ <platform>unix</platform>
+ </platforms>
+ <name>asterixnc</name>
+ <mainClass>edu.uci.ics.hyracks.control.nc.NCDriver</mainClass>
+ <commandLineArguments>
+ <commandLineArgument>-app-nc-main-class</commandLineArgument>
+ <commandLineArgument>edu.uci.ics.asterix.hyracks.bootstrap.NCApplicationEntryPoint</commandLineArgument>
+ </commandLineArguments>
+ </program>
+ </programs>
<daemons>
<daemon>
<id>asterixcc</id>
<mainClass>edu.uci.ics.hyracks.control.cc.CCDriver</mainClass>
<platforms>
- <platform>booter-unix</platform>
<platform>booter-windows</platform>
</platforms>
<commandLineArguments>
@@ -49,7 +73,6 @@
<id>asterixnc</id>
<mainClass>edu.uci.ics.hyracks.control.nc.NCDriver</mainClass>
<platforms>
- <platform>booter-unix</platform>
<platform>booter-windows</platform>
</platforms>
<commandLineArguments>
@@ -62,6 +85,7 @@
<executions>
<execution>
<goals>
+ <goal>assemble</goal>
<goal>generate-daemons</goal>
<goal>create-repository</goal>
</goals>
diff --git a/asterix-server/src/main/assembly/binary-assembly.xml b/asterix-server/src/main/assembly/binary-assembly.xml
index 8068c76..7cc6eeb 100644
--- a/asterix-server/src/main/assembly/binary-assembly.xml
+++ b/asterix-server/src/main/assembly/binary-assembly.xml
@@ -25,6 +25,11 @@
<outputDirectory>repo</outputDirectory>
</fileSet>
<fileSet>
+ <directory>target/appassembler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
<directory>target/generated-resources/appassembler/booter-unix/etc</directory>
<outputDirectory>etc</outputDirectory>
<includes>