You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/08/23 14:04:28 UTC
svn commit: r806956 - in /incubator/jspwiki/trunk: ./
src/WebContent/WEB-INF/lib/ src/java/org/apache/wiki/
src/java/org/apache/wiki/content/
Author: metskem
Date: Sun Aug 23 12:04:27 2009
New Revision: 806956
URL: http://svn.apache.org/viewvc?rev=806956&view=rev
Log:
3.0.0-svn-145
* corrected propname in build.properties :
war.compile.jsps => compile.jsps
* added dummy SimpleCredentials login to ContentManager.newSession()
this is required since priha 0.1.25 (not sure if this is the
right place/approach but at least we can run our JUnit tests again,
although still many tests fail (92.15%))
* upgrade priha : 0.1.30 => 0.1.32
Added:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.1.32.jar (with props)
Removed:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.1.30.jar
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.properties
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=806956&r1=806955&r2=806956&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Aug 23 12:04:27 2009
@@ -1,3 +1,17 @@
+2009-08-22 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-145
+
+ * corrected propname in build.properties :
+ war.compile.jsps => compile.jsps
+
+ * added dummy SimpleCredentials login to ContentManager.newSession()
+ this is required since priha 0.1.25 (not sure if this is the
+ right place/approach but at least we can run our JUnit tests again,
+ although still many tests fail (92.15%))
+
+ * upgrade priha : 0.1.30 => 0.1.32
+
2009-08-19 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-144
Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=806956&r1=806955&r2=806956&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Sun Aug 23 12:04:27 2009
@@ -46,7 +46,7 @@
# Set this property to 'true' if you want to build WARs
# that contain pre-compiled JSPs (which load faster).
-war.compile.jsps = true
+compile.jsps = true
# Enable these if you wish to create a static content tarball
# for use with Apache or another front-end web server.
Added: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.1.32.jar
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.1.32.jar?rev=806956&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.1.32.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=806956&r1=806955&r2=806956&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Aug 23 12:04:27 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "144";
+ public static final String BUILD = "145";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java?rev=806956&r1=806955&r2=806956&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java Sun Aug 23 12:04:27 2009
@@ -1703,8 +1703,8 @@
*/
public Session newSession() throws LoginException, RepositoryException
{
- Session session = m_repository.login(m_workspaceName);
-
+ Session session = m_repository.login( new SimpleCredentials( "jspwikiUser", "passwordDoesNotMatter".toCharArray() ),
+ m_workspaceName );
return session;
}
Re: svn commit: r806956 - in /incubator/jspwiki/trunk: ./
src/WebContent/WEB-INF/lib/ src/java/org/apache/wiki/
src/java/org/apache/wiki/content/
Posted by Janne Jalkanen <ja...@iki.fi>.
SimpleCredentials are just the credentials which are passed to
Session.login(). They need to be user-configurable, since JCR may have
its own ACLs which it uses to restrict access to the repository.
The basic Jackrabbit and Priha repositories create a read-only session
if no credentials are passed; but *any* non-null credentials will create a
read-write session (which we obviously need). But others might work
differently.
I think jspwiki.properties is the best place to locate them. Having
to deal with any other configuration file sounds like a real PITA for
any admins.
Also note that both Jackrabbit and Priha store their DB credentials on
regular configuration files (XML or Properties), so not much security
is gained by encrypting a dummy username and password :-)
/Janne
On Mon, Aug 24, 2009 at 01:17:02AM -0400, Andrew Jaquith wrote:
> I sort of missed the context of this thread, but if this has anything
> to do with storing passwords in jspwiki.properties, consider using the
> "keychain" feature. The Keychain object is an encrypted file that is
> meant for storing stuff like this. It is NOT quite configurable yet --
> that's coming in the updated InstallActionBean I'm readying for
> check-in. If it's ok with you, I'll keep a lookout for the updated
> newSession() method and retrofit it to use the keychain when my
> changes hit.
>
> But if I got the context wrong, and the SimpleCredentials business has
> nothing to do with that, never mind then. :)
>
> Andrew
>
> On Sun, Aug 23, 2009 at 9:23 AM, Janne Jalkanen<ja...@ecyrd.com> wrote:
> >> * added dummy SimpleCredentials login to ContentManager.newSession()
> >> this is required since priha 0.1.25 (not sure if this is the
> >> right place/approach but at least we can run our JUnit tests
> >> again,
> >> although still many tests fail (92.15%))
> >
> > Yup, it's the right approach. Actually, it would be best to read them from
> > jspwiki.properties.
> >
> > /Janne
> >
Re: svn commit: r806956 - in /incubator/jspwiki/trunk: ./
src/WebContent/WEB-INF/lib/ src/java/org/apache/wiki/ src/java/org/apache/wiki/content/
Posted by Andrew Jaquith <an...@gmail.com>.
I sort of missed the context of this thread, but if this has anything
to do with storing passwords in jspwiki.properties, consider using the
"keychain" feature. The Keychain object is an encrypted file that is
meant for storing stuff like this. It is NOT quite configurable yet --
that's coming in the updated InstallActionBean I'm readying for
check-in. If it's ok with you, I'll keep a lookout for the updated
newSession() method and retrofit it to use the keychain when my
changes hit.
But if I got the context wrong, and the SimpleCredentials business has
nothing to do with that, never mind then. :)
Andrew
On Sun, Aug 23, 2009 at 9:23 AM, Janne Jalkanen<ja...@ecyrd.com> wrote:
>> * added dummy SimpleCredentials login to ContentManager.newSession()
>> this is required since priha 0.1.25 (not sure if this is the
>> right place/approach but at least we can run our JUnit tests
>> again,
>> although still many tests fail (92.15%))
>
> Yup, it's the right approach. Actually, it would be best to read them from
> jspwiki.properties.
>
> /Janne
>
Re: svn commit: r806956 - in /incubator/jspwiki/trunk: ./ src/WebContent/WEB-INF/lib/ src/java/org/apache/wiki/ src/java/org/apache/wiki/content/
Posted by Janne Jalkanen <ja...@ecyrd.com>.
> * added dummy SimpleCredentials login to
> ContentManager.newSession()
> this is required since priha 0.1.25 (not sure if this is the
> right place/approach but at least we can run our JUnit
> tests again,
> although still many tests fail (92.15%))
Yup, it's the right approach. Actually, it would be best to read them
from jspwiki.properties.
/Janne