jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1553576 - in /jspwiki/trunk/jspwiki-war/src: main/config/doc/ main/java/org/apache/wiki/ main/java/org/apache/wiki/preferences/ main/java/org/apache/wiki/ui/ main/java/org/apache/wiki/util/ test/java/org/apache/wiki/ test/java/org/apache/w...
Date Thu, 26 Dec 2013 20:20:43 GMT
Author: juanpablo
Date: Thu Dec 26 20:20:43 2013
New Revision: 1553576

URL: http://svn.apache.org/r1553576
Log:
o.a.w.PropertyReader moved to o.a.w.util.PropertyReader, as it is an utility class

Added:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/PropertyReader.java
      - copied, changed from r1553572, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java
Removed:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java
Modified:
    jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/AllTests.java

Modified: jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt?rev=1553576&r1=1553575&r2=1553576&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt (original)
+++ jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt Thu Dec 26 20:20:43 2013
@@ -66,6 +66,9 @@ org.apache.wiki.PageManager
 org.apache.wiki.PageTimeComparator
  -> moved to org.apache.wiki.util.comparators package
 
+org.apache.wiki.PropertyReader
+ -> moved to org.apache.wiki.util.PropertyReader
+
 org.apache.wiki.QueryItem 
  -> moved to org.apache.wiki.search package
 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java?rev=1553576&r1=1553575&r2=1553576&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java Thu Dec 26 20:20:43
2013
@@ -83,6 +83,7 @@ import org.apache.wiki.ui.TemplateManage
 import org.apache.wiki.ui.progress.ProgressManager;
 import org.apache.wiki.url.URLConstructor;
 import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.PropertyReader;
 import org.apache.wiki.util.TextUtil;
 import org.apache.wiki.util.comparators.PageTimeComparator;
 import org.apache.wiki.workflow.Decision;

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java?rev=1553576&r1=1553575&r2=1553576&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java Thu
Dec 26 20:20:43 2013
@@ -30,10 +30,10 @@ import javax.servlet.jsp.PageContext;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.wiki.InternalWikiException;
-import org.apache.wiki.PropertyReader;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.i18n.InternationalizationManager;
 import org.apache.wiki.util.HttpUtil;
+import org.apache.wiki.util.PropertyReader;
 import org.apache.wiki.util.TextUtil;
 import org.json.JSONObject;
 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java?rev=1553576&r1=1553575&r2=1553576&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java Thu Dec 26 20:20:43
2013
@@ -28,7 +28,6 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.wiki.PageManager;
-import org.apache.wiki.PropertyReader;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiSession;
 import org.apache.wiki.auth.*;
@@ -40,6 +39,7 @@ import org.apache.wiki.i18n.Internationa
 import org.apache.wiki.providers.BasicAttachmentProvider;
 import org.apache.wiki.providers.FileSystemProvider;
 import org.apache.wiki.util.CommentedProperties;
+import org.apache.wiki.util.PropertyReader;
 import org.apache.wiki.util.TextUtil;
 
 /**

Copied: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/PropertyReader.java (from
r1553572, jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java)
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/PropertyReader.java?p2=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/PropertyReader.java&p1=jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java&r1=1553572&r2=1553576&rev=1553576&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/PropertyReader.java Thu Dec
26 20:20:43 2013
@@ -16,7 +16,7 @@
     specific language governing permissions and limitations
     under the License.    
  */
-package org.apache.wiki;
+package org.apache.wiki.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,7 +32,7 @@ import javax.servlet.ServletContext;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
-import org.apache.wiki.util.TextUtil;
+import org.apache.wiki.Release;
 
 
 /**

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java?rev=1553576&r1=1553575&r2=1553576&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java Thu Dec 26 20:20:43
2013
@@ -54,7 +54,6 @@ public class AllTests extends TestCase
 
         suite.addTest( PageManagerTest.suite() );
         suite.addTest( PageSorterTest.suite() );
-        suite.addTest( PropertyReaderTest.suite() );
         suite.addTest( ReferenceManagerTest.suite() );
         suite.addTest( ReleaseTest.suite() );
         suite.addTest( VariableManagerTest.suite() );

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java?rev=1553576&r1=1553575&r2=1553576&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java Thu Dec
26 20:20:43 2013
@@ -15,6 +15,8 @@ package org.apache.wiki;
 
 import java.util.Properties;
 
+import org.apache.wiki.util.PropertyReader;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java?rev=1553576&r1=1553575&r2=1553576&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java Thu Dec 26 20:20:43
2013
@@ -48,6 +48,7 @@ import org.apache.wiki.providers.Abstrac
 import org.apache.wiki.providers.BasicAttachmentProvider;
 import org.apache.wiki.providers.FileSystemProvider;
 import org.apache.wiki.util.FileUtil;
+import org.apache.wiki.util.PropertyReader;
 import org.apache.wiki.util.TextUtil;
 
 /**

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/AllTests.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/AllTests.java?rev=1553576&r1=1553575&r2=1553576&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/AllTests.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/AllTests.java Thu Dec 26
20:20:43 2013
@@ -18,6 +18,8 @@
  */
 package org.apache.wiki.util;
 
+import org.apache.wiki.PropertyReaderTest;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -39,6 +41,7 @@ public class AllTests extends TestCase {
         suite.addTest( org.apache.wiki.util.comparators.AllTests.suite() );
         suite.addTest( MailUtilTest.suite() );
         suite.addTest( PriorityListTest.suite() );
+        suite.addTest( PropertyReaderTest.suite() );
         suite.addTest( SerializerTest.suite() );
         suite.addTest( TextUtilTest.suite() );
         suite.addTest( TimedCounterListTest.suite() );



Mime
View raw message