Author: lahiru
Date: Mon Dec 17 17:30:12 2012
New Revision: 1423036
URL: http://svn.apache.org/viewvc?rev=1423036&view=rev
Log:
fixing startup issue.
Modified:
airavata/trunk/modules/integration-tests/pom.xml
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java
Modified: airavata/trunk/modules/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1423036&r1=1423035&r2=1423036&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Mon Dec 17 17:30:12 2012
@@ -112,7 +112,7 @@
<include name="registry.properties"/>
</fileset>
</copy>
- <copy
todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/classes/">
+ <copy
todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/classes/database_scripts">
<fileset
dir="${airavata.work.dir}/bin/database_scripts"/>
</copy>
<chmod dir="${tomcat.work.dir}/bin" perm="700"
Modified:
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java?rev=1423036&r1=1423035&r2=1423036&view=diff
==============================================================================
---
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java
(original)
+++
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java
Mon Dec 17 17:30:12 2012
@@ -239,7 +239,7 @@ public class DatabaseCreator {
private static String getScriptLocation(String prefix, DatabaseType
databaseType) {
String scriptName = prefix + "-" + databaseType + ".sql";
log.debug("Loading database script from :" + scriptName);
- return "database_scripts" + File.separator + scriptName;
+ return "database_scripts" + File.separator + scriptName;
}
private static void createDatabase(String prefix, Connection conn) throws
Exception {
@@ -273,6 +273,9 @@ public class DatabaseCreator {
try {
InputStream is =
DatabaseCreator.class.getClassLoader().getResourceAsStream(dbscriptName);
+ if(is == null){
+ is =
DatabaseCreator.class.getClassLoader().getResourceAsStream((new
File(dbscriptName)).getName());
+ }
reader = new BufferedReader(new InputStreamReader(is));
String line;
while ((line = reader.readLine()) != null) {
