roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1465426 [2/2] - in /roller/branches/fewer_modules: ./ planet-business/src/ roller-core/src/ test-utils/ test-utils/src/main/java/org/apache/roller/util/ weblogger-business/src/main/ weblogger-business/src/test/java/ weblogger-business/src/...
Date Sun, 07 Apr 2013 17:05:11 GMT

Modified: roller/branches/fewer_modules/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/pom.xml?rev=1465426&r1=1465425&r2=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/pom.xml (original)
+++ roller/branches/fewer_modules/pom.xml Sun Apr  7 17:05:00 2013
@@ -10,7 +10,7 @@
     <version>5.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>Roller Project - Trunk</name>
+    <name>roller-project</name>
     <description>
         Roller is an open source blog server built with open source Java
         libraries including Apache OpenJPA, Struts2, Velocity and Commons.
@@ -32,12 +32,7 @@
     </properties>
 
     <modules>
-        <module>roller-core</module>
         <module>test-utils</module>
-        <module>planet-business</module>
-        <!--module>planet-web</module-->
-        <module>weblogger-business</module>
-        <module>weblogger-web</module>
         <module>weblogger-webapp</module>
     </modules>
 

Modified: roller/branches/fewer_modules/test-utils/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/test-utils/pom.xml?rev=1465426&r1=1465425&r2=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/test-utils/pom.xml (original)
+++ roller/branches/fewer_modules/test-utils/pom.xml Sun Apr  7 17:05:00 2013
@@ -11,7 +11,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <name>Roller Test Utilities - Trunk</name>
+    <name>roller-test-utils</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>test-utils</artifactId>
 

Modified: roller/branches/fewer_modules/weblogger-webapp/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/pom.xml?rev=1465426&r1=1465425&r2=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/pom.xml (original)
+++ roller/branches/fewer_modules/weblogger-webapp/pom.xml Sun Apr  7 17:05:00 2013
@@ -11,31 +11,447 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <name>Roller Weblogger Web Application - Trunk</name>
+    <name>roller-webapp</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-weblogger-webapp</artifactId>
     <packaging>war</packaging>
 
+    <properties>
+        <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
+        <testMediaDir>  ${project.build.testOutputDirectory}${file.separator}mediafiles</testMediaDir>
+        <testUploadsDir>${project.build.testOutputDirectory}${file.separator}uploadsdir</testUploadsDir>
+        <testThemesDir> ${project.build.testOutputDirectory}${file.separator}themes</testThemesDir>
+        <testIndexDir>  ${project.build.testOutputDirectory}${file.separator}index</testIndexDir>
+        <testPlanetCache>${project.build.testOutputDirectory}${file.separator}planetcache</testPlanetCache>
+    </properties>
+
+	<repositories>
+	    <repository>
+			<id>com.atlassian</id>
+			<name>Atlassian Repository</name>
+			<url>http://maven.atlassian.com/public</url>
+		</repository>
+	</repositories>
+
     <dependencies>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
-            <artifactId>roller-weblogger-web</artifactId>
+            <artifactId>test-utils</artifactId>
             <version>${roller.version}</version>
+        </dependency>
+
+        <!-- OpenJPA deps -->
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
             <exclusions>
                 <exclusion>
+                    <groupId>commons-pool</groupId>
+                    <artifactId>commons-pool</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+<!-- EclipseLink deps (for sometimes testing purposes)
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>eclipselink</artifactId>
+            <version>2.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency
+-->
+
+<!-- Hibernate deps (for sometimes testing purposes)
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>3.5.1-Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.5.6</version>
+            <scope>runtime</scope>
+        </dependency> -->
+        
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.texen</groupId>
+            <artifactId>texen</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.xmlrpc</groupId>
+            <artifactId>xmlrpc-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.xmlrpc</groupId>
+            <artifactId>xmlrpc-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.xmlrpc</groupId>
+            <artifactId>xmlrpc-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.util</groupId>
+            <artifactId>ws-commons-util</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>net.oauth.core</groupId>
+            <artifactId>oauth</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.oauth.core</groupId>
+            <artifactId>oauth-provider</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+		<!-- web -->
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-tiles-plugin</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging-api</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-jsp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging-api</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>net.java.dev.rome</groupId>
+            <artifactId>rome-propono</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>xmlrpc-common</artifactId>
+                    <groupId>xmlrpc</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>xmlrpc-client</artifactId>
+                    <groupId>xmlrpc</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>ws-commons-util</artifactId>
+                    <groupId>ws-commons-util</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>activation</artifactId>
+                    <groupId>javax.activation</groupId>
+                </exclusion>
+                <exclusion>
                     <artifactId>servlet-api</artifactId>
                     <groupId>javax.servlet</groupId>
                 </exclusion>
             </exclusions>
         </dependency>
-        
+
+        <!-- spring deps -->
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>2.5.6.SEC03</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>aopalliance</groupId>
+                    <artifactId>aopalliance</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+       <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>2.5.6.SEC03</version>
+       </dependency>
+
+       <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-dao</artifactId>
+            <version>2.0.7</version>
+       </dependency>
+       
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>2.0.7.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-openid</artifactId>
+            <version>2.0.7.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.openid4java</groupId>
+                    <artifactId>openid4java</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+            <version>2.0.7.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-acl</artifactId>
+            <version>2.0.7.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jdbc</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.ldap</groupId>
+            <artifactId>spring-ldap</artifactId>
+            <version>1.2</version>
+        </dependency>
+
+         <!-- OpenID deps -->
+
+        <dependency>
+            <groupId>org.openxri</groupId>
+            <artifactId>openxri-client</artifactId>
+            <version>1.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-jcl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jug</groupId>
+                    <artifactId>jug</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openxri</groupId>
+            <artifactId>openxri-syntax</artifactId>
+            <version>1.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-jcl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.ibm.icu</groupId>
+                    <artifactId>icu4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openid4java</groupId>
+            <artifactId>openid4java-consumer</artifactId>
+            <version>0.9.6</version>
+            <type>pom</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.guice</groupId>
+                    <artifactId>guice</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xml-security</groupId>
+            <artifactId>xmlsec</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.9.1</version>
+        </dependency>
+
+        <!-- Java EE deps -->
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <!-- <scope>provided</scope> -->
+        </dependency>
+
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>activation</artifactId>
+                    <groupId>javax.activation</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.26</version>
+            <version>6.1.10</version>
             <scope>provided</scope>
         </dependency>
+
+		<dependency>
+			<groupId>com.atlassian.crowd</groupId>
+			<artifactId>crowd-integration-client-rest</artifactId>
+			<version>2.4.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+		</dependency>
+
+        <dependency>
+            <groupId>net.java.dev.rome</groupId>
+            <artifactId>rome</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.java.dev.rome</groupId>
+            <artifactId>rome-fetcher</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- test deps -->
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbynet</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyclient</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.3.1</version>
+            <type>jar</type>
+        </dependency>
         
     </dependencies>
 

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Planet.java (from r1465398, roller/branches/fewer_modules/planet-business/src/main/java/org/apache/roller/planet/business/Planet.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Planet.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Planet.java&p1=roller/branches/fewer_modules/planet-business/src/main/java/org/apache/roller/planet/business/Planet.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/planet-business/src/main/java/org/apache/roller/planet/business/Planet.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Planet.java Sun Apr  7 17:05:00 2013
@@ -19,7 +19,6 @@
 package org.apache.roller.planet.business;
 
 import org.apache.roller.planet.PlanetException;
-import org.apache.roller.planet.business.PropertiesManager;
 import org.apache.roller.planet.business.fetcher.FeedFetcher;
 
 

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java Sun Apr  7 17:05:00 2013
@@ -22,7 +22,11 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.pojos.*;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.WeblogThemeAssoc;
+import org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode;
 
 
 /**

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java Sun Apr  7 17:05:00 2013
@@ -24,10 +24,10 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import org.apache.roller.weblogger.business.*;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,6 +45,12 @@ import org.apache.commons.lang.StringUti
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.FileContentManager;
+import org.apache.roller.weblogger.business.FileIOException;
+import org.apache.roller.weblogger.business.MediaFileManager;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.Weblogger;
+import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.pojos.FileContent;
 import org.apache.roller.weblogger.pojos.MediaFile;
@@ -496,7 +502,7 @@ public class JPAMediaFileManagerImpl imp
             cmgr.deleteFile(weblog, mediaFile.getId());
             // Now thumbnail
             cmgr.deleteFile(weblog, mediaFile.getId() + "_sm");
-        } catch (FileNotFoundException e) {
+        } catch (Exception e) {
             log.debug("File to be deleted already unavailable in the file store");
         }
     }
@@ -837,7 +843,7 @@ public class JPAMediaFileManagerImpl imp
         for (MediaFile mf : files) {
             try {
                 cmgr.deleteFile(dir.getWeblog(), mf.getId());
-            } catch (FileNotFoundException e) {
+            } catch (Exception e) {
                 log.debug("File to be deleted already unavailable in the file store");
             }
             this.strategy.remove(mf);

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java Sun Apr  7 17:05:00 2013
@@ -24,11 +24,8 @@ import javax.persistence.Query;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
-
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.Weblogger;
-
 import org.apache.roller.weblogger.business.pings.PingQueueManager;
 import org.apache.roller.weblogger.pojos.AutoPing;
 import org.apache.roller.weblogger.pojos.PingQueueEntry;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java Sun Apr  7 17:05:00 2013
@@ -28,11 +28,8 @@ import javax.persistence.Query;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
-
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.Weblogger;
-
 import org.apache.roller.weblogger.business.pings.PingTargetManager;
 import org.apache.roller.weblogger.pojos.PingTarget;
 import org.apache.roller.weblogger.pojos.Weblog;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java Sun Apr  7 17:05:00 2013
@@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFac
 
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.InitializationException;
-
 import org.apache.roller.weblogger.business.PropertiesManager;
 import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
 import org.apache.roller.weblogger.config.runtime.ConfigDef;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java Sun Apr  7 17:05:00 2013
@@ -25,7 +25,6 @@ import org.apache.commons.logging.LogFac
 
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.pojos.*;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -35,8 +34,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import javax.persistence.Query;
-import org.apache.roller.weblogger.business.Weblogger;
 import org.apache.roller.weblogger.config.WebloggerConfig;
+import org.apache.roller.weblogger.pojos.GlobalPermission;
+import org.apache.roller.weblogger.pojos.RollerPermission;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.UserAttribute;
+import org.apache.roller.weblogger.pojos.UserRole;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
 
 
 @com.google.inject.Singleton

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Sun Apr  7 17:05:00 2013
@@ -21,16 +21,40 @@ package org.apache.roller.weblogger.busi
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.*;
 import org.apache.roller.weblogger.business.pings.AutoPingManager;
 import org.apache.roller.weblogger.business.pings.PingTargetManager;
 import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.pojos.*;
 
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.*;
+import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.MediaFileManager;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.business.WeblogEntryManager;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.Weblogger;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.AutoPing;
+import org.apache.roller.weblogger.pojos.PingQueueEntry;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.pojos.StatCount;
+import org.apache.roller.weblogger.pojos.StatCountCountComparator;
+import org.apache.roller.weblogger.pojos.TagStat;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogBookmark;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.WeblogEntryTag;
+import org.apache.roller.weblogger.pojos.WeblogEntryTagAggregate;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogReferrer;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.WeblogThemeAssoc;
+import org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode;
 
 
 /*

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java Sun Apr  7 17:05:00 2013
@@ -30,7 +30,6 @@ import org.apache.roller.weblogger.Weblo
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.business.WeblogManager;
-import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.pojos.WeblogTemplate;
 import org.apache.roller.weblogger.pojos.Weblog;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java Sun Apr  7 17:05:00 2013
@@ -30,7 +30,6 @@ import org.apache.commons.logging.LogFac
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.BookmarkManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
 import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
 import org.apache.roller.weblogger.pojos.WeblogEntry;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java Sun Apr  7 17:05:00 2013
@@ -26,7 +26,6 @@ import org.apache.commons.logging.LogFac
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
 
 
 /**

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/GoogleLinkPlugin.java Sun Apr  7 17:05:00 2013
@@ -18,10 +18,8 @@
 
 package org.apache.roller.weblogger.business.plugins.entry;
 
-import org.apache.roller.weblogger.business.plugins.entry.SearchPluginBase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
 
 import java.text.MessageFormat;
 import java.util.regex.Pattern;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ObfuscateEmailPlugin.java Sun Apr  7 17:05:00 2013
@@ -23,7 +23,6 @@ import org.apache.commons.lang.StringEsc
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.pojos.Weblog;
 import org.apache.roller.util.RegexUtil;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/SmileysPlugin.java Sun Apr  7 17:05:00 2013
@@ -28,7 +28,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
-import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.pojos.Weblog;
 

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java Sun Apr  7 17:05:00 2013
@@ -27,7 +27,6 @@ import org.apache.roller.weblogger.busin
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/plugins/entry/WikipediaLinkPlugin.java Sun Apr  7 17:05:00 2013
@@ -18,10 +18,8 @@
 
 package org.apache.roller.weblogger.business.plugins.entry;
 
-import org.apache.roller.weblogger.business.plugins.entry.SearchPluginBase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
 
 import java.text.MessageFormat;
 import java.util.regex.Pattern;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java Sun Apr  7 17:05:00 2013
@@ -35,7 +35,8 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.*;
+import org.apache.roller.weblogger.business.InitializationException;
+import org.apache.roller.weblogger.business.Weblogger;
 import org.apache.roller.weblogger.business.search.operations.AddEntryOperation;
 import org.apache.roller.weblogger.business.search.operations.IndexOperation;
 import org.apache.roller.weblogger.business.search.operations.ReIndexEntryOperation;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java Sun Apr  7 17:05:00 2013
@@ -22,13 +22,15 @@ import org.apache.roller.weblogger.pojos
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.pojos.*;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.*;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
 
 
 /**

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java Sun Apr  7 17:05:00 2013
@@ -21,10 +21,14 @@ package org.apache.roller.weblogger.busi
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.MediaFileManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.pojos.*;
 
 import java.util.Date;
 import java.util.List;
+import org.apache.roller.weblogger.pojos.MediaFile;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
 
 
 /**

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java Sun Apr  7 17:05:00 2013
@@ -23,9 +23,13 @@ import org.apache.commons.logging.LogFac
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.MediaFileManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.pojos.*;
 
 import java.util.*;
+import org.apache.roller.weblogger.pojos.MediaFile;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
 
 
 /**

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java Sun Apr  7 17:05:00 2013
@@ -21,10 +21,15 @@ package org.apache.roller.weblogger.pojo
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.URLStrategy;
-import org.apache.roller.weblogger.pojos.*;
 import org.apache.roller.weblogger.util.HTMLSanitizer;
 
 import java.util.*;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.WeblogReferrer;
 
 
 /**

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?rev=1465426&r1=1465398&r2=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java Sun Apr  7 17:05:00 2013
@@ -18,13 +18,17 @@
 
 package org.apache.roller.weblogger.ui.rendering.servlets;
 
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.Theme;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
+import org.apache.roller.weblogger.pojos.Template;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
-import org.apache.roller.weblogger.pojos.*;
 import org.apache.roller.weblogger.ui.core.RollerContext;
 import org.apache.roller.weblogger.ui.rendering.Renderer;
 import org.apache.roller.weblogger.ui.rendering.RendererManager;

Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java?rev=1465426&r1=1465398&r2=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java Sun Apr  7 17:05:00 2013
@@ -53,7 +53,6 @@ import org.apache.roller.weblogger.pojos
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.pojos.WeblogPermission;
 import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper;
-// import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryTagWrapper;
 import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
 import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 import org.apache.struts2.interceptor.ServletResponseAware;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java&p1=roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java Sun Apr  7 17:05:00 2013
@@ -26,7 +26,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Enumeration;
 import java.util.Properties;
-import org.apache.roller.weblogger.util.Utilities;
 
 /**
  * Roller password utility: don't run this unless you know what you are doing!</br >

Copied: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PropertiesTest.java (from r1465398, roller/branches/fewer_modules/planet-business/src/test/java/org/apache/roller/planet/business/PropertiesTest.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PropertiesTest.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PropertiesTest.java&p1=roller/branches/fewer_modules/planet-business/src/test/java/org/apache/roller/planet/business/PropertiesTest.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/planet-business/src/test/java/org/apache/roller/planet/business/PropertiesTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PropertiesTest.java Sun Apr  7 17:05:00 2013
@@ -25,8 +25,6 @@ import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.planet.TestUtils;
-import org.apache.roller.planet.business.PropertiesManager;
-import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.pojos.RuntimeConfigProperty;
 
 

Copied: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/util/PropertyExpanderTest.java (from r1465398, roller/branches/fewer_modules/roller-core/src/test/java/org/apache/roller/util/PropertyExpanderTest.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/util/PropertyExpanderTest.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/util/PropertyExpanderTest.java&p1=roller/branches/fewer_modules/roller-core/src/test/java/org/apache/roller/util/PropertyExpanderTest.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/roller-core/src/test/java/org/apache/roller/util/PropertyExpanderTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/util/PropertyExpanderTest.java Sun Apr  7 17:05:00 2013
@@ -21,7 +21,6 @@ package org.apache.roller.util;
 import java.util.HashMap;
 import java.util.Map;
 import junit.framework.TestCase;
-import org.apache.roller.util.PropertyExpander;
 
 
 /**

Copied: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java&p1=roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java Sun Apr  7 17:05:00 2013
@@ -26,8 +26,6 @@ import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.TestUtils;
-import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.Weblog;
 import org.apache.roller.weblogger.pojos.WeblogPermission;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java&p1=roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java Sun Apr  7 17:05:00 2013
@@ -25,8 +25,6 @@ import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.TestUtils;
-import org.apache.roller.weblogger.business.PropertiesManager;
-import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
 
 

Copied: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/RefererTest.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/RefererTest.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/RefererTest.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/RefererTest.java&p1=roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/RefererTest.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/RefererTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/RefererTest.java Sun Apr  7 17:05:00 2013
@@ -28,10 +28,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.TestUtils;
-import org.apache.roller.weblogger.business.PropertiesManager;
 import org.apache.roller.weblogger.business.referrers.RefererManager;
-import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.pojos.WeblogReferrer;
 import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
 import org.apache.roller.weblogger.pojos.User;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java&p1=roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java Sun Apr  7 17:05:00 2013
@@ -25,8 +25,6 @@ import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.TestUtils;
-import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.WeblogTemplate;
 import org.apache.roller.weblogger.pojos.Weblog;

Copied: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java (from r1465398, roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java)
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java&p1=roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java&r1=1465398&r2=1465426&rev=1465426&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java Sun Apr  7 17:05:00 2013
@@ -24,8 +24,6 @@ import junit.framework.TestSuite;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.TestUtils;
-import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.pojos.StatCount;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.Weblog;



Mime
View raw message