You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@roller.apache.org by ga...@apache.org on 2010/02/08 16:41:02 UTC

svn commit: r907695 - /roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java

Author: gangolli
Date: Mon Feb  8 15:41:02 2010
New Revision: 907695

URL: http://svn.apache.org/viewvc?rev=907695&view=rev
Log:
Fix path formation to correspond to location of scripts in the jar.  Still can get the wrong resource for createdb.sql because there is one in the planet jar as well.

Modified:
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java?rev=907695&r1=907694&r2=907695&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java Mon Feb  8 15:41:02 2010
@@ -27,8 +27,8 @@
 public class ClasspathDatabaseScriptProvider implements DatabaseScriptProvider {
     
     public InputStream getDatabaseScript(String path) {
-        return ClasspathDatabaseScriptProvider.class.getResourceAsStream(
-                "/dbscripts/" + path);
+        String resourcePath = "/sql/" + path;
+        return this.getClass().getResourceAsStream(resourcePath);
     }
     
 }