Author: metskem
Date: Thu Aug 18 19:16:02 2016
New Revision: 1756839
URL: http://svn.apache.org/viewvc?rev=1756839&view=rev
Log:
* 2.10.3-svn-13
* Fixed JSPWIKI-1029 WebLogic does not find the properties file, fix by
Jürgen Weber.
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
Modified: jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1756839&r1=1756838&r2=1756839&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Thu Aug 18 19:16:02 2016
@@ -1,5 +1,11 @@
2016-08-18 Harry Metske (mets...@apache.org)
+ * 2.10.3-svn-13
+
+ * Fixed JSPWIKI-1029 WebLogic does not find the properties file, fix by
Jürgen Weber.
+
+2016-08-18 Harry Metske (mets...@apache.org)
+
* 2.10.3-svn-12
* Fixed JSPWIKI-396 UTF-8 characters in wiki pages incorrectly rendered
if served by Weblogic
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1756839&r1=1756838&r2=1756839&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Thu
Aug 18 19:16:02 2016
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "12";
+ public static final String BUILD = "13";
/**
* This is the generic version string you should use when printing out
the version. It is of
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java?rev=1756839&r1=1756838&r2=1756839&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
Thu Aug 18 19:16:02 2016
@@ -628,6 +628,7 @@ public class AuthenticationManager {
}
+
// Ok, the absolute path didn't work; try other methods
URL path = null;
@@ -638,6 +639,12 @@ public class AuthenticationManager {
InputStream is = null;
try
{
+ URL url = engine.getServletContext().getResource("/WEB-INF/" +
name);
+ if (url != null)
+ {
+ return url;
+ }
+
log.info( "looking for /" + name + " on classpath" );
// create a tmp file of the policy loaded as an InputStream
and return the URL to it
//
