jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject jspwiki git commit: 2017-03-03 Harry Metske (metskem@apache.org)
Date Fri, 03 Mar 2017 18:54:51 GMT
Repository: jspwiki
Updated Branches:
  refs/heads/master 3dcd27654 -> ea5a5b767


2017-03-03  Harry Metske (metskem@apache.org)

       * 2.10.3-git-33.

       * Fixed JSPWIKI-1051 - Startup fails due to jspwiki.log (Permission denied)


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/ea5a5b76
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/ea5a5b76
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/ea5a5b76

Branch: refs/heads/master
Commit: ea5a5b7674aaa0474d31cff803cb6962ddde3d05
Parents: 3dcd276
Author: Harry Metske <harry.metske@gmail.com>
Authored: Fri Mar 3 19:54:34 2017 +0100
Committer: Harry Metske <harry.metske@gmail.com>
Committed: Fri Mar 3 19:54:34 2017 +0100

----------------------------------------------------------------------
 ChangeLog                                       |   6 +
 .../src/main/java/org/apache/wiki/Release.java  |   2 +-
 .../main/java/org/apache/wiki/ui/Installer.java |  11 +-
 .../src/main/resources/ini/jspwiki.properties   |  23 ++-
 jspwiki-war/src/main/webapp/Install.jsp         |   9 +-
 .../src/test/resources/ini/jspwiki.properties   | 147 +++++++++++++++++++
 6 files changed, 172 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/ea5a5b76/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 7663058..06f4c6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-03  Harry Metske (metskem@apache.org)
+
+       * 2.10.3-git-33.
+
+       * Fixed JSPWIKI-1051 - Startup fails due to jspwiki.log (Permission denied)
+
 2017-02-04  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.10.3-git-32

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/ea5a5b76/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 942e2f8..b366fd4 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "32";
+    public static final String     BUILD         = "33";
 
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/ea5a5b76/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java b/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
index f236feb..1560868 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
@@ -61,7 +61,6 @@ public class Installer
     public static final String INSTALL_WARNING = "Installer.Warning";
     public static final String APP_NAME = WikiEngine.PROP_APPNAME;
     public static final String STORAGE_DIR = BasicAttachmentProvider.PROP_STORAGEDIR;
-    public static final String LOG_FILE = "log4j.appender.FileLog.File";
     public static final String PAGE_DIR = FileSystemProvider.PROP_PAGEDIR;
     public static final String WORK_DIR = WikiEngine.PROP_WORKDIR;
     public static final String ADMIN_GROUP = "Admin";
@@ -209,12 +208,7 @@ public class Installer
         nullValue = m_props.getProperty( PAGE_DIR, rb.getString( "install.installer.default.pagedir"
) );
         parseProperty( PAGE_DIR, nullValue );
         sanitizePath( PAGE_DIR );
-        
-        // Get/sanitize log directory
-        nullValue = m_props.getProperty( LOG_FILE, TMP_DIR + File.separator + "jspwiki.log"
);
-        parseProperty( LOG_FILE, nullValue );
-        sanitizePath( LOG_FILE );
-        
+
         // Get/sanitize work directory
         nullValue = m_props.getProperty( WORK_DIR, TMP_DIR );
         parseProperty( WORK_DIR, nullValue );
@@ -261,8 +255,7 @@ public class Installer
         validateNotNull( PAGE_DIR, rb.getString( "install.installer.validate.pagedir" ) );
         validateNotNull( APP_NAME, rb.getString( "install.installer.validate.appname" ) );
         validateNotNull( WORK_DIR, rb.getString( "install.installer.validate.workdir" ) );
-        validateNotNull( LOG_FILE, rb.getString( "install.installer.validate.logfile" ) );
-        
+
         if ( m_session.getMessages( INSTALL_ERROR ).length == 0 )
         {
             m_validated = true;

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/ea5a5b76/jspwiki-war/src/main/resources/ini/jspwiki.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/ini/jspwiki.properties b/jspwiki-war/src/main/resources/ini/jspwiki.properties
index e6dac87..1228a10 100644
--- a/jspwiki-war/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-war/src/main/resources/ini/jspwiki.properties
@@ -872,12 +872,19 @@ jspwiki.use.external.logconfig = false
 #  Log everything into a file, roll it over every 10 MB, keep
 #  only 14 latest ones.
 #
-log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
-log4j.appender.FileLog.MaxFileSize    = 10MB
-log4j.appender.FileLog.MaxBackupIndex = 14
-log4j.appender.FileLog.File = jspwiki.log
-log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
-log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
+#log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
+#log4j.appender.FileLog.MaxFileSize    = 10MB
+#log4j.appender.FileLog.MaxBackupIndex = 14
+#log4j.appender.FileLog.File = jspwiki.log
+#log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
+#   log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
+
+#
+# Log everything to stdout
+#
+log4j.appender.ConsoleLog = org.apache.log4j.ConsoleAppender
+log4j.appender.ConsoleLog.layout = org.apache.log4j.PatternLayout
+log4j.appender.ConsoleLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
 
 #
 # If you want to use some other logging system (such as JBoss, which uses
@@ -885,10 +892,10 @@ log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
 # at all, you can set it to be empty.  However, I suggest that you do
 # at least to a level of WARN.
 #
-log4j.rootCategory=INFO,FileLog
+log4j.rootCategory=INFO,ConsoleLog
 
 # Enable if you're using mailing, above.
-#log4j.rootCategory=INFO,FileLog,mail
+#log4j.rootCategory=INFO,ConsoleLog,mail
 
 #
 # Uncomment these lines if you want to see detailed security event logging.

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/ea5a5b76/jspwiki-war/src/main/webapp/Install.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/Install.jsp b/jspwiki-war/src/main/webapp/Install.jsp
index 050b787..d9bf17c 100644
--- a/jspwiki-war/src/main/webapp/Install.jsp
+++ b/jspwiki-war/src/main/webapp/Install.jsp
@@ -108,7 +108,7 @@ if ( !installer.adminExists() )
 
 <form action="Install.jsp" method="post">
 
-  <!-- Page and log directories -->
+  <!-- Page directory -->
   <h3><fmt:message key="install.jsp.basics.title" /></h3>
 
     <label class="control-label" ><fmt:message key="install.jsp.basics.appname.label"
/>
@@ -156,13 +156,6 @@ if ( !installer.adminExists() )
 
   <h3><fmt:message key="install.jsp.adv.settings.title" /></h3>
 
-    <label class="control-label" ><fmt:message key="install.jsp.adv.settings.logfile.label"
/>
-    <input class="form-control" type="text" name="<%=Installer.LOG_FILE%>" value="<%=installer.getProperty(
Installer.LOG_FILE )%>" size="40"/>
-    </label>
-    <div class="help-block">
-      <fmt:message key="install.jsp.adv.settings.logfile.desc" />
-    </div> <br/>
-
     <label class="control-label" ><fmt:message key="install.jsp.adv.settings.workdir.label"
/>
     <input class="form-control" type="text" name="<%=Installer.WORK_DIR%>" size="40"
value="<%=installer.getProperty( Installer.WORK_DIR )%>"/>
     </label>

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/ea5a5b76/jspwiki-war/src/test/resources/ini/jspwiki.properties
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/test/resources/ini/jspwiki.properties b/jspwiki-war/src/test/resources/ini/jspwiki.properties
new file mode 100644
index 0000000..a45cf7b
--- /dev/null
+++ b/jspwiki-war/src/test/resources/ini/jspwiki.properties
@@ -0,0 +1,147 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  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.
+#
+jspwiki.applicationName = JSPWiki
+jspwiki.pageProvider = FileSystemProvider
+jspwiki.usePageCache = true
+jspwiki.attachmentProvider = BasicAttachmentProvider
+jspwiki.diffProvider = TraditionalDiffProvider
+jspwiki.encoding = UTF-8
+jspwiki.translatorReader.allowHTML = false
+jspwiki.breakTitleWithSpaces = false
+jspwiki.translatorReader.matchEnglishPlurals = true
+jspwiki.translatorReader.camelCaseLinks = false
+jspwiki.templateDir = default
+jspwiki.translatorReader.useOutlinkImage = true
+jspwiki.lockExpiryTime = 60
+jspwiki.searchProvider = LuceneSearchProvider
+jspwiki.specialPage.CreateGroup = NewGroup.jsp
+jspwiki.specialPage.Search = Search.jsp
+jspwiki.specialPage.Login = Login.jsp
+jspwiki.specialPage.NewGroup = NewGroup.jsp
+jspwiki.specialPage.UserPreferences = UserPreferences.jsp
+jspwiki.specialPage.Workflow = Workflow.jsp
+jspwiki.specialPage.Logout = Logout.jsp
+jspwiki.specialPage.CreateProfile = Login.jsp
+jspwiki.specialPage.EditProfile = UserPreferences.jsp
+jspwiki.specialPage.Preferences = UserPreferences.jsp
+jspwiki.specialPage.FindPage = FindPage.jsp
+jspwiki.plugin.searchPath =
+jspwiki.plugin.externalJars =
+jspwiki.renderingManager.markupParser=org.apache.wiki.parser.JSPWikiMarkupParser
+jspwiki.loginModule.class = org.apache.wiki.auth.login.UserDatabaseLoginModule
+jspwiki.login.throttling=true
+jspwiki.authorizer = org.apache.wiki.auth.authorize.WebContainerAuthorizer
+jspwiki.groupdatabase = org.apache.wiki.auth.authorize.XMLGroupDatabase
+jspwiki.userdatabase = org.apache.wiki.auth.user.XMLUserDatabase
+jspwiki.aclManager = org.apache.wiki.auth.acl.DefaultAclManager
+jspwiki.interWikiRef.JSPWiki = http://jspwiki-wiki.apache.org/Wiki.jsp?page=%s
+jspwiki.interWikiRef.Edit = Edit.jsp?page=%s
+jspwiki.interWikiRef.Raw = Wiki.jsp?page=%s&skin=raw
+jspwiki.interWikiRef.Reader = Wiki.jsp?page=%s&skin=reader
+jspwiki.interWikiRef.WikiWikiWeb = http://c2.com/cgi/wiki?%s
+jspwiki.interWikiRef.TWiki = http://twiki.org/cgi-bin/view/TWiki/%s
+jspwiki.interWikiRef.MeatballWiki = http://usemod.com/cgi-bin/mb.pl?%s
+jspwiki.interWikiRef.Wikipedia = http://www.wikipedia.com/wiki/%s
+jspwiki.interWikiRef.Google = http://www.google.com/search?q=%s
+jspwiki.interWikiRef.Doc = http://jspwiki-wiki.apache.org/Wiki.jsp?page=%s
+jspwiki.interWikiRef.JIRA = https://issues.apache.org/jira/browse/JSPWIKI-%s
+jspwiki.rss.generate = false
+jspwiki.rss.fileName = rss.rdf
+jspwiki.rss.interval = 3600
+jspwiki.rss.channelDescription = Oh poor me, my owner has not set \
+                                 a channel description at all. \
+                                 Pity me.
+
+jspwiki.rss.channelLanguage = en-us
+jspwiki.userdatabase.datasource=jdbc/UserDatabase
+jspwiki.userdatabase.table=users
+jspwiki.userdatabase.uid=uid
+jspwiki.userdatabase.email=email
+jspwiki.userdatabase.fullName=full_name
+jspwiki.userdatabase.loginName=login_name
+jspwiki.userdatabase.password=password
+jspwiki.userdatabase.wikiName=wiki_name
+jspwiki.userdatabase.created=created
+jspwiki.userdatabase.modified=modified
+jspwiki.userdatabase.lockExpiry=lock_expiry
+jspwiki.userdatabase.attributes=attributes
+jspwiki.userdatabase.roleTable=roles
+jspwiki.userdatabase.role=role
+jspwiki.groupdatabase.datasource=jdbc/GroupDatabase
+jspwiki.groupdatabase.table=groups
+jspwiki.groupdatabase.membertable=group_members
+jspwiki.groupdatabase.created=created
+jspwiki.groupdatabase.creator=creator
+jspwiki.groupdatabase.name=name
+jspwiki.groupdatabase.member=member
+jspwiki.groupdatabase.modified=modified
+jspwiki.groupdatabase.modifier=modifier
+mail.from = JSPWiki <JSPWiki@localhost>
+mail.smtp.host = 127.0.0.1
+mail.smtp.port = 25
+jspwiki.use.external.logconfig = false
+log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
+log4j.appender.FileLog.MaxFileSize    = 10MB
+log4j.appender.FileLog.MaxBackupIndex = 14
+log4j.appender.FileLog.File = jspwiki.log
+log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
+log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
+log4j.rootCategory=ERROR,FileLog
+jspwiki.defaultprefs.template.skinname =PlainVanilla
+jspwiki.defaultprefs.template.dateformat =dd-MMM-yyyy HH:mm
+jspwiki.defaultprefs.template.orientation =fav-left
+jspwiki.defaultprefs.template.sidebar =active
+jspwiki.defaultprefs.template.layout =fluid
+jspwiki.defaultprefs.template.editor =plain
+jspwiki.defaultprefs.timeformat.01=d/MM
+jspwiki.defaultprefs.timeformat.02=d/MM/yy
+jspwiki.defaultprefs.timeformat.03=d/MM/yyyy
+jspwiki.defaultprefs.timeformat.04=dd/MM/yy
+jspwiki.defaultprefs.timeformat.05=dd/MM/yyyy
+jspwiki.defaultprefs.timeformat.06=EEE, dd/MM/yyyy
+jspwiki.defaultprefs.timeformat.07=EEE, dd/MM/yyyy, Z
+jspwiki.defaultprefs.timeformat.08=EEE, dd/MM/yyyy, zzzz
+jspwiki.defaultprefs.timeformat.09=d/MM/yy HH:mm
+jspwiki.defaultprefs.timeformat.10=d/MM/yy hh:mm a
+jspwiki.defaultprefs.timeformat.11=d/MM/yy hh:mm a, Z
+jspwiki.defaultprefs.timeformat.12=dd-MMM
+jspwiki.defaultprefs.timeformat.13=dd-MMM-yy
+jspwiki.defaultprefs.timeformat.14=dd-MMM-yyyy
+jspwiki.defaultprefs.timeformat.15=EEE, dd-MMM-yyyy
+jspwiki.defaultprefs.timeformat.16=EEE, dd-MMM-yyyy, Z
+jspwiki.defaultprefs.timeformat.17=EEE, dd-MMM-yyyy, zzzz
+jspwiki.defaultprefs.timeformat.18=dd-MMM-yyyy HH:mm
+jspwiki.defaultprefs.timeformat.19=dd-MMM-yyyy hh:mm a
+jspwiki.defaultprefs.timeformat.20=dd-MMM-yyyy hh:mm a, Z
+jspwiki.defaultprefs.timeformat.21=MMMM dd, yyyy
+jspwiki.defaultprefs.timeformat.22=MMMM dd, yyyy HH:mm
+jspwiki.defaultprefs.timeformat.23=MMMM dd, yyyy hh:mm a
+jspwiki.defaultprefs.timeformat.24=MMMM, EEE dd,yyyy hh:mm a
+jspwiki.defaultprefs.timeformat.25=MMMM, EEEE dd,yyyy hh:mm a
+jspwiki.defaultprefs.timeformat.26=dd.MM.yyyy
+jspwiki.defaultprefs.timeformat.27=dd.MM.yyyy, HH:mm
+jspwiki.defaultprefs.timeformat.28=dd.MM.yyyy, HH:mm zz
+jspwiki.defaultprefs.timeformat.29=EEEE, dd.MM.yyyy
+jspwiki.defaultprefs.timeformat.30=EE, dd.MM.yyyy, HH:mm zz
+jspwiki.defaultprefs.timeformat.31=EEEE, d. MMMM yyyy, HH:mm zz
+jspwiki.defaultprefs.timeformat.32=yyyy-MM-dd, HH:mm zz
+jspwiki.defaultprefs.timeformat.33=yyyy-MM-dd, EEEE
+jspwiki.defaultprefs.timeformat.34=d.M.yyyy
+jspwiki.defaultprefs.timeformat.35=d.M.yyyy H:mm
+jspwiki.defaultprefs.timeformat.36=yyyy-MM-dd HH:mm:ss
+jspwiki.defaultprefs.timeformat.37=yyyyMMdd'T'HHmmss


Mime
View raw message