roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r549297 - in /roller/trunk/apps/weblogger: src/java/org/apache/roller/weblogger/business/ src/java/org/apache/roller/weblogger/business/startup/ src/java/org/apache/roller/weblogger/business/utils/ test/java/org/apache/roller/weblogger/busi...
Date Wed, 20 Jun 2007 23:33:34 GMT
Author: agilliland
Date: Wed Jun 20 16:33:33 2007
New Revision: 549297

URL: http://svn.apache.org/viewvc?view=rev&rev=549297
Log:
some final cleanup work moving some of the classes involved in the auto-install database install
work into the business.startup package.


Added:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
      - copied, changed from r549132, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/ClasspathDatabaseScriptProvider.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
      - copied, changed from r549290, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseInstaller.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java
      - copied, changed from r549132, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseScriptProvider.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
      - copied, changed from r549132, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/SQLScriptRunner.java
Removed:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/ClasspathDatabaseScriptProvider.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseInstaller.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseScriptProvider.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/SQLScriptRunner.java
Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
    roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java?view=diff&rev=549297&r1=549296&r2=549297
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
Wed Jun 20 16:33:33 2007
@@ -20,9 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.startup.WebloggerStartup;
-import org.apache.roller.weblogger.config.PingConfig;
 import org.apache.roller.weblogger.config.RollerConfig;
 
 

Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
(from r549132, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/ClasspathDatabaseScriptProvider.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java?view=diff&rev=549297&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/ClasspathDatabaseScriptProvider.java&r1=549132&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java&r2=549297
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/ClasspathDatabaseScriptProvider.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
Wed Jun 20 16:33:33 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.weblogger.business.utils;
+package org.apache.roller.weblogger.business.startup;
 
 import java.io.InputStream;
 

Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
(from r549290, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseInstaller.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?view=diff&rev=549297&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseInstaller.java&r1=549290&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java&r2=549297
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseInstaller.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
Wed Jun 20 16:33:33 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.weblogger.business.utils;
+package org.apache.roller.weblogger.business.startup;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -31,7 +31,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.business.DatabaseProvider;
-import org.apache.roller.weblogger.business.startup.StartupException;
 import org.apache.roller.weblogger.pojos.WeblogPermission;
 
 

Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java
(from r549132, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseScriptProvider.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java?view=diff&rev=549297&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseScriptProvider.java&r1=549132&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java&r2=549297
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/DatabaseScriptProvider.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseScriptProvider.java
Wed Jun 20 16:33:33 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.weblogger.business.utils;
+package org.apache.roller.weblogger.business.startup;
 
 import java.io.InputStream;
 

Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
(from r549132, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/SQLScriptRunner.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java?view=diff&rev=549297&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/SQLScriptRunner.java&r1=549132&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java&r2=549297
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/SQLScriptRunner.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
Wed Jun 20 16:33:33 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.weblogger.business.utils;
+package org.apache.roller.weblogger.business.startup;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -33,12 +33,14 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+
 /**
  * SQL script runner, parses script and allows you to run it. 
  * You can run the script multiple times if necessary.
  * Assumes that anything on an input line after "--" or ";" can be ignored.
  */
 public class SQLScriptRunner {
+    
     private static Log   log = LogFactory.getLog(SQLScriptRunner.class);
     
     private String       scriptPath = null;

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java?view=diff&rev=549297&r1=549296&r2=549297
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
Wed Jun 20 16:33:33 2007
@@ -23,8 +23,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.business.DatabaseProvider;
 import org.apache.roller.weblogger.business.MailProvider;
-import org.apache.roller.weblogger.business.utils.ClasspathDatabaseScriptProvider;
-import org.apache.roller.weblogger.business.utils.DatabaseInstaller;
 import org.apache.roller.weblogger.config.RollerConfig;
 
 

Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java?view=diff&rev=549297&r1=549296&r2=549297
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java
(original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java
Wed Jun 20 16:33:33 2007
@@ -23,7 +23,7 @@
 import java.sql.SQLException;
 import junit.framework.TestCase;
 import org.apache.roller.weblogger.business.startup.WebloggerStartup;
-import org.apache.roller.weblogger.business.utils.SQLScriptRunner;
+import org.apache.roller.weblogger.business.startup.SQLScriptRunner;
 
 /**
  * Test parsing and running of SQL scripts



Mime
View raw message