| commit | 473aac7bcab5c78ae247f0a9679ad05cf052051f | [log] [tgz] |
|---|---|---|
| author | ramangrover29 <ramangrover29@eaa15691-b419-025a-1212-ee371bd00084> | Thu Feb 21 18:44:17 2013 +0000 |
| committer | ramangrover29 <ramangrover29@eaa15691-b419-025a-1212-ee371bd00084> | Thu Feb 21 18:44:17 2013 +0000 |
| tree | 66c6ee294b3a5ad27eb826ad5f174b7c84beb43c | |
| parent | 116eb971a82319ba8476cb7e2c9b3d4a07cb5f92 [diff] |
1) minor change for packaging structure for hadoop libraries 2) escalating error message to the end-user git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_installer@1220 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventExecutor.java b/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventExecutor.java index 92bdf72..043efa4 100644 --- a/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventExecutor.java +++ b/asterix-events/src/main/java/edu/uci/ics/asterix/event/management/EventExecutor.java
@@ -70,7 +70,7 @@ String result = writer.getBuffer().toString(); OutputAnalysis analysis = outputHandler.reportEventOutput(pattern.getEvent(), result); if (!analysis.isExpected()) { - throw new IOException(analysis.getErrorMessage()); + throw new IOException(analysis.getErrorMessage() + result); } } }
diff --git a/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/command/StartCommand.java b/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/command/StartCommand.java index 348d59e..3c5e32f 100644 --- a/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/command/StartCommand.java +++ b/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/command/StartCommand.java
@@ -38,8 +38,8 @@ PatternCreator pc = new PatternCreator(); Patterns patterns = pc.getStartAsterixPattern(asterixInstanceName, instance.getCluster()); ManagixUtil.getEventrixClient(instance.getCluster()).submit(patterns); - // ManagixUtil.deleteDirectory(ManagixDriver.getManagixHome() + File.separator + ManagixDriver.ASTERIX_DIR - // + File.separator + asterixInstanceName); + ManagixUtil.deleteDirectory(ManagixDriver.getManagixHome() + File.separator + ManagixDriver.ASTERIX_DIR + + File.separator + asterixInstanceName); AsterixRuntimeState runtimeState = VerificationUtil.getAsterixRuntimeState(instance); VerificationUtil.updateInstanceWithRuntimeDescription(instance, runtimeState, true); System.out.println(instance.getDescription(false));
diff --git a/asterix-installer/src/main/resources/hadoop-0.20.2/conf/hadoop-config.sh b/asterix-installer/src/main/resources/hadoop-0.20.2/bin/hadoop-config.sh similarity index 100% rename from asterix-installer/src/main/resources/hadoop-0.20.2/conf/hadoop-config.sh rename to asterix-installer/src/main/resources/hadoop-0.20.2/bin/hadoop-config.sh