use constant from AttachmentProvider
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
index 20fe69e..186f8d8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
@@ -83,9 +83,6 @@
private Engine m_engine;
private String m_storageDir;
- /** The property name for where the attachments should be stored. Value is <tt>{@value}</tt>. */
- public static final String PROP_STORAGEDIR = "jspwiki.basicAttachmentProvider.storageDir";
-
/*
* Disable client cache for files with patterns
* since 2.5.96
@@ -466,7 +463,7 @@
att.setAuthor( props.getProperty( version+".author" ) );
final String changeNote = props.getProperty( version+".changenote" );
if( changeNote != null ) {
- att.setAttribute( WikiPage.CHANGENOTE, changeNote );
+ att.setAttribute( Page.CHANGENOTE, changeNote );
}
final File f = findFile( dir, att );
@@ -569,7 +566,7 @@
// If it exists, we're overwriting an old page (this has already been confirmed at a higher level), so delete any existing attachments.
if( destDir.exists() ) {
- log.error( "Page rename failed because target dirctory " + destDir + " exists" );
+ log.error( "Page rename failed because target directory " + destDir + " exists" );
} else {
// destDir.getParentFile().mkdir();
srcDir.renameTo( destDir );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
index f6968d2..0c8b40a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
@@ -22,6 +22,7 @@
import org.apache.wiki.WikiSession;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Session;
+import org.apache.wiki.api.providers.AttachmentProvider;
import org.apache.wiki.auth.NoSuchPrincipalException;
import org.apache.wiki.auth.UserManager;
import org.apache.wiki.auth.WikiPrincipal;
@@ -32,7 +33,6 @@
import org.apache.wiki.auth.user.UserProfile;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.pages.PageManager;
-import org.apache.wiki.providers.BasicAttachmentProvider;
import org.apache.wiki.providers.FileSystemProvider;
import org.apache.wiki.util.TextUtil;
@@ -61,7 +61,7 @@
public static final String INSTALL_ERROR = "Installer.Error";
public static final String INSTALL_WARNING = "Installer.Warning";
public static final String APP_NAME = Engine.PROP_APPNAME;
- public static final String STORAGE_DIR = BasicAttachmentProvider.PROP_STORAGEDIR;
+ public static final String STORAGE_DIR = AttachmentProvider.PROP_STORAGEDIR;
public static final String PAGE_DIR = FileSystemProvider.PROP_PAGEDIR;
public static final String WORK_DIR = Engine.PROP_WORKDIR;
public static final String ADMIN_GROUP = "Admin";
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
index 6b70bc4..30e5c56 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
@@ -25,8 +25,8 @@
import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.core.Page;
+import org.apache.wiki.api.providers.AttachmentProvider;
import org.apache.wiki.api.providers.WikiProvider;
-import org.apache.wiki.providers.BasicAttachmentProvider;
import org.apache.wiki.providers.CachingProvider;
import org.apache.wiki.providers.FileSystemProvider;
import org.apache.wiki.providers.VerySimpleProvider;
@@ -113,7 +113,7 @@
final String files = engine.getWikiProperties().getProperty( FileSystemProvider.PROP_PAGEDIR );
final File saved = new File( files, NAME1+FileSystemProvider.FILE_EXT );
- final String atts = engine.getWikiProperties().getProperty( BasicAttachmentProvider.PROP_STORAGEDIR );
+ final String atts = engine.getWikiProperties().getProperty( AttachmentProvider.PROP_STORAGEDIR );
final File attfile = new File( atts, NAME1+"-att/TestAtt.txt-dir" );
Assertions.assertTrue( saved.exists(), "Didn't create it!" );
@@ -137,7 +137,7 @@
final String files = engine.getWikiProperties().getProperty( FileSystemProvider.PROP_PAGEDIR );
final File saved = new File( files, NAME1+FileSystemProvider.FILE_EXT );
- final String atts = engine.getWikiProperties().getProperty( BasicAttachmentProvider.PROP_STORAGEDIR );
+ final String atts = engine.getWikiProperties().getProperty( AttachmentProvider.PROP_STORAGEDIR );
final File attfile = new File( atts, NAME1+"-att/TestAtt.txt-dir" );
Assertions.assertTrue( saved.exists(), "Didn't create it!" );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java b/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
index 4becf60..e13cbf4 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
@@ -26,6 +26,7 @@
import org.apache.wiki.WikiPage;
import org.apache.wiki.api.exceptions.NoRequiredPropertyException;
import org.apache.wiki.api.exceptions.WikiException;
+import org.apache.wiki.api.providers.AttachmentProvider;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.providers.BasicAttachmentProvider;
@@ -2601,7 +2602,7 @@
}
finally
{
- final String files = testEngine.getWikiProperties().getProperty( BasicAttachmentProvider.PROP_STORAGEDIR );
+ final String files = testEngine.getWikiProperties().getProperty( AttachmentProvider.PROP_STORAGEDIR );
final File storagedir = new File( files, PAGE_NAME+BasicAttachmentProvider.DIR_EXTENSION );
if( storagedir.exists() && storagedir.isDirectory() ) {
