roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r823874 - in /roller/trunk: apps/weblogger/ apps/weblogger/nbproject/ apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/ apps/weblogger/src/java/org/apache/roller/weblogger/business/search/ apps/weblogger/src/java/org/apache/...
Date Sat, 10 Oct 2009 15:44:12 GMT
Author: snoopdave
Date: Sat Oct 10 15:44:10 2009
New Revision: 823874

URL: http://svn.apache.org/viewvc?rev=823874&view=rev
Log:
Upgrading all Java dependencies to latest stable versions. Some code changes were required for move to Lucene 2.9.0 and move to Java 1.5 concurrent classes. All unit tests are passing, basic sanity tests have been done and I'll upgrade my site to latest trunk this weekend.

Here are the ugprade details:

Spring to 2.5.6
Spring Security to 2.0.5
EhCache to 1.6.2
Struts to 2.1.18
Commons Codec to 1.4
Commons Collections to 3.2.1
Commons Digester to 2.0 
Commons HttpClient to 3.1
Commons Lang to 2.4
Commons Logging to 1.1.1
Guice to 2.0
Jaxen to 1.1.1
JDOM to 1.1.1
Log4J to 1.2.12
Lucene to 2.9.0
Saxpath to 1.0
Velocity to 1.6.2
XML-RPC to 3.1.2

Added:
    roller/trunk/tools/lib/commons-codec-1.4.jar   (with props)
    roller/trunk/tools/lib/commons-collections-3.2.1.jar   (with props)
    roller/trunk/tools/lib/commons-digester-2.0.jar   (with props)
    roller/trunk/tools/lib/commons-httpclient-3.1.jar   (with props)
    roller/trunk/tools/lib/commons-lang-2.4.jar   (with props)
    roller/trunk/tools/lib/commons-logging-1.1.1.jar   (with props)
    roller/trunk/tools/lib/guice-2.0.jar   (with props)
    roller/trunk/tools/lib/jaxen-1.1.1.jar   (with props)
    roller/trunk/tools/lib/jdom-1.1.1.jar   (with props)
    roller/trunk/tools/lib/log4j-1.2.12.jar   (with props)
    roller/trunk/tools/lib/lucene-core-2.9.0.jar   (with props)
    roller/trunk/tools/lib/saxpath-1.0.jar   (with props)
    roller/trunk/tools/lib/taglibs-string-1.1.0.jar   (with props)
    roller/trunk/tools/lib/velocity-1.6.2.jar   (with props)
    roller/trunk/tools/openjpa-1.2/   (props changed)
      - copied from r811702, roller/trunk/tools/openjpa-1.2.1/
    roller/trunk/tools/spring-2.5/ehcache-1.6.2.jar   (with props)
    roller/trunk/tools/spring-2.5/spring-2.5.6.jar   (with props)
    roller/trunk/tools/spring-2.5/spring-ldap-1.3.0.RELEASE-all.jar   (with props)
    roller/trunk/tools/spring-2.5/spring-security-acl-2.0.5.RELEASE.jar   (with props)
    roller/trunk/tools/spring-2.5/spring-security-core-2.0.5.RELEASE.jar   (with props)
    roller/trunk/tools/spring-2.5/spring-security-openid-2.0.5.RELEASE.jar   (with props)
    roller/trunk/tools/spring-2.5/spring-security-taglibs-2.0.5.RELEASE.jar   (with props)
    roller/trunk/tools/spring-2.5/spring-web-2.5.6.jar   (with props)
    roller/trunk/tools/struts-2.1/   (props changed)
      - copied from r811702, roller/trunk/tools/struts-2.1.6/
    roller/trunk/tools/struts-2.1/lib/freemarker-2.3.15.jar   (with props)
    roller/trunk/tools/struts-2.1/lib/ognl-2.7.3.jar   (with props)
    roller/trunk/tools/struts-2.1/lib/struts2-core-2.1.8.jar   (with props)
    roller/trunk/tools/struts-2.1/lib/struts2-spring-plugin-2.1.8.jar   (with props)
    roller/trunk/tools/struts-2.1/lib/struts2-tiles-plugin-2.1.8.jar   (with props)
    roller/trunk/tools/struts-2.1/lib/xwork-core-2.1.6.jar   (with props)
    roller/trunk/tools/xmlrpc-3.1/   (props changed)
      - copied from r811702, roller/trunk/tools/xmlrpc-3.0/
    roller/trunk/tools/xmlrpc-3.1/lib/ws-commons-util-1.0.2.jar   (with props)
    roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-client-3.1.2.jar   (with props)
    roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-common-3.1.2.jar   (with props)
    roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-server-3.1.2.jar   (with props)
Removed:
    roller/trunk/tools/lib/commons-codec-1.3.jar
    roller/trunk/tools/lib/commons-collections-3.2.jar
    roller/trunk/tools/lib/commons-digester-1.6.jar
    roller/trunk/tools/lib/commons-httpclient-3.0.1.jar
    roller/trunk/tools/lib/commons-id-0.1-SNAPSHOT.jar
    roller/trunk/tools/lib/commons-lang-2.1.jar
    roller/trunk/tools/lib/commons-logging-1.0.4.jar
    roller/trunk/tools/lib/concurrent-1.3.2.jar
    roller/trunk/tools/lib/guice-1.0.jar
    roller/trunk/tools/lib/jaxen-full.jar
    roller/trunk/tools/lib/jdom.jar
    roller/trunk/tools/lib/log4j-1.2.11.jar
    roller/trunk/tools/lib/lucene-1.4.3.jar
    roller/trunk/tools/lib/saxpath.jar
    roller/trunk/tools/lib/taglibs-string.jar
    roller/trunk/tools/lib/velocity-1.5.jar
    roller/trunk/tools/oauth/commons-httpclient-3.1.jar
    roller/trunk/tools/openjpa-1.2.1/
    roller/trunk/tools/spring-2.5/spring-2.5.4.jar
    roller/trunk/tools/spring-2.5/spring-ldap-1.2.1.jar
    roller/trunk/tools/spring-2.5/spring-security-acl-2.0.3.jar
    roller/trunk/tools/spring-2.5/spring-security-core-2.0.3.jar
    roller/trunk/tools/spring-2.5/spring-security-openid-2.0.3.jar
    roller/trunk/tools/spring-2.5/spring-security-taglibs-2.0.3.jar
    roller/trunk/tools/spring-2.5/spring-web-2.5.4.jar
    roller/trunk/tools/struts-2.1.6/
    roller/trunk/tools/struts-2.1/lib/freemarker-2.3.13.jar
    roller/trunk/tools/struts-2.1/lib/ognl-2.6.11.jar
    roller/trunk/tools/struts-2.1/lib/struts2-core-2.1.6.jar
    roller/trunk/tools/struts-2.1/lib/struts2-spring-plugin-2.1.6.jar
    roller/trunk/tools/struts-2.1/lib/struts2-tiles-plugin-2.1.6.jar
    roller/trunk/tools/struts-2.1/lib/xwork-2.1.2.jar
    roller/trunk/tools/xmlrpc-3.0/
    roller/trunk/tools/xmlrpc-3.1/lib/ws-commons-util-1.0.1.jar
    roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-client-3.0.jar
    roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-common-3.0.jar
    roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-server-3.0.jar
Modified:
    roller/trunk/apps/weblogger/nbproject/project.xml
    roller/trunk/apps/weblogger/properties.xmlf
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java
    roller/trunk/apps/weblogger/testdata/WEB-INF/classes/commons-logging.properties
    roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
    roller/trunk/apps/weblogger/web/WEB-INF/classes/commons-logging.properties

Modified: roller/trunk/apps/weblogger/nbproject/project.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/nbproject/project.xml?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/nbproject/project.xml (original)
+++ roller/trunk/apps/weblogger/nbproject/project.xml Sat Oct 10 15:44:10 2009
@@ -132,7 +132,7 @@
                 <package-root>src/java</package-root>
                 <package-root>test/java</package-root>
                 <package-root>docs/examples/plugins/pluginmodel/src</package-root>
-                <classpath mode="compile">../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlr
 pc-3.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:../../tools/lib/commons-httpclient-3.0.1.jar:../../tools/lib/dom3-xercesImpl.jar:../../tools/lib/nekohtml.jar:../../tools/lib/openxri-syntax.jar:../../tools/lib/apache-xml-security.jar:../../tools/lib/dom3-xml-apis.jar:../../tools/lib/openxri-client.
 jar:../../tools/spring-2.5/spring-2.5.4.jar:../../tools/spring-2.5/spring-security-openid-2.0.3.jar:../../tools/spring-2.5/spring-ldap-1.2.1.jar:../../tools/spring-2.5/spring-security-taglibs-2.0.3.jar:../../tools/spring-2.5/spring-security-acl-2.0.3.jar:../../tools/spring-2.5/spring-web-2.5.4.jar:../../tools/spring-2.5/spring-security-core-2.0.3.jar:../../tools/oauth/commons-httpclient-3.1.jar:../../tools/oauth/httpclient-4.0-beta1.jar:../../tools/oauth/httpcore-4.0-beta2.jar:../../tools/oauth/oauth-core-20090121.jar:../../tools/lib/rome-1.0.jar:../../tools/lib/rome-fetcher-1.0.jar:../../tools/lib/rome-propono-1.0.jar:../../tools/openjpa-1.2.1/geronimo-jpa_3.0_spec-1.0.jar:../../tools/struts-2.1.6/lib/antlr-2.7.2.jar:../../tools/struts-2.1.6/lib/commons-beanutils-1.7.0.jar:../../tools/struts-2.1.6/lib/commons-chain-1.2.jar:../../tools/struts-2.1.6/lib/commons-fileupload-1.2.1.jar:../../tools/struts-2.1.6/lib/commons-io-1.3.2.jar:../../tools/struts-2.1.6/lib/commons-validato
 r-1.3.1.jar:../../tools/struts-2.1.6/lib/freemarker-2.3.13.jar:../../tools/struts-2.1.6/lib/ognl-2.6.11.jar:../../tools/struts-2.1.6/lib/oro-2.0.8.jar:../../tools/struts-2.1.6/lib/struts2-core-2.1.6.jar:../../tools/struts-2.1.6/lib/struts2-tiles-plugin-2.1.6.jar:../../tools/struts-2.1.6/lib/tiles-api-2.0.6.jar:../../tools/struts-2.1.6/lib/tiles-core-2.0.6.jar:../../tools/struts-2.1.6/lib/tiles-jsp-2.0.6.jar:../../tools/struts-2.1.6/lib/xwork-2.1.2.jar</classpath>
+                <classpath mode="compile">../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:../../tools/oauth/httpclient-
 4.0-beta1.jar:../../tools/oauth/httpcore-4.0-beta2.jar:../../tools/oauth/oauth-core-20090121.jar:../../tools/lib/rome-1.0.jar:../../tools/lib/rome-fetcher-1.0.jar:../../tools/lib/rome-propono-1.0.jar:../../tools/lib/commons-codec-1.4.jar:../../tools/lib/commons-collections-3.2.1.jar:../../tools/lib/commons-digester-2.0.jar:../../tools/lib/commons-httpclient-3.1.jar:../../tools/lib/commons-lang-2.4.jar:../../tools/lib/commons-logging-1.1.1.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-2.0.jar:../../tools/lib/jaxen-1.1.1.jar:../../tools/lib/jdom-1.1.1.jar:../../tools/lib/json-20070829.jar:../../tools/lib/log4j-1.2.12.jar:../../tools/lib/lucene-core-2.9.0.jar:../../tools/lib/rome-1.0.jar:../../tools/lib/rome-fetcher-1.0.jar:../../tools/lib/rome-propono-1.0.jar:../../tools/lib/saxpath-1.0.jar:../../tools/lib/taglibs-string-1.1.0.jar:../../tools/lib/velocity-1.6.2.jar:../../tools/struts-2.1/lib/antlr-2.7.2.jar:../../tools/struts-2.1/lib/commons-beanutils-1.7.0.ja
 r:../../tools/struts-2.1/lib/commons-chain-1.2.jar:../../tools/struts-2.1/lib/commons-fileupload-1.2.1.jar:../../tools/struts-2.1/lib/commons-io-1.3.2.jar:../../tools/struts-2.1/lib/commons-validator-1.3.1.jar:../../tools/struts-2.1/lib/freemarker-2.3.15.jar:../../tools/struts-2.1/lib/ognl-2.7.3.jar:../../tools/struts-2.1/lib/oro-2.0.8.jar:../../tools/struts-2.1/lib/struts2-core-2.1.8.jar:../../tools/struts-2.1/lib/struts2-spring-plugin-2.1.8.jar:../../tools/struts-2.1/lib/struts2-tiles-plugin-2.1.8.jar:../../tools/struts-2.1/lib/tiles-api-2.0.6.jar:../../tools/struts-2.1/lib/tiles-core-2.0.6.jar:../../tools/struts-2.1/lib/tiles-jsp-2.0.6.jar:../../tools/struts-2.1/lib/xwork-core-2.1.6.jar:../../tools/spring-2.5/apache-xml-security.jar:../../tools/spring-2.5/dom3-xercesImpl.jar:../../tools/spring-2.5/dom3-xml-apis.jar:../../tools/spring-2.5/ehcache-1.6.2.jar:../../tools/spring-2.5/java-openid-sxip.jar:../../tools/spring-2.5/nekohtml.jar:../../tools/spring-2.5/openxri-client.
 jar:../../tools/spring-2.5/openxri-syntax.jar:../../tools/spring-2.5/spring-2.5.6.jar:../../tools/spring-2.5/spring-ldap-1.3.0.RELEASE-all.jar:../../tools/spring-2.5/spring-security-acl-2.0.5.RELEASE.jar:../../tools/spring-2.5/spring-security-core-2.0.5.RELEASE.jar:../../tools/spring-2.5/spring-security-openid-2.0.5.RELEASE.jar:../../tools/spring-2.5/spring-security-taglibs-2.0.5.RELEASE.jar:../../tools/spring-2.5/spring-web-2.5.6.jar:../../tools/openjpa-1.2/geronimo-jpa_3.0_spec-1.0.jar:../../tools/xmlrpc-3.1/lib/ws-commons-util-1.0.2.jar:../../tools/xmlrpc-3.1/lib/xmlrpc-client-3.1.2.jar:../../tools/xmlrpc-3.1/lib/xmlrpc-common-3.1.2.jar:../../tools/xmlrpc-3.1/lib/xmlrpc-server-3.1.2.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>

Modified: roller/trunk/apps/weblogger/properties.xmlf
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/properties.xmlf?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/properties.xmlf (original)
+++ roller/trunk/apps/weblogger/properties.xmlf Sat Oct 10 15:44:10 2009
@@ -56,11 +56,10 @@
 <property name="build.jspc"               value="${ro.build}/jspc"/>
 
 <!-- various libraries used by Roller -->
-<property name="tools.struts2"       value="${ro.tools}/struts-2.1.6" />
-<property name="tools.jpa"           value="${ro.tools}/openjpa-1.2.1" />
+<property name="tools.struts2"       value="${ro.tools}/struts-2.1" />
+<property name="tools.jpa"           value="${ro.tools}/openjpa-1.2" />
 <property name="tools.spring"        value="${ro.tools}/spring-2.5" />
 <property name="tools.jstl"          value="${ro.tools}/jakarta-taglibs-standard-1.1.2" />
-<property name="tools.xdoclet"       value="${ro.tools}/buildtime/xdoclet-1.2.3" />
 <property name="tools.tomcat"        value="${ro.tools}/buildtime/tomcat-5.0.28" />
 
 <!--
@@ -84,24 +83,22 @@
 <!-- **************************************************************** -->
 
 <fileset id="base.jars" dir="${ro.tools}/lib">
-    <include name="commons-id-0.1-SNAPSHOT.jar"/>
-    <include name="commons-collections-3.2.jar" />
-    <include name="commons-codec-1.3.jar" />
-    <include name="commons-digester-1.6.jar" />
-    <include name="commons-httpclient-3.0.1.jar" />
-    <include name="commons-logging-1.0.4.jar" />
-    <include name="commons-lang-2.1.jar" />
-    <include name="concurrent-1.3.2.jar"/>
-    <include name="jaxen-full.jar" />
-    <include name="saxpath.jar" />
-    <include name="jdom.jar"/>
-    <include name="lucene-1.4.3.jar"/>
-    <include name="log4j-1.2.11.jar"/>
+    <include name="commons-codec-1.4.jar" />
+    <include name="commons-collections-3.2.1.jar" />
+    <include name="commons-digester-2.0.jar" />
+    <include name="commons-httpclient-3.1.jar" />
+    <include name="commons-lang-2.4.jar" />
+    <include name="commons-logging-1.1.1.jar" />
+    <include name="guice-2.0.jar"/>
+    <include name="jaxen-1.1.jar" />
+    <include name="jdom-1.1.1.jar"/>
+    <include name="log4j-1.2.12.jar"/>
+    <include name="lucene-core-2.9.0.jar"/>
     <include name="rome-1.0.jar"/>
     <include name="rome-propono-1.0.jar"/>
     <include name="rome-fetcher-1.0.jar"/>
-    <include name="velocity-1.5.jar"/>
-    <include name="guice-1.0.jar"/>
+    <include name="saxpath-1.0.jar" />
+    <include name="velocity-1.6.2.jar"/>
 </fileset>
 
 <fileset id="presentation.jars" dir="${ro.tools}/lib">
@@ -138,11 +135,8 @@
     <include name="*.jar"/>
 </fileset>
 
-<fileset id="xmlrpc.jars" dir="${ro.tools}/xmlrpc-3.0/lib">
-    <include name="ws-commons-util-1.0.1.jar"/>
-    <include name="xmlrpc-common-3.0.jar"/>
-    <include name="xmlrpc-client-3.0.jar"/>
-    <include name="xmlrpc-server-3.0.jar"/>
+<fileset id="xmlrpc.jars" dir="${ro.tools}/xmlrpc-3.1/lib">
+    <include name="*.jar"/>
 </fileset>
 
 <fileset id="oauth.jars" dir="${ro.tools}/oauth">

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java Sat Oct 10 15:44:10 2009
@@ -25,6 +25,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import org.apache.roller.weblogger.business.*;
 import java.sql.Timestamp;
@@ -37,9 +38,9 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 import javax.imageio.ImageIO;
+
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -610,7 +611,6 @@
      * checks for existence of migration status file.
      */
     public boolean isFileStorageUpgradeRequired() {
-        // TODO: Bad exception and return value convention here.  This should return void and throw exceptions on error.
         String uploadsDirName = WebloggerConfig.getProperty("uploads.dir");
         if (uploadsDirName != null) {
             File uploadsDir = new File(uploadsDirName);
@@ -619,8 +619,9 @@
                 try {
                     props.load(new FileInputStream(uploadsDirName
                         + File.separator + MIGRATION_STATUS_FILENAME));
-                } catch (Exception ex) {
-                    return false;
+                    
+                } catch (IOException ex) {
+                    return true;
                 }
                 if (props.getProperty("complete") != null) {
                     return false;

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java Sat Oct 10 15:44:10 2009
@@ -21,6 +21,8 @@
 import java.io.File;
 import java.io.IOException;
 
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.analysis.Analyzer;
@@ -41,11 +43,7 @@
 import org.apache.roller.weblogger.business.search.operations.WriteToIndexOperation;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.pojos.Weblog;
-
-import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
-import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
 import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.commons.lang.StringUtils;
 
 
 /**
@@ -80,7 +78,7 @@
     
     private boolean inconsistentAtStartup = false;
     
-    private ReadWriteLock rwl = new WriterPreferenceReadWriteLock();
+    private ReadWriteLock rwl = new ReentrantReadWriteLock();
     
     //~ Constructors
     // ===========================================================

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java Sat Oct 10 15:44:10 2009
@@ -1,20 +1,20 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-*  contributor license agreements.  The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.  For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
 /* Created on Jul 16, 2003 */
 package org.apache.roller.weblogger.business.search.operations;
 
@@ -47,32 +47,30 @@
  * @author Mindaugas Idzelis (min@idzelis.com)
  */
 public abstract class IndexOperation implements Runnable {
+
     private static Log mLogger = LogFactory.getFactory().getInstance(IndexOperation.class);
 
     //~ Instance fields
     // ========================================================
     protected IndexManagerImpl manager;
-
     private IndexReader reader;
-
     private IndexWriter writer;
 
     //~ Constructors
     // ===========================================================
-
     public IndexOperation(IndexManagerImpl manager) {
         this.manager = manager;
     }
 
     //~ Methods
     // ================================================================
-
     protected Document getDocument(WeblogEntry data) {
 
         // Actual comment content is indexed only if search.index.comments
         // is true or absent from the (static) configuration properties.
         // If false in the configuration, comments are treated as if empty.
-        boolean indexComments = WebloggerConfig.getBooleanProperty("search.index.comments", true);
+        boolean indexComments =
+            WebloggerConfig.getBooleanProperty("search.index.comments", true);
 
         String commentContent = "";
         String commentEmail = "";
@@ -106,38 +104,78 @@
 
         Document doc = new Document();
 
-        doc.add(Field.Keyword(FieldConstants.ID, data.getId()));
-
-        doc.add(Field.Keyword(FieldConstants.WEBSITE_HANDLE, data.getWebsite().getHandle()));
-
-        doc.add(Field.UnIndexed(FieldConstants.ANCHOR, data.getAnchor()));
-        doc.add(Field.Text(FieldConstants.USERNAME, data.getCreator().getUserName()));
-        doc.add(Field.Text(FieldConstants.TITLE, data.getTitle()));
+        // keyword
+        doc.add(new Field(FieldConstants.ID, data.getId(),
+                Field.Store.YES, Field.Index.NOT_ANALYZED));
+
+        // keyword
+        doc.add(new Field(FieldConstants.WEBSITE_HANDLE,
+                data.getWebsite().getHandle(),
+                Field.Store.YES, Field.Index.NOT_ANALYZED));
+
+        // unindexed
+        doc.add(new Field(FieldConstants.ANCHOR,
+                data.getAnchor(),
+                Field.Store.YES, Field.Index.NO));
+
+        // text
+        doc.add(new Field(FieldConstants.USERNAME,
+                data.getCreator().getUserName(),
+                Field.Store.YES, Field.Index.ANALYZED));
+
+        // text
+        doc.add(new Field(FieldConstants.TITLE,
+                data.getTitle(), 
+                Field.Store.YES, Field.Index.ANALYZED));
 
         // index the entry text, but don't store it - moved to end of block
-        doc.add(Field.UnStored(FieldConstants.CONTENT, data.getText()));
+        // unstored
+        doc.add(new Field(FieldConstants.CONTENT,
+                data.getText(),
+                Field.Store.NO, Field.Index.ANALYZED));
 
         // store an abbreviated version of the entry text, but don't index
-        doc.add(Field.UnIndexed(FieldConstants.CONTENT_STORED, 
-            Utilities.truncateNicely(Utilities.removeHTML(data.getText()), 240, 260, "...")));
-
-        doc.add(Field.Keyword(FieldConstants.UPDATED, data.getUpdateTime()
-                .toString()));
-        doc.add(Field.Keyword(FieldConstants.PUBLISHED, data.getPubTime()
-                .toString()));
+        // unindexed
+        doc.add(new Field(FieldConstants.CONTENT_STORED,
+                Utilities.truncateNicely(Utilities.removeHTML(data.getText()), 240, 260, "..."),
+                Field.Store.YES, Field.Index.NO));
+
+        // keyword
+        doc.add(new Field(FieldConstants.UPDATED,
+                data.getUpdateTime().toString(),
+                Field.Store.YES, Field.Index.NOT_ANALYZED));
+
+        // keyword
+        doc.add(new Field(FieldConstants.PUBLISHED,
+                data.getPubTime().toString(),
+                Field.Store.YES, Field.Index.NOT_ANALYZED));
 
         // index Comments
-        doc.add(Field.UnStored(FieldConstants.C_CONTENT, commentContent));
-        doc.add(Field.UnStored(FieldConstants.C_EMAIL, commentEmail));
-        doc.add(Field.UnStored(FieldConstants.C_NAME, commentName));
-
-        doc.add(Field.UnStored(FieldConstants.CONSTANT, FieldConstants.CONSTANT_V));
+        // unstored
+        doc.add(new Field(FieldConstants.C_CONTENT,
+                commentContent,
+                Field.Store.NO, Field.Index.ANALYZED));
+        // unstored
+        doc.add(new Field(FieldConstants.C_EMAIL,
+                commentEmail,
+                Field.Store.NO, Field.Index.ANALYZED));
+        // unstored
+        doc.add(new Field(FieldConstants.C_NAME,
+                commentName,
+                Field.Store.NO, Field.Index.ANALYZED));
+
+        // unstored
+        doc.add(new Field(FieldConstants.CONSTANT,
+                FieldConstants.CONSTANT_V,
+                Field.Store.NO, Field.Index.ANALYZED));
 
         // index Category
         WeblogCategory categorydata = data.getCategory();
-        Field category = (categorydata == null) 
-           ? Field.UnStored(FieldConstants.CATEGORY, "") 
-           : Field.Text(FieldConstants.CATEGORY, categorydata.getName());
+        Field category = (categorydata == null)
+                // unstored
+                ? new Field(FieldConstants.CATEGORY, "", Field.Store.NO, Field.Index.ANALYZED)
+                // text
+                : new Field(FieldConstants.CATEGORY, categorydata.getName(), Field.Store.YES, Field.Index.ANALYZED);
         doc.add(category);
 
         return doc;

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java Sat Oct 10 15:44:10 2009
@@ -78,7 +78,7 @@
         try {
             if (reader != null) {
                 Term term = new Term(FieldConstants.ID, data.getId());
-                reader.delete(term);
+                reader.deleteDocuments(term);
             }
         } catch (IOException e) {
             mLogger.error("Error deleting doc from index", e);

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java Sat Oct 10 15:44:10 2009
@@ -34,12 +34,13 @@
     
     public final void run() {
         try {
-            manager.getReadWriteLock().readLock().acquire();
+            manager.getReadWriteLock().readLock().lock();
             doRun();
-        } catch (InterruptedException e) {
+
+        } catch (Exception e) {
             mLogger.info("Error acquiring read lock on index", e);
         } finally {
-            manager.getReadWriteLock().readLock().release();
+            manager.getReadWriteLock().readLock().unlock();
         }
     }
     

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java Sat Oct 10 15:44:10 2009
@@ -96,12 +96,12 @@
                             FieldConstants.WEBSITE_HANDLE, website.getHandle());
                 }
                 if (tWebsite != null) {
-                    reader.delete(tWebsite);
+                    reader.deleteDocuments(tWebsite);
                 } else {
                     Term all =
                             IndexUtil.getTerm(FieldConstants.CONSTANT,
                             FieldConstants.CONSTANT_V);
-                    reader.delete(all);
+                    reader.deleteDocuments(all);
                 }
             }
         } catch (IOException e) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java Sat Oct 10 15:44:10 2009
@@ -75,7 +75,7 @@
         try {
             if (reader != null) {
                 Term term = new Term(FieldConstants.ID, data.getId());
-                reader.delete(term);
+                reader.deleteDocuments(term);
             }
         } catch (IOException e) {
             mLogger.error("Error deleting doc from index", e);

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java Sat Oct 10 15:44:10 2009
@@ -27,7 +27,6 @@
 import org.apache.lucene.index.Term;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.business.search.IndexManagerImpl;
 import org.apache.roller.weblogger.business.search.FieldConstants;
 import org.apache.roller.weblogger.business.search.IndexUtil;
@@ -88,7 +87,7 @@
                         IndexUtil.getTerm(FieldConstants.WEBSITE_HANDLE, handle);
                 
                 if (tHandle != null) {
-                    reader.delete(tHandle);
+                    reader.deleteDocuments(tHandle);
                 }
             }
         } catch (IOException e) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java Sat Oct 10 15:44:10 2009
@@ -27,6 +27,7 @@
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queryParser.MultiFieldQueryParser;
 import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Hits;
 import org.apache.lucene.search.IndexSearcher;
@@ -34,6 +35,7 @@
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.util.Version;
 import org.apache.roller.weblogger.business.search.IndexManagerImpl;
 import org.apache.roller.weblogger.business.search.FieldConstants;
 import org.apache.roller.weblogger.business.search.IndexUtil;
@@ -45,6 +47,7 @@
  * @author Mindaugas Idzelis (min@idzelis.com)
  */
 public class SearchOperation extends ReadFromIndexOperation {
+
     //~ Static fields/initializers =============================================
     
     private static Log mLogger =
@@ -93,34 +96,40 @@
         try {
             IndexReader reader = manager.getSharedIndexReader();
             searcher = new IndexSearcher(reader);
-            
-            Query query =
-                    MultiFieldQueryParser.parse(
-                    term, SEARCH_FIELDS, new StandardAnalyzer());
+
+            String[] terms = new String[1];
+            terms[0] = term;
+
+            BooleanClause.Occur[] flags = new BooleanClause.Occur[1];
+            flags[1] = BooleanClause.Occur.MUST;
+            Query query = MultiFieldQueryParser.parse(terms,
+                SEARCH_FIELDS, flags, new StandardAnalyzer(Version.LUCENE_CURRENT));
             
             Term tUsername =
-                    IndexUtil.getTerm(FieldConstants.WEBSITE_HANDLE, websiteHandle);
+                IndexUtil.getTerm(FieldConstants.WEBSITE_HANDLE, websiteHandle);
             
             if (tUsername != null) {
                 BooleanQuery bQuery = new BooleanQuery();
-                bQuery.add(query, true, false);
-                bQuery.add(new TermQuery(tUsername), true, false);
+                bQuery.add(query, BooleanClause.Occur.MUST);
+                bQuery.add(new TermQuery(tUsername), BooleanClause.Occur.MUST);
                 query = bQuery;
             }
             
             Term tCategory =
-                    IndexUtil.getTerm(FieldConstants.CATEGORY, category);
+                IndexUtil.getTerm(FieldConstants.CATEGORY, category);
             
             if (tCategory != null) {
                 BooleanQuery bQuery = new BooleanQuery();
-                bQuery.add(query, true, false);
-                bQuery.add(new TermQuery(tCategory), true, false);
+                bQuery.add(query, BooleanClause.Occur.MUST);
+                bQuery.add(new TermQuery(tCategory), BooleanClause.Occur.MUST);
                 query = bQuery;
             }
             searchresults = searcher.search(query, null/*Filter*/, SORTER);
+
         } catch (IOException e) {
             mLogger.error("Error searching index", e);
             parseError = e.getMessage();
+
         } catch (ParseException e) {
             // who cares?
             parseError = e.getMessage();

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/WriteToIndexOperation.java Sat Oct 10 15:44:10 2009
@@ -37,14 +37,16 @@
     
     public void run() {
         try {
-            manager.getReadWriteLock().writeLock().acquire();
+            manager.getReadWriteLock().writeLock().lock();
             mLogger.debug("Starting search index operation");
             doRun();
             mLogger.debug("Search index operation complete");
-        } catch (InterruptedException e) {
+
+        } catch (Exception e) {
             mLogger.error("Error acquiring write lock on index", e);
+            
         } finally {
-            manager.getReadWriteLock().writeLock().release();
+            manager.getReadWriteLock().writeLock().unlock();
         }
         manager.resetSharedReader();
     }

Modified: roller/trunk/apps/weblogger/testdata/WEB-INF/classes/commons-logging.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/testdata/WEB-INF/classes/commons-logging.properties?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/testdata/WEB-INF/classes/commons-logging.properties (original)
+++ roller/trunk/apps/weblogger/testdata/WEB-INF/classes/commons-logging.properties Sat Oct 10 15:44:10 2009
@@ -1 +1,2 @@
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
\ No newline at end of file
+org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
\ No newline at end of file

Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties Sat Oct 10 15:44:10 2009
@@ -1004,7 +1004,7 @@
 click the button to create your new weblog entry.
 mediaFileSuccess.noEnclosure=No enclosure
 mediaFileSuccess.selectEnclosure=You can select one file (or none) to be \
-included in the weblog entry as an RSS/Atom enclosure (i.e. as a podcast):
+included in the weblog entry as an RSS/Atom enclosure (i.e. as a podcast): \
 mediaFileSuccess.selectImages=Select the the images that you would like to \
 include in your new weblog entry:
 
@@ -1027,7 +1027,7 @@
 mediaFileEdit.pagetip=You may edit the informaton stored about this media \
 file. Each file must have a name, but all other fields are optional. \
 Or you can use the links at the bottom of the page to create a new weblog \
-entr that includes this file.
+entry that includes this file.
 mediaFileEdit.fileLocation=File Location
 mediaFileEdit.name=Name
 mediaFileEdit.description=Description

Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/commons-logging.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/commons-logging.properties?rev=823874&r1=823873&r2=823874&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/commons-logging.properties (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/commons-logging.properties Sat Oct 10 15:44:10 2009
@@ -14,4 +14,5 @@
 # copyright in this work, please see the NOTICE file in the top level
 # directory of this distribution.
 
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl
\ No newline at end of file
+org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger

Added: roller/trunk/tools/lib/commons-codec-1.4.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/commons-codec-1.4.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/commons-codec-1.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/commons-collections-3.2.1.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/commons-collections-3.2.1.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/commons-collections-3.2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/commons-digester-2.0.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/commons-digester-2.0.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/commons-digester-2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/commons-httpclient-3.1.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/commons-httpclient-3.1.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/commons-httpclient-3.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/commons-lang-2.4.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/commons-lang-2.4.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/commons-lang-2.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/commons-logging-1.1.1.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/commons-logging-1.1.1.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/commons-logging-1.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/guice-2.0.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/guice-2.0.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/guice-2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/jaxen-1.1.1.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/jaxen-1.1.1.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/jaxen-1.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/jdom-1.1.1.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/jdom-1.1.1.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/jdom-1.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/log4j-1.2.12.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/log4j-1.2.12.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/log4j-1.2.12.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/lucene-core-2.9.0.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/lucene-core-2.9.0.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/lucene-core-2.9.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/saxpath-1.0.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/saxpath-1.0.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/saxpath-1.0.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: roller/trunk/tools/lib/saxpath-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/taglibs-string-1.1.0.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/taglibs-string-1.1.0.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/taglibs-string-1.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/velocity-1.6.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/velocity-1.6.2.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/velocity-1.6.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: roller/trunk/tools/openjpa-1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 10 15:44:10 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/tools/openjpa-1.2.1:713070-782269

Added: roller/trunk/tools/spring-2.5/ehcache-1.6.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/spring-2.5/ehcache-1.6.2.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/spring-2.5/ehcache-1.6.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/spring-2.5/spring-2.5.6.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/spring-2.5/spring-2.5.6.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/spring-2.5/spring-2.5.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/spring-2.5/spring-ldap-1.3.0.RELEASE-all.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/spring-2.5/spring-ldap-1.3.0.RELEASE-all.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/spring-2.5/spring-ldap-1.3.0.RELEASE-all.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: roller/trunk/tools/spring-2.5/spring-ldap-1.3.0.RELEASE-all.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/spring-2.5/spring-security-acl-2.0.5.RELEASE.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/spring-2.5/spring-security-acl-2.0.5.RELEASE.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/spring-2.5/spring-security-acl-2.0.5.RELEASE.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/spring-2.5/spring-security-core-2.0.5.RELEASE.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/spring-2.5/spring-security-core-2.0.5.RELEASE.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/spring-2.5/spring-security-core-2.0.5.RELEASE.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/spring-2.5/spring-security-openid-2.0.5.RELEASE.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/spring-2.5/spring-security-openid-2.0.5.RELEASE.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/spring-2.5/spring-security-openid-2.0.5.RELEASE.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/spring-2.5/spring-security-taglibs-2.0.5.RELEASE.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/spring-2.5/spring-security-taglibs-2.0.5.RELEASE.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/spring-2.5/spring-security-taglibs-2.0.5.RELEASE.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/spring-2.5/spring-web-2.5.6.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/spring-2.5/spring-web-2.5.6.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/spring-2.5/spring-web-2.5.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: roller/trunk/tools/struts-2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 10 15:44:10 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/tools/struts-2.1.6:713070-782269

Added: roller/trunk/tools/struts-2.1/lib/freemarker-2.3.15.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1/lib/freemarker-2.3.15.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1/lib/freemarker-2.3.15.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1/lib/ognl-2.7.3.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1/lib/ognl-2.7.3.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1/lib/ognl-2.7.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1/lib/struts2-core-2.1.8.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1/lib/struts2-core-2.1.8.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1/lib/struts2-core-2.1.8.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1/lib/struts2-spring-plugin-2.1.8.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1/lib/struts2-spring-plugin-2.1.8.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1/lib/struts2-spring-plugin-2.1.8.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1/lib/struts2-tiles-plugin-2.1.8.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1/lib/struts2-tiles-plugin-2.1.8.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1/lib/struts2-tiles-plugin-2.1.8.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1/lib/xwork-core-2.1.6.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1/lib/xwork-core-2.1.6.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1/lib/xwork-core-2.1.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: roller/trunk/tools/xmlrpc-3.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 10 15:44:10 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/tools/xmlrpc-3.0:713070-782269

Added: roller/trunk/tools/xmlrpc-3.1/lib/ws-commons-util-1.0.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/xmlrpc-3.1/lib/ws-commons-util-1.0.2.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/xmlrpc-3.1/lib/ws-commons-util-1.0.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-client-3.1.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-client-3.1.2.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-client-3.1.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-common-3.1.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-common-3.1.2.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-common-3.1.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-server-3.1.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-server-3.1.2.jar?rev=823874&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/xmlrpc-3.1/lib/xmlrpc-server-3.1.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message