You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by se...@apache.org on 2007/05/14 02:20:11 UTC
svn commit: r537684 - in
/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs: ./ howto/ services/
Author: seade
Date: Sun May 13 17:20:09 2007
New Revision: 537684
URL: http://svn.apache.org/viewvc?view=rev&rev=537684
Log:
A quick scan for typos.
Removed:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/ide-vaj-wte-howto.xml
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/features.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/fsd.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/getting-started.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/how-to-help.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/configuration-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/extend-user-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/hibernate-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/ldap-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_1-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/python-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/security-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/services-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/url-rewriting-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/velocity-site-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/index.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/j2ee-integration.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/model2+1.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/project-map.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/index.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/ldap-security-service.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pool-service.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/rundata-service.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/security-service.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/session-service.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/uniqueid-service.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/upload-service.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-experiment.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-schema.xml
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml Sun May 13 17:20:09 2007
@@ -158,7 +158,7 @@
</action>
<action type="fix" dev="henning" issue="TTWS16" due-to="Oliver Eikemeier">
Make sure that UIManager strips leading and trailing
- slashes from referenced objects and configured pathes.
+ slashes from referenced objects and configured paths.
</action>
<action type="update" dev="henning">
Add a maven goal to generate SQL with Torque. Removed old SQL files
@@ -218,7 +218,7 @@
Fix the build process bug that let some of the reports end up in wrong directories.
</action>
<action type="update" dev="henning">
- Make the default encoding for incoming requests configureable. This allows you to post
+ Make the default encoding for incoming requests configurable. This allows you to post
forms from UTF-8 or other encodings into Turbine.
</action>
<action type="update" dev="seade">
@@ -337,7 +337,7 @@
format rules and not just to the default locale format.
</action>
<action type="update">
- DateFormatter now allows for a differnet date format to be provided
+ DateFormatter now allows for a different date format to be provided
via <em>tool.dateTool.format</em> in TurbineResources.properties.
</action>
<action type="update">
@@ -450,11 +450,11 @@
</action>
<action type="update">
Added a Howto describing using Hibernate with Turbine. The actual code is
- currently not part of the Turbine distrib due to licensing issues, but is very
+ currently not part of the Turbine distribution due to licensing issues, but is very
easy to implement due to Turbine support of Avalon Components.
</action>
<action type="update">
- Changed TurbineUser so that when either perment or temporary values are
+ Changed TurbineUser so that when either permanent or temporary values are
stored, if the required hashtable was missing, then it was created. This
happened in conjunction with the PassiveUserManager. Additionally, the
setTempStorage(Hashtable newTempStorage) did not actually assign the new
@@ -522,7 +522,7 @@
action (insert or update) for you. addJob(job) simply calls updateJob(job).
</action>
<action type="update">
- A new fascade class has been created for easier access to the Scheduler Service.
+ A new facade class has been created for easier access to the Scheduler Service.
It is org.apache.turbine.services.schedule.TurbineScheduler.
</action>
</action>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/features.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/features.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/features.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/features.xml Sun May 13 17:20:09 2007
@@ -34,7 +34,7 @@
<p>
This document is for bragging about all of Turbine's features and inherent
coolness. Turbine is well over 200 classes and contains a boat load of
-features and API's. Many of these can also be used indepently of Turbine.
+features and API's. Many of these can also be used independently of Turbine.
Almost all of the default implementations can be easily overridden with
your own implementations. Turbine also has extensive Javadoc documentation
for nearly all of the classes as well as in-code comments. At the risk
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/fsd.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/fsd.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/fsd.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/fsd.xml Sun May 13 17:20:09 2007
@@ -192,7 +192,7 @@
</p>
<p>
-The loaders are responsible for dynamicially loading each of the five modules.
+The loaders are responsible for dynamically loading each of the five modules.
These loaders have an option to cache the module objects in memory for extremely
fast loading times.
</p>
@@ -200,7 +200,7 @@
<p>
The loaders use intelligent factories in that we have added a property to
TurbineResources.properties that allows you to define the "Loader Classpath". In
-other words, it is possible to physicially keep all of your web applications
+other words, it is possible to physically keep all of your web applications
modules in their own package classpath and the loaders will be responsible for
finding the right file to execute.
</p>
@@ -218,7 +218,7 @@
since multiple threads may try to execute a single module at the exact same time.
These rules apply to general servlet programming so they are not that difficult
to understand. The basic rule is to not try to define any class global variables
-within each of the modules unless it has been wrapped in a syncronized statement.
+within each of the modules unless it has been wrapped in a synchronized statement.
</p>
</section>
@@ -232,7 +232,7 @@
<p>
You can easily create your own factories by implementing a simple interface
-and registering them in the TurbineResource.properities. This allows you a lot
+and registering them in the TurbineResource.properties. This allows you a lot
of flexibility in the sense that you can load Turbine modules from <strong>any
</strong> source that is able to provide you with a java object, for example an
RMI server or scripting options like Rhino and JPython. Keep in mind that
@@ -261,7 +261,7 @@
"Login" screen to be something else. This is done in the Turbine Servlet under
the data.session.isNew() check. Until the user actually logs in, it is only possible
to store temporary data for that users session. When the user logs in, it is
-possible to store permant information by simply putting data into a hashtable.
+possible to store permanent information by simply putting data into a hashtable.
The implementation of the User object (ie: TurbineUser) in the framework takes care
of the issues involved with serializing that information to a resource such as a
database or file on the hard disk.
@@ -414,7 +414,7 @@
<p>
The DateSelector class generates Html popup menus for month/day/year. The beauty
of this class is that you can provide a date for it to start with and it will
-automaticially generate the Html popups with that date.
+automatically generate the Html popups with that date.
</p>
<p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/getting-started.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/getting-started.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/getting-started.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/getting-started.xml Sun May 13 17:20:09 2007
@@ -87,7 +87,7 @@
<li>
org.apache.turbine.modules - This is where the code for the Modules
system is stored. The different Modules are described in more detail in
-the <a href="fsd.html">funtional specification document</a>.
+the <a href="fsd.html">functional specification document</a>.
</li>
<li>
org.apache.turbine.om - OM stands for Object Model. This is where the
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/how-to-help.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/how-to-help.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/how-to-help.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/how-to-help.xml Sun May 13 17:20:09 2007
@@ -81,7 +81,7 @@
and attach your patch(s).
</li>
</ul>
- The documentation is probabley the easiest area for anyone to contribute in. If you are
+ The documentation is probably the easiest area for anyone to contribute in. If you are
new to Turbine and learning your way around, documenting what you learn and submitting
it in any other the various forms would be appreciated.
</p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/configuration-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/configuration-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/configuration-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/configuration-howto.xml Sun May 13 17:20:09 2007
@@ -42,7 +42,7 @@
<p>
In the classic development environment, the developer has one environment, there is
a QA environment, and then production. While all of these environments strive to be
-as similar as possible, there are often difference betweent them. For instance, in
+as similar as possible, there are often difference between them. For instance, in
the development environment, you might want to not have Turbine cache templates, that
way, as you change them, they are just reloaded. But in test and production you might
need them to be non reloading for performance. There are many other situations like this.
@@ -126,7 +126,7 @@
<p>
The configurations specified first override the values of configurations specified
-afterwords. So, if the configuration value "mail.server" is specified as mymailserver.mycompany.com in
+afterwards. So, if the configuration value "mail.server" is specified as mymailserver.mycompany.com in
your JNDI settings, and localhost in the TurbineResources.properties, then when you issue:
</p>
<source>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml Sun May 13 17:20:09 2007
@@ -104,37 +104,10 @@
This will strip the Screen Template of its Navigational components. These
convenience methods can also be used to expose and to set the Layout when the
Template is processed. Through this a User can potentially choose how they would
-like their webpage to appear by choosing one of many differant Layouts or
+like their webpage to appear by choosing one of many different Layouts or
choices you, the webdesigner provide.
</p>
-<p>
-Currently the setLayoutTemplate(), getLayoutTemplate(), setScreenTemplate() and
-getScreenTemplate() methods arent available in TDKa9. Until the next build of
-the TDK contains RunData with those methods, the setLayoutTemplate method can
-still be accessed through the TemplateInfo Object that RunData exposes.
-For example;
-</p>
-
-<source test=""><![CDATA[
- $data.getTemplateInfo().setLayoutTemplate("PrintableLayout.vm")
-
- or
-
- #set $template = $data.getTemplateInfo()<br />
- $template.setLayoutTemplate("PrintableLayout.vm")
-
- or
-
- #set $template = $data.getTemplateInfo()<br />
- $!template.setLayoutTemplate("PrintableLayout.vm")
-
-]]></source>
-
-<p>
-In the third example, the ! stops the echo of the Velocty Directive echoing to
-screen.
-</p>
</section>
<section name="Using the TemplateLink Object">
@@ -166,7 +139,11 @@
</p>
<p>
-However the HTML page will load itself into a screen and not be embedded withint the Layouts and Navigations. If you still wish static content to be embedded within the specified layouts and navigations it is easier to add the static content as a velocity template and not take advantage of any of the dynamic content addition the Velocity Context allows.
+However the HTML page will load itself into a screen and not be embedded within
+the Layouts and Navigations. If you still wish static content to be embedded
+within the specified layouts and navigations it is easier to add the static
+content as a velocity template and not take advantage of any of the dynamic
+content addition the Velocity Context allows.
</p>
@@ -375,7 +352,7 @@
<p>
Which is much simpler than the original attempt at dynamically creating an image
-URL. To make this Image object accessible across all Screens, sublass the
+URL. To make this Image object accessible across all Screens, subclass the
VelocityScreen Object with one that overrides the doBuildTemplate() method by
adding the Image object to the Velocity Context. Then use this class as the
parent class for the Screens that need access to the Image Object. For more
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/extend-user-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/extend-user-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/extend-user-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/extend-user-howto.xml Sun May 13 17:20:09 2007
@@ -94,7 +94,7 @@
This interface is used by the Security Service and a few other
services as well. This is the reason behind not generating TurbineUser
through Torque. It would have no idea how to provide an implementation
- of the User interface leaving that inplementaion to you.
+ of the User interface leaving that implementation to you.
</p>
<p>
The MapBuilder for TurbineUser is
@@ -122,8 +122,8 @@
</p>
<p>
Another interesting fact about TurbineUser is the way in which data stored in
- the database is accessed. Instaed of using using private attributes for storage
- within the object, all attibutes are stored in a hashtable (known herein as the
+ the database is accessed. Instead of using using private attributes for storage
+ within the object, all attributes are stored in a hashtable (known herein as the
perm hashtable). Access to the perm hashtable is controlled through the
getPerm/setPerm methods.
</p>
@@ -198,12 +198,12 @@
</source>
<p>
Notice the attribute on the database tag for defaultJavaType. I used
- "object" as the value. The default is "primative". You do not have to
+ "object" as the value. The default is "primitive". You do not have to
use "object"!!!
</p>
<p>
In the last version of Turbine (2.1), the only option was to use the
- primative types. However, this posed a small problem. It was not
+ primitive types. However, this posed a small problem. It was not
possible to have number or boolean types that contained null values.
If a null value was found in the database for columns of these types,
the value returned from the OM object was 0 or false, respectively.
@@ -219,7 +219,7 @@
object can be stored. The first, and simplest method, is to store it in
the perm hashtable. As described earlier, any data in the perm hashtable
not mapped to a database column will get serialized into the
- TURBINE_USER.OBJECTDATA column. The second, and perferred method, is to
+ TURBINE_USER.OBJECTDATA column. The second, and preferred method, is to
use additional database column(s) for storage.
</p>
<p>
@@ -344,7 +344,7 @@
<p>
Now we will implement the pair of adapters we referred to in our
schema. First we implement TurbineUserAdapter to provide access
- to the primary key as well any additional attibutes we are adding.
+ to the primary key as well any additional attributes we are adding.
</p>
<source>
<![CDATA[
@@ -367,7 +367,7 @@
* Gets the userId of the user. This is also the primary key
* of the TURBINE_USER table. The return type of Integer is
* valid only if the javaType for the ExtendedUser table
- * is "object". If it is "primative", the return type
+ * is "object". If it is "primitive", the return type
* should be changed to int.
* @return the user id
*/
@@ -489,7 +489,7 @@
<p>
Next, you will need to manually create any additional database columns
that you will be using in TURBINE_USER. Make sure that the name of the
- columns match what you speificied in TurbineUserPeerAdapter.
+ columns match what you specified in TurbineUserPeerAdapter.
</p>
<p>
We can now use project-om ant task to generate our OM layer using
@@ -607,7 +607,7 @@
it.
</p>
<p>
- Implementing the methods yourself might be the simpliest route for someone
+ Implementing the methods yourself might be the simplest route for someone
new to Turbine and Torque. This simply involves overriding the addBook()
method in the example above with the two lines shown previously. Of course,
You would have to do this for each and every one that Torque generates
@@ -687,12 +687,12 @@
if this problem will affect you.
</p>
<p>
- The real solution to this problem is in modifing Turbine in such a way to
+ The real solution to this problem is in modifying Turbine in such a way to
allow Torque to generate the TurbineUser object. This would eliminate the
need to extend TurbineUser altogether. There would still be the need to add
additional columns and/or create FK references to the TURBINE_USER table. It
- would would only involve modifing the schema files and letting Torque do
- all of the work instead of creating the adapter classes and modifing the
+ would would only involve modifying the schema files and letting Torque do
+ all of the work instead of creating the adapter classes and modifying the
map builder.
</p>
<p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/hibernate-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/hibernate-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/hibernate-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/hibernate-howto.xml Sun May 13 17:20:09 2007
@@ -49,7 +49,7 @@
</p>
<p>
Please review the content available from the Hibernate homepage. This howto assumes
- you already are confortable with the various Hibernate concepts.
+ you already are comfortable with the various Hibernate concepts.
</p>
<p>
In this example, we will take a simple schema with a single table and integrate Hibernate into
@@ -90,7 +90,7 @@
<source>
/src/java/com/my/project/bizobj business objects reside
/src/java/com/my/project/om POJO objects mapped to database reside
- /src/java/com/my/project/om/persist manager objects that faciliate retrieve POJO objects
+ /src/java/com/my/project/om/persist manager objects that facilitate retrieve POJO objects
/src/java/com/my/project/om/filter Servlet Filter lives that maintains the Hibernate Session
/src/java/ where hibernate.hbm.xml and hibernate.cfg.xml files live
@@ -209,7 +209,7 @@
<section name="Create static ServiceLocator class.">
<p>
- Currently this class is not integrated into Turbine, so you will need to provide an implemation yourself.
+ Currently this class is not integrated into Turbine, so you will need to provide an implementation yourself.
This provides a static method of retrieving your Hibernate Session.
</p>
@@ -307,7 +307,8 @@
<section name="Create Servlet Filter.">
<p>
- The servlet Filter is required if you use lazy loading of objects because you need to open a Hibernate sesion, and keeps it open through the view layer.
+ The servlet Filter is required if you use lazy loading of objects because
+ you need to open a Hibernate session, and keeps it open through the view layer.
This ensures that each user get's their own Hibernate Session. ?? Should this be done
through some sort of SessionValidator?
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/ldap-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/ldap-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/ldap-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/ldap-howto.xml Sun May 13 17:20:09 2007
@@ -36,7 +36,7 @@
start with the fact that for the schema proposed we have taken all new
objectClasses and Attributes preceded by turbine to indicate that they are
Turbine specific. We have thought about using the standard and available
-LDAP objectClasses and atributes, but finally decided to start the
+LDAP objectClasses and attributes, but finally decided to start the
discussion with the turbine stuff.
</p>
<p>
@@ -172,11 +172,11 @@
all user related information. turbineGroup can hold in the
turbineGroupMember DNs of turbineUser objects. Thus having multiple
users being member of a group. There is however no relation with role at
-this stage. The releation role - user is stored in the turbineRole
+this stage. The relation role - user is stored in the turbineRole
having multiple DNs in turbineRoleMember. Then we have a user - role
relation thus giving user permission via roles they can perform. There
is no relation between role - user - group in one record. This could be
-possible with the DB model, but we could you put this dependancy in the
+possible with the DB model, but we could you put this dependency in the
hierarchical structure of a directory. With the separate user - role and
user - group relations we thought we'd have the most desired relations.
</p>
@@ -184,7 +184,7 @@
Please note that the Object Identifiers (OID) in this example are not
real ones. When we go for the turbine objectClasses and attributes
Turbine (or Apache) have to register (if they not already have) their
-own OID starting point in the IANA tree. We are fully open for dicussion
+own OID starting point in the IANA tree. We are fully open for discussion
and appreciate your feedback on the mailing list.
</p>
</section>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_1-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_1-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_1-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_1-howto.xml Sun May 13 17:20:09 2007
@@ -33,7 +33,7 @@
<p>
The information in this HOWTO pertains to Turbine 2.2. Please refer
to the <a href="migrate-from-2_2-howto.html">Migrating from
- 2.2 to 2.3</a> page for information on migating to Turbine 2.3.
+ 2.2 to 2.3</a> page for information on migrating to Turbine 2.3.
</p>
</section>
@@ -123,7 +123,7 @@
need to alter these templates you may prefer to use these directly
from the jar file. To do this you need to set the
<code>torque.useClasspath</code> property to <code>true</code> in
- <code>build.peoperties</code>. In any case, you should either
+ <code>build.properties</code>. In any case, you should either
replace or delete the old versions of these templates from your
existing project.
</p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml Sun May 13 17:20:09 2007
@@ -186,7 +186,7 @@
<section name="earlyInit Parameter For Selected Services">
<p>
In order to get some services to work under 2.3, it is necessary to set
- an earlyInit parameter in TurbineResources.propertiess:
+ an earlyInit parameter in TurbineResources.properties:
</p>
<source>
<![CDATA[
@@ -204,7 +204,7 @@
<p>
Under 2.3 there are new URI handling tools with a significant refactoring
of how relative and absolute URL's are handled in Turbine. Briefly, the
- new tools avoid the confusion that arose previoulsy from mixing tools
+ new tools avoid the confusion that arose previously from mixing tools
with internal classes, providing uniform access to the various URI types
in Turbine. <strong>These new tools are backwards-compatible with your old
$link and $content tools, so you should not have to change any of your
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/python-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/python-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/python-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/python-howto.xml Sun May 13 17:20:09 2007
@@ -64,7 +64,7 @@
<section name="Setting Up Python for Turbine">
<p>
The first thing is to download JPython from www.jpython.org and copy
- the jpython.jar file into your turibe/lib directory. Now you need to
+ the jpython.jar file into your turbine/lib directory. Now you need to
prepare and compile the jpython files like this:
<source>
build prepare-python
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/security-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/security-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/security-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/security-howto.xml Sun May 13 17:20:09 2007
@@ -60,7 +60,7 @@
many Permissions. User is an account that is interaction with the System and the Group
is a something that a User would want to do something in. In the Turbine mailing lists
it has often been described in the same way as a project. In a project you have fulfill
-a role, however a User doesnt "belong" to a project they merely have a role in that
+a role, however a User doesn't "belong" to a project they merely have a role in that
project ( or group ). In this manner too a User can have many Roles within the one
Group. For instance a User may have the Role Developer in the Group, but may also have
the Role of Administrator as well. While initially confusing at first, as there
@@ -104,7 +104,7 @@
application. If however you need stronger security, such as only allowing users that
have logged in, and have a Role in a specific Group, the Permission will need to be
matched to the Group and User. As an example, assume one of your groups is "Accounting"
-and the Invoice information is only to be viewed by Usersthat have a Role in Accounting
+and the Invoice information is only to be viewed by Users that have a Role in Accounting
as well as the Permission "viewinvoice", the above method would be re-written;
</p>
@@ -238,10 +238,10 @@
<p>
In the latter example, before the Screen populates the Context it will check for the
User being logged in by the doBuildTemplate(data) method in the parent. If the test
-fails, the context isnt created for the Invoice screen. Another way to manage this
+fails, the context isn't created for the Invoice screen. Another way to manage this
is to seperate the screens into two packages, com.mycompany.modules.screens.unsecure
and com.mycompany.modules.screens.secure and have a Default.java Screen in each
-of the packages mimicing the above approaches.
+of the packages mimicking the above approaches.
</p>
</section>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/services-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/services-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/services-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/services-howto.xml Sun May 13 17:20:09 2007
@@ -76,7 +76,7 @@
<li>
Your Service will be instantiated exactly once. So it must be
threadsafe and must not use class global variables for
- session-dependend information.
+ session-dependent information.
</li>
<li>
You should provide an init() method which is called when your
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/url-rewriting-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/url-rewriting-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/url-rewriting-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/url-rewriting-howto.xml Sun May 13 17:20:09 2007
@@ -51,7 +51,7 @@
</p>
<p>
-Three parts of the url will be addresed:
+Three parts of the url will be addressed:
<ol>
<li>the web application context (CONTEXT in the example above),</li>
<li>the servlet prefix (servlet),</li>
@@ -84,7 +84,7 @@
]]></source>
<p>
-Everthing after the docBase= line is obviously up to you. This tells
+Everything after the docBase= line is obviously up to you. This tells
Tomcat to add a context named 'po' with the docbase of your
application.
</p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/velocity-site-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/velocity-site-howto.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/velocity-site-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/velocity-site-howto.xml Sun May 13 17:20:09 2007
@@ -106,7 +106,7 @@
you will want to create a .vm template of the same name as your class:
HelloWorld.vm...within that template you will put the BODY portion of your
page. In other words, there is no reason to put the header/footer into
-this file since that will be built seperately (more documentation on that
+this file since that will be built separately (more documentation on that
futher down...). You should save this document in your <em>templates/screens/</em>
directory.
</p>
@@ -178,7 +178,7 @@
If you want to do something that is more complicated than this that
is reflected across all of your Screens, then you should write a class
that is a subclass of VelocityScreen and then put your specific code
-in there. For example, if you wanted a security method to be called automaticially
+in there. For example, if you wanted a security method to be called automatically
without having to normally call super() to get it from an overridden method
in the superclass, you could have something like this (semi-pseudo untested
code):
@@ -229,7 +229,7 @@
this is that all you need to do to add security to your screen is to simply
subclass this class instead of VelocityScreen. There is also no need
to remember to call super() since the doBuild() method will be called for
-you automaticially by Turbine. You can start to see how Turbine is simply
+you automatically by Turbine. You can start to see how Turbine is simply
an extension of the servlet framework itself. For example, the Servlet
Engine will call HttpServlet's service() method for you, just like Turbine
will call your doBuild() method for you. Tight integration with tools like
@@ -279,7 +279,7 @@
<p>
As you can see above, I used a "," instead of a "/". You can use either
one here. The above will create a fully formed URI with the session information
-encoded into the link if the clients brower has cookies turned off.
+encoded into the link if the clients browser has cookies turned off.
</p>
</section>
@@ -332,7 +332,7 @@
portions of your page simply becomes a variable that you can plug into
any number of Layouts and in any location. If you want to write code so
that the Layout is determined by a variable in the database or in the HTTP
-request or whever, all you need to do is write your own VelocitySiteLayout
+request or whatever, all you need to do is write your own VelocitySiteLayout
and override some of the methods in there to determine the layout based
on your own conditions instead of the system default conditions.
</p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/index.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/index.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/index.xml Sun May 13 17:20:09 2007
@@ -116,10 +116,10 @@
principles to the entire process of building a complex secure web application.
We try to follow the
<a href="http://www.javaworld.com/javaworld/jw-12-1999/jw-12-ssj-jspmvc.html">Model
- 2 methodology</a> yet expand on it to encompass "View" techologies other
+ 2 methodology</a> yet expand on it to encompass "View" technologies other
than just JSP as well as more mature methodologies such as
<a href="./howto/action-event-howto.html">Action
- Event</a> handling. Turbine is consided as Model 2 <strong>+ 1</strong>. :-) Please
+ Event</a> handling. Turbine is considered as Model 2 <strong>+ 1</strong>. :-) Please
see the <a href="model2+1.html">discussion</a> of Model 2+1 for more information.
</p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/j2ee-integration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/j2ee-integration.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/j2ee-integration.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/j2ee-integration.xml Sun May 13 17:20:09 2007
@@ -167,7 +167,7 @@
<td>
<p>
You can use container managed security if you wish, and Turbine provides you with
-mechanism for application manged security, in case you need them.
+mechanism for application managed security, in case you need them.
</p>
<p>
The main problem with container managed security is that it cannot be managed
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/model2+1.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/model2%2B1.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/model2+1.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/model2+1.xml Sun May 13 17:20:09 2007
@@ -55,7 +55,7 @@
</p>
<p>
-Turbine does not directly support the Hierachical MVC pattern, but
+Turbine does not directly support the Hierarchical MVC pattern, but
it cout be used this way by defining multiple module and template
paths (would impact performance). Note that in the HMVC each MVC
instance is self-contained and separable from the rest.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/project-map.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/project-map.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/project-map.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/project-map.xml Sun May 13 17:20:09 2007
@@ -33,14 +33,14 @@
<p> On this page, you can find a functional breakdown of Turbine codebase.
This should help you in getting familiar with the tools that Turbine offers
to you. Also, it will help you locate people that are experts in the field
- of a specific functional block, so you can contac them if you encouter
+ of a specific functional block, so you can contact them if you encounter
a problem, or better yet have made a patch that fixes it. </p>
<p><a href="project-map/core.html"><b>Turbine Core</b></a></p>
<p> In the Core part of Turbine you will find the Turbine Servlet, the
single entry point to your application, and the classes that form the
- framework of HTTP-interfaced application following MVC desing pattern.
+ framework of HTTP-interfaced application following MVC design pattern.
Here you will find the base classes you will have to extend to fill
in the framework with your application's logic. See the
<a href="fsd.html">specification</a> for more details. </p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/index.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/index.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/index.xml Sun May 13 17:20:09 2007
@@ -53,7 +53,7 @@
<p>
The Life Cycle of a Service begins with the Services constructor. A Service
-does not do much in it's contructor. Especially it should not allocate any
+does not do much in it's constructor. Especially it should not allocate any
costly resources like large memory structure, DB or Network connections, etc.
The Service may be in the properties file, but unless a client using the
application needs the Service in question, there is no point starting the
@@ -94,7 +94,7 @@
<li>
<a href="cache-service.html">Cache Service</a>
<br/>
-Provides a persistant Object Storage mechanism within your application.
+Provides a persistent Object Storage mechanism within your application.
</li>
<li>
@@ -163,8 +163,8 @@
<a href="pull-service.html">Pull Service</a>
<br/>
Manages the creation of application tools that are available to all templates
-in a Turbine application. The tools can have global scope, request scope, session
-scope or persistant scope within your application.
+in a Turbine application. The tools can have global scope, request scope or
+session scope within your application.
</li>
<li>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/ldap-security-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/ldap-security-service.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/ldap-security-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/ldap-security-service.xml Sun May 13 17:20:09 2007
@@ -1,129 +1,129 @@
-<?xml version="1.0"?>
-
-<!--
- 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.
--->
-
-<document>
-
- <properties>
- <title>Turbine Services - LDAP Security Service</title>
- <author email="tv@apache.org">Thomas Vandahl</author>
- </properties>
-
-<body>
-
-<section name="LDAP Security Service">
-
-<p>
-This is an implementation of a Security Service which uses
-an LDAP server to authenticate users.
-</p>
-
-<p>
-This service provides authentication only by default. Group, role and
-permission information should be managed elsewhere, for example in a
-database. The following configuration example uses the default database
-classes for this and authenticates against an Active Directory server.
-</p>
-
-</section>
-
-<section name="Configuring the Security Service">
-<p>
-You need to configure Turbine to use the LDAP Security Service and the LDAP User Manager:
-</p>
-<source><![CDATA[
-services.SecurityService.classname=org.apache.turbine.services.security.ldap.LDAPSecurityService
-services.SecurityService.user.manager=org.apache.turbine.services.security.ldap.LDAPUserManager
-]]></source>
-
-<p>
-As mentioned before, LDAP does not yet provide custom Group, User and
-Role objects so you must use it with the default TurbineGroup, TurbineRole
-and TurbinePermission objects. There is a generic LDAP user and a specialized
-Active Directory user. We use the latter for this example.
-</p>
-
-<source><![CDATA[
-# Class for User.
-#services.SecurityService.user.class=org.apache.turbine.services.security.ldap.LDAPUser
-services.SecurityService.user.class=org.apache.turbine.services.security.ldap.ActiveDirectoryUser
-
-# Class for Group.
-services.SecurityService.group.class=org.apache.turbine.om.security.TurbineGroup
-
-# Class for Role.
-services.SecurityService.role.class=org.apache.turbine.om.security.TurbineRole
-
-# Class for Permission.
-services.SecurityService.permission.class=org.apache.turbine.om.security.TurbinePermission
-]]></source>
-
-<p>
-Now the security service needs to know your LDAP configuration. Note that using
-<code>sAMAccountName</code> as user name allows you to log in with the same name
-as in Windows. You can, however, use any other attribute, like
-<code>userPrincipalName</code> (eMail-address), for example.
-</p>
-
-<source><![CDATA[
-services.SecurityService.ldap.security.authentication=simple
-services.SecurityService.ldap.port=389
-services.SecurityService.ldap.host=ad.acme.com
-
-#
-# The user name of the admin user. The admin user should be able to
-# read from the LDAP repository.
-# Characteres '/' are replaced by '=' and '%' are replaced by ','.
-#
-# Default: none
-#
-services.SecurityService.ldap.admin.username=CN/JoeAdmin%CN/Users%DC/acme%DC/com
-services.SecurityService.ldap.admin.password=password
-
-#
-# The directory base to search.
-# '/' are replaced by '=' and '%' are replaced by ','.
-#
-# Default: none
-#
-services.SecurityService.ldap.basesearch=CN/Users%DC/acme%DC/com
-
-services.SecurityService.ldap.dn.attribute=distinguishedName
-services.SecurityService.ldap.provider=com.sun.jndi.ldap.LdapCtxFactory
-
-# Active Directory settings
-# services.SecurityService.ldap.user.userid=userAccountControl
-services.SecurityService.ldap.user.username=sAMAccountName
-#services.SecurityService.ldap.user.username=cn
-services.SecurityService.ldap.user.firstname=givenName
-services.SecurityService.ldap.user.lastname=sn
-services.SecurityService.ldap.user.email=userPrincipalName
-services.SecurityService.ldap.user.password=userPassword
-]]></source>
-
-<p>
-See the <a href="security-service.html">Security Service</a> page
-for details of these and other properties that may also need to be configured.
-</p>
-
-</section>
-
-</body>
-</document>
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<document>
+
+ <properties>
+ <title>Turbine Services - LDAP Security Service</title>
+ <author email="tv@apache.org">Thomas Vandahl</author>
+ </properties>
+
+<body>
+
+<section name="LDAP Security Service">
+
+<p>
+This is an implementation of a Security Service which uses
+an LDAP server to authenticate users.
+</p>
+
+<p>
+This service provides authentication only by default. Group, role and
+permission information should be managed elsewhere, for example in a
+database. The following configuration example uses the default database
+classes for this and authenticates against an Active Directory server.
+</p>
+
+</section>
+
+<section name="Configuring the Security Service">
+<p>
+You need to configure Turbine to use the LDAP Security Service and the LDAP User Manager:
+</p>
+<source><![CDATA[
+services.SecurityService.classname=org.apache.turbine.services.security.ldap.LDAPSecurityService
+services.SecurityService.user.manager=org.apache.turbine.services.security.ldap.LDAPUserManager
+]]></source>
+
+<p>
+As mentioned before, LDAP does not yet provide custom Group, User and
+Role objects so you must use it with the default TurbineGroup, TurbineRole
+and TurbinePermission objects. There is a generic LDAP user and a specialized
+Active Directory user. We use the latter for this example.
+</p>
+
+<source><![CDATA[
+# Class for User.
+#services.SecurityService.user.class=org.apache.turbine.services.security.ldap.LDAPUser
+services.SecurityService.user.class=org.apache.turbine.services.security.ldap.ActiveDirectoryUser
+
+# Class for Group.
+services.SecurityService.group.class=org.apache.turbine.om.security.TurbineGroup
+
+# Class for Role.
+services.SecurityService.role.class=org.apache.turbine.om.security.TurbineRole
+
+# Class for Permission.
+services.SecurityService.permission.class=org.apache.turbine.om.security.TurbinePermission
+]]></source>
+
+<p>
+Now the security service needs to know your LDAP configuration. Note that using
+<code>sAMAccountName</code> as user name allows you to log in with the same name
+as in Windows. You can, however, use any other attribute, like
+<code>userPrincipalName</code> (eMail-address), for example.
+</p>
+
+<source><![CDATA[
+services.SecurityService.ldap.security.authentication=simple
+services.SecurityService.ldap.port=389
+services.SecurityService.ldap.host=ad.acme.com
+
+#
+# The user name of the admin user. The admin user should be able to
+# read from the LDAP repository.
+# Characters '/' are replaced by '=' and '%' are replaced by ','.
+#
+# Default: none
+#
+services.SecurityService.ldap.admin.username=CN/JoeAdmin%CN/Users%DC/acme%DC/com
+services.SecurityService.ldap.admin.password=password
+
+#
+# The directory base to search.
+# '/' are replaced by '=' and '%' are replaced by ','.
+#
+# Default: none
+#
+services.SecurityService.ldap.basesearch=CN/Users%DC/acme%DC/com
+
+services.SecurityService.ldap.dn.attribute=distinguishedName
+services.SecurityService.ldap.provider=com.sun.jndi.ldap.LdapCtxFactory
+
+# Active Directory settings
+# services.SecurityService.ldap.user.userid=userAccountControl
+services.SecurityService.ldap.user.username=sAMAccountName
+#services.SecurityService.ldap.user.username=cn
+services.SecurityService.ldap.user.firstname=givenName
+services.SecurityService.ldap.user.lastname=sn
+services.SecurityService.ldap.user.email=userPrincipalName
+services.SecurityService.ldap.user.password=userPassword
+]]></source>
+
+<p>
+See the <a href="security-service.html">Security Service</a> page
+for details of these and other properties that may also need to be configured.
+</p>
+
+</section>
+
+</body>
+</document>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pool-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pool-service.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pool-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pool-service.xml Sun May 13 17:20:09 2007
@@ -59,7 +59,7 @@
<p>
An ArrayCtorRecyclable interface extends the Recyclable interface providing
a more efficient recycle method with less reflection for recycling frequently
-used objects having constuctors with parameters.
+used objects having constructors with parameters.
</p>
</section>
@@ -104,7 +104,7 @@
<p>
The Pool Service can be called instead of the Factory Service, when instantiating
-objects that are needed repeatedly e.g. for processing client requests. Intances
+objects that are needed repeatedly e.g. for processing client requests. Instances
of RunData implementations, ParameterParser and CookieParser implementations,
Pull Service tools, etc, are typical examples of pooled objects. Used objects
must be returned to the Pool Service for recycling. The TurbinePool class is a
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/rundata-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/rundata-service.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/rundata-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/rundata-service.xml Sun May 13 17:20:09 2007
@@ -253,7 +253,7 @@
RunData's HttpSession until they are saved into the session through
data.save(). The AccessCounter is persistent storage and is saved into
the database. The AccessCounter for the session counts the number of
-pages that are requested throgh Turbine for the user's session. Once
+pages that are requested through Turbine for the user's session. Once
their session logs out or the session times out, that information is
lost. The user.setPerm() method allows for information to be stored
persistently into the database as a HashTable entry. The example above
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml Sun May 13 17:20:09 2007
@@ -101,7 +101,7 @@
#
# Set enabled to true to start the scheduler. The scheduler can be
-# stopped and started after Turbine has been intialized. See the
+# stopped and started after Turbine has been initialized. See the
# javadocs for org.apache.turbine.services.schedule.TurbineScheduler
# for the methods calls.
#
@@ -207,7 +207,7 @@
Note that the object is in the com.mycompany.modules. This assumes that the
package com.mycompany.modules is in the Turbine module path, which is in the
module.packages directive in the TurbineResources.properties.
-The ScheduledJobLoader object loads the Task upon Turbine initilization also
+The ScheduledJobLoader object loads the Task upon Turbine initialization also
searches for a <i>scheduledjobs</i> package which contains the Task object.
</p>
@@ -363,7 +363,7 @@
</p>
<p>
- The Scheduler Service uses a seperate thread for each Task it runs to ensure
+ The Scheduler Service uses a separate thread for each Task it runs to ensure
that every job runs on time. It's the programmer's responsibility to ensure
that proper precautions to handle issues such as synchronization and long
running jobs. As always, check through the relevant Javadocs and source code
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/security-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/security-service.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/security-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/security-service.xml Sun May 13 17:20:09 2007
@@ -122,7 +122,7 @@
#
# This is the class that implements the ACL interface.
# You want to override this setting only if you want your ACL
-# implementation to provide application specific addtional
+# implementation to provide application specific additional
# functionality.
#
@@ -165,7 +165,7 @@
# Configuration for the LDAP Security Service implementation
-#services.SecurityService.ldap.security.athentication=simple
+#services.SecurityService.ldap.security.authentication=simple
#services.SecurityService.ldap.port=<LDAP PORT>
#services.SecurityService.ldap.host=<LDAP HOST>
#services.SecurityService.ldap.admin.username=<ADMIN USERNAME>
@@ -184,7 +184,7 @@
# services.SecurityService.ldap.security.authentication=simple
#
-# The host name where the LDAP server is listenting.
+# The host name where the LDAP server is listening.
#
# Default: localhost
#
@@ -192,7 +192,7 @@
# services.SecurityService.ldap.host=localhost
#
-# The port number where the LDAP server is listenting.
+# The port number where the LDAP server is listening.
#
# Default: 389
#
@@ -202,7 +202,7 @@
#
# The user name of the admin user. The admin user should be able to
# read from the LDAP repository.
-# Characteres '/' are replaced by '=' and '%' are replaced by ','.
+# Characters '/' are replaced by '=' and '%' are replaced by ','.
#
# Default: none
#
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/session-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/session-service.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/session-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/session-service.xml Sun May 13 17:20:09 2007
@@ -113,7 +113,7 @@
]]></source>
<p>
- There is also a pull tool avilable for accessing this service. To make it
+ There is also a pull tool available for accessing this service. To make it
available for use in your velocity templates, add the following line to
your TR.props file.
</p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/uniqueid-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/uniqueid-service.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/uniqueid-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/uniqueid-service.xml Sun May 13 17:20:09 2007
@@ -32,7 +32,8 @@
<section name="Unique ID Service">
<p>
-The UniqueId Service is an identifier generator that provides access to Turbine instance specific ID's in several different formats.
+The UniqueId Service is an identifier generator that provides access to Turbine
+instance specific ID's in several different formats.
</p>
@@ -66,9 +67,11 @@
The Facade class, TurbineUniqueId, exposes three methods that produce unique identifiers:
</p>
-<li>getInstanceId() returns an identifier for this Turbine instance that is unique both on the server and worldwide.</li>
+<li>getInstanceId() returns an identifier for this Turbine instance that is
+ unique both on the server and worldwide.</li>
<li>getPseudorandomId() returns a unique identifier that looks like random data.</li>
-<li>getUniqueId() returns an identifier that is unique within this instance but does not have random-like appearance.</li>
+<li>getUniqueId() returns an identifier that is unique within this instance but
+ does not have random-like appearance.</li>
<p>
As an example of the output for these Id's, the following is a screen:
@@ -126,7 +129,9 @@
<p>
-Internally Turbine uses the service for naming of temporary files stored on the server as part of the Upload Service. The FileItem is named with the getInstanceId() method to avoid temporary file clashes until the system retrieves the file.
+Internally Turbine uses the service for naming of temporary files stored on the
+server as part of the Upload Service. The FileItem is named with the getInstanceId()
+method to avoid temporary file clashes until the system retrieves the file.
</p>
</section>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/upload-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/upload-service.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/upload-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/upload-service.xml Sun May 13 17:20:09 2007
@@ -97,7 +97,7 @@
</p>
<p>
-Set the remaining values to ones approriate for your installation. On Win32
+Set the remaining values to ones appropriate for your installation. On Win32
file systems for the repository directive, an entry of the form:
<ul>
<code>f:\path\to\upload\repository</code>
@@ -123,7 +123,7 @@
<p>
The Upload Service manages if the FileItem is stored in Memory or in the
Repository specified in TurbineReources.properties. It is also possible to
-overide the TurbineResources setting for the repository by using
+override the TurbineResources setting for the repository by using
TurbineUpload.getRequest() to parse the request with a custom repository
directory. The TurbineUpload object serves as a Facade to the Upload Service
by making available static methods to manage the upload internally in your
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-experiment.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-experiment.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-experiment.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-experiment.xml Sun May 13 17:20:09 2007
@@ -36,8 +36,8 @@
<em>The Oregon Experiment</em>. <em>The Oregon Experiment</em>
is the third volume in a series of books written by
Christopher Alexander describing methodologies and patterns
- for designing healthy architechural structures that
- satisfy human needs and contribute postively overall
+ for designing healthy architectural structures that
+ satisfy human needs and contribute positively overall
to the surrounding ecology.
</p>
@@ -115,7 +115,7 @@
<p>
<a href="mailto:dl@cs.oswego.edu">Doug Lea</a> has written an
- excellent article on the writings of Christoper Alexander and how
+ excellent article on the writings of Christopher Alexander and how
they relate to the practice of OO software development:
<a href="http://gee.cs.oswego.edu/dl/ca/ca/ca.html">
Christopher Alexander: An Introduction for Object-Oriented Designers
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-schema.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-schema.xml?view=diff&rev=537684&r1=537683&r2=537684
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-schema.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/turbine-schema.xml Sun May 13 17:20:09 2007
@@ -43,7 +43,7 @@
The naming scheme is that the Turbine specific tables are prefixed with
"TURBINE_". This is to avoid name collisions with applications for common tables
such as PERMISSION or ROLE and also to avoid name collisions with reserved
-keywords in differant databases.
+keywords in different databases.
</p>
<p>
@@ -305,7 +305,7 @@
</table>
<p>
The TURBINE_ROLE_PERMISSION table is a bridging table between TURBINE_ROLE and
-TURBINE_PERMISSION that allows a several differant roles to make use of the
+TURBINE_PERMISSION that allows a several different roles to make use of the
same permission.
</p>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org