paulsp 02/03/15 11:01:30
Modified: src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
webapp/WEB-INF/conf JetspeedResources.properties
docs/site config_guide.html changes.html psml_db.html
xdocs changes.xml
Added: src/java/org/apache/jetspeed/services/idgenerator
IdGeneratorService.java JetspeedIdGenerator.java
JetspeedIdGeneratorService.java
Log:
- Implemented IdGenerator services
- Customizer now uses IdGenerator service
- Doc updates
Revision Changes Path
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/idgenerator/IdGeneratorService.java
Index: IdGeneratorService.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Jetspeed" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache" or
* "Apache Jetspeed", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.jetspeed.services.idgenerator;
/**
* This service handles the generation of unique identifiers
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Spencer</a>
* @version $Id: IdGeneratorService.java,v 1.1 2002/03/15 19:01:29 paulsp Exp $
*/
// Turbine
import org.apache.turbine.services.Service;
public interface IdGeneratorService extends Service
{
public String SERVICE_NAME = "IdGenerator";
/**
* Generate a Unique PEID
*
* @return Unique PEID
*/
public String getNextPeid();
}
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/idgenerator/JetspeedIdGenerator.java
Index: JetspeedIdGenerator.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Jetspeed" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache" or
* "Apache Jetspeed", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.jetspeed.services.idgenerator;
// Jetspeed
import org.apache.jetspeed.services.idgenerator.IdGeneratorService;
// Turbine
import org.apache.turbine.services.TurbineServices;
/**
* Static accessor for the IdGeneatorService
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Spencer</a>
* @version $Id: JetspeedIdGenerator.java,v 1.1 2002/03/15 19:01:29 paulsp Exp $
*/
public abstract class JetspeedIdGenerator {
/** Creates new JetspeedIdGenerator */
public JetspeedIdGenerator() {
}
/*
* Utility method for accessing the service
* implementation
*
* @return a UniqueIdService implementation instance
*/
protected static IdGeneratorService getService()
{
return (IdGeneratorService)TurbineServices
.getInstance().getService(IdGeneratorService.SERVICE_NAME);
}
/**
* Generate a Unique PEID
*
* @return Unique PEID
*/
public static String getNextPeid()
{
return getService().getNextPeid();
}
}
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java
Index: JetspeedIdGeneratorService.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Jetspeed" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache" or
* "Apache Jetspeed", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.jetspeed.services.idgenerator;
// Java
import javax.servlet.ServletConfig;
// Jetspeed
import org.apache.jetspeed.services.idgenerator.IdGeneratorService;
// Turbine
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.Service;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.Log;
/**
* Simple implementation of the IdGeneratorService.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Spencer</a>
* @version $Id: JetspeedIdGeneratorService.java,v 1.1 2002/03/15 19:01:29 paulsp
Exp $
*/
public class JetspeedIdGeneratorService extends TurbineBaseService
implements IdGeneratorService
{
// configuration keys
private final static String CONFIG_COUNTER_START = "counter.start";
private final static String CONFIG_PEID_PREFIX = "peid.prefix";
private final static String CONFIG_PEID_SUFFIX = "peid.suffix";
// default configuration values
private final static long DEFAULT_CONFIG_COUNTER_START = 0x10000;
private final static String DEFAULT_CONFIG_PEID_PREFIX = "P-";
private final static String DEFAULT_CONFIG_PEID_SUFFIX = "";
// configuration parameters
private static String peidPrefix = null;
private static String peidSuffix = null;
protected static long idCounter;
/**
* This is the early initialization method called by the
* Turbine <code>Service</code> framework
* @param conf The <code>ServletConfig</code>
* @exception throws a <code>InitializationException</code> if the service
* fails to initialize
*/
public synchronized void init(ServletConfig conf) throws InitializationException
{
// already initialized
if (getInit()) return;
initConfiguration();
// initialization done
setInit(true);
}
/**
* This is the lateinitialization method called by the
* Turbine <code>Service</code> framework
*
* @exception throws a <code>InitializationException</code> if the service
* fails to initialize
*/
public void init() throws InitializationException {
Log.info( "Late init for JetspeedIdGeneratorService called" );
while( !getInit() ) {
//Not yet...
try {
Thread.sleep( 100 );
Log.info( "Waiting for init of JetspeedIdGeneratorService..." );
} catch (InterruptedException ie ) {
Log.error( ie );
}
}
}
/**
* This is the shutdown method called by the
* Turbine <code>Service</code> framework
*/
public void shutdown()
{
Log.info( "Shutdown for JetspeedIdGeneratorService called. idCounter = "
+ idCounter + " (" + Long.toHexString(idCounter) + ")" );
}
/**
* Loads the configuration parameters for this service from the
* JetspeedResources.properties file.
*
* @exception throws a <code>InitializationException</code> if the service
* fails to initialize
*/
private void initConfiguration() throws InitializationException
{
// get configuration parameters from Jetspeed Resources
ResourceService serviceConf =
((TurbineServices)TurbineServices.getInstance())
.getResources(IdGeneratorService.SERVICE_NAME);
peidPrefix = serviceConf.getString( CONFIG_PEID_PREFIX,
DEFAULT_CONFIG_PEID_PREFIX );
peidSuffix = serviceConf.getString( CONFIG_PEID_SUFFIX,
DEFAULT_CONFIG_PEID_SUFFIX );
synchronized(JetspeedIdGeneratorService.class)
{
idCounter = serviceConf.getLong( CONFIG_COUNTER_START,
DEFAULT_CONFIG_COUNTER_START );
}
}
/** Creates new JetspeedIdGeneratorService */
public JetspeedIdGeneratorService() {
}
/**
* Generate a Unique PEID
* @return Unique PEID
*/
public String getNextPeid()
{
synchronized(JetspeedIdGeneratorService.class)
{
idCounter++;
}
return peidPrefix + Long.toHexString(System.currentTimeMillis()) + "-"
+ Long.toHexString(idCounter) + peidSuffix;
}
}
1.14 +4 -5
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
Index: CustomizeSetAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CustomizeSetAction.java 13 Mar 2002 05:41:15 -0000 1.13
+++ CustomizeSetAction.java 15 Mar 2002 19:01:29 -0000 1.14
@@ -74,6 +74,7 @@
import org.apache.jetspeed.xml.api.portletmarkup.Metainfo;
import org.apache.jetspeed.xml.api.portletmarkup.Controller;
import org.apache.jetspeed.xml.api.portletmarkup.Control;
+import org.apache.jetspeed.services.idgenerator.JetspeedIdGenerator;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.xml.api.portletmarkup.Layout;
@@ -84,7 +85,7 @@
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.template.TurbineTemplate;
-import org.apache.turbine.services.uniqueid.TurbineUniqueId;
+//import org.apache.turbine.services.uniqueid.TurbineUniqueId;
// Velocity Stuff
@@ -326,8 +327,7 @@
Portlets p = new Portlets();
p.setMetainfo(new Metainfo());
p.getMetainfo().setTitle(title);
- // FIXME: get id from a Jetspeed service
- p.setId( Long.toHexString(System.currentTimeMillis()) + "-" +
TurbineUniqueId.getUniqueId());
+ p.setId(JetspeedIdGenerator.getNextPeid());
portlets.addPortlets(p);
}
}
@@ -396,8 +396,7 @@
p.setControl (ctrl);
p.setParent(pnames[i]);
- // FIXME: get id from a Jetspeed service
- p.setId( Long.toHexString(System.currentTimeMillis()) + "-" +
TurbineUniqueId.getUniqueId());
+ p.setId(JetspeedIdGenerator.getNextPeid());
portlets.addEntry(p);
}
}
1.67 +21 -2
jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
Index: JetspeedResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- JetspeedResources.properties 25 Feb 2002 05:39:55 -0000 1.66
+++ JetspeedResources.properties 15 Mar 2002 19:01:30 -0000 1.67
@@ -1,7 +1,7 @@
################################################################################
# Jetspeed Configuration
# Author: Kevin A. Burton ([EMAIL PROTECTED])
-# $Id: JetspeedResources.properties,v 1.66 2002/02/25 05:39:55 taylor Exp $
+# $Id: JetspeedResources.properties,v 1.67 2002/03/15 19:01:30 paulsp Exp $
################################################################################
# This is the main file you will need to configuration Jetspeed. If there are
# any secondary files they will be pointed to from this file.
@@ -286,6 +286,23 @@
autocreate.portlets=false
#########################################
+# IdGenerator Service #
+#########################################
+# Classname of the ID Generation implemented as a Turbine service.
+services.IdGenerator.classname=org.apache.jetspeed.services.idgenerator.JetspeedIdGeneratorService
+
+# counter.start - Initial value of conter as a base 10 integer.
JetspeedIdGenerator
+# will return the HEX representation of the value so 160 = a0.
+# Default = 65536 (HEX representation = 1000)
+services.IdGenerator.counter.start=65536
+
+# peid.prefix - Prefix of PEID. Default = P-
+services.IdGenerator.peid.prefix=P-
+
+# peid.suffix - Suffix of PEID. Default = (nothing)
+services.IdGenerator.peid.suffix=
+
+#########################################
# ThreadPool Service #
#########################################
services.ThreadPool.classname=org.apache.jetspeed.services.threadpool.JetspeedThreadPoolService
@@ -522,11 +539,13 @@
topnav.user_creation.enable=true
# Left Navigation bar
-# leftnav.width keeps the left edge of the content from moving as the width of
the content varies
+# leftnav.enable - Display the left navigation bar
+# leftnav.width - Keep the left edge of the content from moving as the width
of the content varies
leftnav.enable=true
leftnav.width=10%
# Bottom Navigation bar
+# bottomnav.enable - Display the Bottom navigation bar
bottomnav.enable=true
#########################################
1.11 +261 -0 jakarta-jetspeed/docs/site/config_guide.html
Index: config_guide.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/config_guide.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config_guide.html 14 Feb 2002 13:19:44 -0000 1.10
+++ config_guide.html 15 Mar 2002 19:01:30 -0000 1.11
@@ -155,6 +155,8 @@
<li><a href="#Set portlet caching and other refresh rates">Set portlet
caching and other refresh rates</a></li>
<li><a href="#Set Jetspeed logging">Set Jetspeed logging</a></li>
<li><a href="#Enable e-mail confirmation">Enable e-mail
confirmation</a></li>
+ <li><a href="#Logon Configuration">Logon Configuration</a></li>
+ <li><a href="#Account Disabling">Account Disabling</a></li>
<li><a href="#Backup and Test">Backup and Test</a></li>
</ul>
</blockquote>
@@ -990,6 +992,265 @@
<p><center>This section is
incomplete</center></p>
<p>
</p>
+ </blockquote>
+ </p>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0" cellspacing="0"
cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="Logon Configuration"><strong>Logon Configuration</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <table border="0" cellspacing="0"
cellpadding="2" width="100%">
+ <tr><td bgcolor="#828DA6">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="Case Insensitive Logon"><strong>Case Insensitive
Logon</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <p>
+ Jetspeed can be configured to automatically force all
usernames and passwords to upper or lower case.
+ By setting the "caseinsensitive" property for the username or
password to "true", then
+ the "caseinsensitive.upper" property can be applied. When it
is true, the username or password
+ is converted to uppercase. When false, username or password
are converted to lowercase.
+ The default setting is false, where the username and password
will be case-sensitive and
+ the "caseinsensitive.upper" property is ignored.</p>
+ <div align="left">
+ <table cellspacing="4" cellpadding="0" border="0">
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#ffffff"><pre>
+services.JetspeedSecurity.caseinsensitive.username=false
+services.JetspeedSecurity.caseinsensitive.password=false
+services.JetspeedSecurity.caseinsensitive.upper=true
+</pre></td>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ </table>
+ </div>
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0"
cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#828DA6">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="Logon Rules"><strong>Logon Rules</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <p>When a new user is created, the PSML
resources for the new user are copied from another user's account.
+This account is configurable with the property:</p>
+ <div align="left">
+ <table cellspacing="4" cellpadding="0" border="0">
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#ffffff"><pre>
+services.Profiler.newuser.template=turbine
+</pre></td>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ </table>
+ </div>
+ <p>Setting it to nothing configures
role-based psml as the default method for new users.</p>
+ <div align="left">
+ <table cellspacing="4" cellpadding="0" border="0">
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#ffffff"><pre>
+services.Profiler.newuser.template=
+</pre></td>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ </table>
+ </div>
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0"
cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#828DA6">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="Role Based PSML"><strong>Role Based PSML</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <p>Some configuration will want to share PSML
resources among users.
+In this case, users will not have their own PSML resources.
+Enable Role Based PSML with this property set to true:</p>
+ <div align="left">
+ <table cellspacing="4" cellpadding="0" border="0">
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#ffffff"><pre>
+services.Profiler.rolefallback=true
+</pre></td>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ </table>
+ </div>
+ <p>Remember to set the
"services.Profiler.newuser.template" property to nothing.</p>
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0"
cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#828DA6">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="Assigning Roles, Media Type"><strong>Assigning Roles, Media
Type</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <p>When a new user is created, you can
configure which roles are automatically signed to that new user.
+You may also configure which media types that new user will support.
+Use commas to separate multiple entries.</p>
+ <div align="left">
+ <table cellspacing="4" cellpadding="0" border="0">
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#ffffff"><pre>
+services.JetspeedSecurity.newuser.roles=user
+services.Profiler.newuser.media_types=html,wml
+</pre></td>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ </table>
+ </div>
+ </blockquote>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ </blockquote>
+ </p>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <table border="0" cellspacing="0"
cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="Account Disabling"><strong>Account Disabling</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <p>Accounts can be auto-disabled with a
failed-logon tracking feature.
+To turn on this feature, set this property:</p>
+ <div align="left">
+ <table cellspacing="4" cellpadding="0" border="0">
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#ffffff"><pre>
+services.JetspeedSecurity.logon.auto.disable=true
+</pre></td>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ </table>
+ </div>
+ <p>Account Disabling is controlled
by the parameters: count, interval, and max.
+These parameters are applied over the lifetime of the server.
+When the server is shutdown, all counts are reset.
+However, the 'disabled' status is persisted in the database.
+With the parameters below, the user is given 3 failed attempts over 300 seconds (5
minutes).
+After 5 minutes or a successful logon, the strike count is reset.
+After 3 failed attempts within 5 minutes, the account is disabled and the
+Over the entire run of the server, and the "logon.disabled.form" is displayed
whenever the user attempts to logon again.
+The 'max' parameter counts all failed logon attempts over the entire lifetime of
the server.
+After 10 failed attempts over the lifetime of the server, the account is disabled.
+Accounts can be enabled from the Jetspeed Admin User Maintenance screen.</p>
+ <div align="left">
+ <table cellspacing="4" cellpadding="0" border="0">
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#ffffff"><pre>
+# 3 logon strikes per 300 seconds and your out
+services.JetspeedSecurity.logon.strike.count=3
+services.JetspeedSecurity.logon.strike.interval=300
+# dont allow more than 10 over any time period
+services.JetspeedSecurity.logon.strike.max=10
+logon.disabled.form=AccountDisabled.vm
+</pre></td>
+ <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
+ <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif"
width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+ </tr>
+ </table>
+ </div>
</blockquote>
</p>
</td></tr>
1.16 +36 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- changes.html 16 Feb 2002 13:10:21 -0000 1.15
+++ changes.html 15 Mar 2002 19:01:30 -0000 1.16
@@ -272,6 +272,42 @@
<li>
Add - 2002/02/16 - Default permissions for "logged in" and anonymous users is now
configurable. (PS)
</li>
+<li>
+ Add - 2002/02/23 - Case-insensitive logon feature added (DST)
+</li>
+<li>
+ Add - 2002/02/24 - Disabled account feature added (DST)
+ Accounts can be disabled by the
admin user, with User form or by the auto-disable feature
+ - Auto-disable feature - disables an
account after x failures over y interval
+ - Extended database model. New interface 'JetspeedUser', impl
'BaseJetspeedUser'
+ - added 'disabled' column to databases
+ - automatic saving of user during
Logoff is now optional (off by default)
+</li>
+<li>
+ Add - 2002/03/01 - Added localization override facility (CK)
+</li>
+<li>
+ Add - 2002/03/10 - Started foundation of portlet ids. The portal toolkit now uses
or assigns portlet ids (DST)
+ - Converted all paned controllers and security portlets to use
portlet ids
+</li>
+<li>
+ Add - 2002/13/01 - (PS)
+ <ul>
+ <li>Implemented PEID on Min/Max/Customize/Close action buttons</li>
+ <li>Added getPortletById() to JetspeedTool</li>
+ <li>Added PEID support to VelocityPortletControl</li>
+ <li>Added PEID support to VelocityPortlet</li>
+ <li>Added PEID support to CustomizeSetAction</li>
+ <li>Added PEID support to PSMLDocument and BasePSMLDocument</li>
+ </ul>
+</li>
+<li>
+ Add - 2002/03/15 - (PS)
+ <ul>
+ <li>Implemented IdGenerator services</li>
+ <li>Customizer now uses IdGenerator service</li>
+ </ul>
+</li>
</ul>
</blockquote>
</p>
1.8 +21 -5 jakarta-jetspeed/docs/site/psml_db.html
Index: psml_db.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/psml_db.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- psml_db.html 9 Feb 2002 23:58:43 -0000 1.7
+++ psml_db.html 15 Mar 2002 19:01:30 -0000 1.8
@@ -263,7 +263,10 @@
</table>
</div>
<p>
- Save the <b>build.properties</b> file. From the command line in the
<b>build/torque</b> directory, run the Torque build script by typing <b>"ant"</b>.
Torque will then generate your database-specific SQL commands. The
PSML database definitions are stored in a vendor-neutral XML-format in the file
+ Save the <b>build.properties</b> file. From the command line in the
<b>build/torque</b> directory, run the Torque build script by typing <b>"ant"</b>.
+ (Ensure that Jakarta Ant version 1.4 or
greater is in your system path.)
+ Torque will then generate your
database-specific SQL commands. The PSML database definitions are stored in a
vendor-neutral XML-format in the file
+
<b>build/torque/schema/dbpsml-schema.xml</b>. Torque takes these
definitions, and generates a file containing the vendor-specific SQL commands that
will create the PSML tables in your database.
</p>
@@ -324,8 +327,18 @@
<tr><td>
<blockquote>
<p>
+ To use DB-PSML, you will first need to setup your User
database and Turbine.
+ (If you are using the default Hypersonic DB, these steps are
not necessary since the database is pre-populated).
+ Scripts are provided in the /src/sql/external directory.
+ The User database is based on the Turbine Security model.
+ See <a
href="http://jakarta.apache.org/turbine/turbine-2/turbine-schema.html";>Turbine
Schema</a>
+ You will need to run the "turbine" and "populate" scripts for
your database.
+ For example, with Oracle, first run "turbine-oracle.sql" to
create the database tables,
+ and then "populate-oracle.sql" to populate the tables.
+ </p>
+ <p>
Jetspeed needs to be configured to access a PSML database. You
do this by editing the file <b>webapp/WEB-INF/conf/TurbineResources.properties</b>.
- Edit the "databaseURL", "databaseDriver", "databaseUser",
"databasePassword", "databaseHost" and "database.adaptor" settings. The default
settings are:
+ The default settings are:
</p>
<div align="left">
<table cellspacing="4" cellpadding="0" border="0">
@@ -367,8 +380,8 @@
<tr>
<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1"
height="1" vspace="0" hspace="0" border="0"/></td>
<td bgcolor="#ffffff"><pre>
-databaseDriver = oracle.jdbc.driver.OracleDriver
-databaseUrl = jdbc:oracle:thin@databaseUrl = jdbc:oracle:thin@host:1521:sid
+database.default.driver = oracle.jdbc.driver.OracleDriver
+database.default.url = jdbc:oracle:thin:@host:1521:sid
database.default.username=jetspeed
database.default.password=jetspeed
@@ -384,7 +397,10 @@
</tr>
</table>
</div>
- <p>Don't forget to put the JDBC
driver's JAR file in your classpath or in the <b>webapp/WEB-INF/lib</b> directory.</p>
+ <p>Don't forget to put the JDBC
driver's JAR file in your classpath or in the <b>webapp/WEB-INF/lib</b> directory.
+ With Oracle, the driver may be named something like 'classes12.zip'.
This file is really a JAR, and can safely be renamed to classes12.jar.
+ If you are placing the driver in Tomcat's
/webapps/jetspeed/WEB-INF/lib directory, then it must be renamed to .JAR or it will
not be found.
+ </p>
</blockquote>
</p>
</td></tr>
1.29 +19 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- changes.xml 11 Mar 2002 07:26:47 -0000 1.28
+++ changes.xml 15 Mar 2002 19:01:30 -0000 1.29
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-$Id: changes.xml,v 1.28 2002/03/11 07:26:47 taylor Exp $
+$Id: changes.xml,v 1.29 2002/03/15 19:01:30 paulsp Exp $
-->
<document>
<properties>
@@ -185,6 +185,24 @@
<li>
Add - 2002/03/10 - Started foundation of portlet ids. The portal toolkit now uses
or assigns portlet ids (DST)
- Converted all paned controllers and security portlets to use
portlet ids
+</li>
+<li>
+ Add - 2002/13/01 - (PS)
+ <ul>
+ <li>Implemented PEID on Min/Max/Customize/Close action buttons</li>
+ <li>Added getPortletById() to JetspeedTool</li>
+ <li>Added PEID support to VelocityPortletControl</li>
+ <li>Added PEID support to VelocityPortlet</li>
+ <li>Added PEID support to CustomizeSetAction</li>
+ <li>Added PEID support to PSMLDocument and BasePSMLDocument</li>
+ </ul>
+</li>
+<li>
+ Add - 2002/03/15 - (PS)
+ <ul>
+ <li>Implemented IdGenerator services</li>
+ <li>Customizer now uses IdGenerator service</li>
+ </ul>
</li>
</ul>
</section>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
