jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r739802 [2/13] - in /incubator/jspwiki/trunk: ./ doc/ etc/ etc/i18n/ etc/ini/ src/WebContent/ src/WebContent/WEB-INF/ src/WebContent/admin/ src/WebContent/scripts/ src/WebContent/templates/default/ src/WebContent/templates/default/admin/ sr...
Date Sun, 01 Feb 2009 18:04:50 GMT
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Feb  1 18:04:05 2009
@@ -306,7 +306,7 @@
       <arg line="${srcfiles}"/>
     </exec>
     <!-- Migrate the JSPs -->
-    <java classname="com.ecyrd.jspwiki.ui.migrator.JspMigrator" fork="yes" maxmemory="512m">
+    <java classname="org.apache.wiki.ui.migrator.JspMigrator" fork="yes" maxmemory="512m">
       <classpath>
          <path refid="path.tests" />
       </classpath>
@@ -798,7 +798,7 @@
            <path refid="path.tests" />
         </classpath>
         <sysproperty key="jspwiki.tests.auth" value="true" />
-        <arg value="com.ecyrd.jspwiki.AllTests" />
+        <arg value="org.apache.wiki.AllTests" />
      </java>
 
   </target>
@@ -808,7 +808,7 @@
        The webapps deployed to Jetty contain 2 sample users:
        - 'janne' with password 'myP@5sw0rd' and role of 'Authenticated'
        - 'admin' with password 'myP@5sw0rd' and roles of 'Authenticated', 'Admin'
-       These are the same as the test users in tests/com.ecyrd.jspwiki.auth.Users.
+       These are the same as the test users in tests/org.apache.wiki.auth.Users.
   -->
   <target name="webtests" depends="jar,tests-init,jartests,tests-db-init,war">
     <mkdir dir="${webtests.temp}" />
@@ -818,9 +818,9 @@
     <copy file="${tests}/etc/jspwiki.properties"
         toFile="${webtests.build}/jspwiki.properties.tmpl" flatten="true" />
     <propertyfile file="${webtests.build}/jspwiki.properties.tmpl">
-      <entry key="jspwiki.authorizer" value="com.ecyrd.jspwiki.auth.authorize.WebContainerAuthorizer" />
-      <entry key="jspwiki.userdatabase" value="com.ecyrd.jspwiki.auth.user.XMLUserDatabase" />
-      <entry key="jspwiki.groupdatabase" value="com.ecyrd.jspwiki.auth.authorize.XMLGroupDatabase" />
+      <entry key="jspwiki.authorizer" value="org.apache.wiki.auth.authorize.WebContainerAuthorizer" />
+      <entry key="jspwiki.userdatabase" value="org.apache.wiki.auth.user.XMLUserDatabase" />
+      <entry key="jspwiki.groupdatabase" value="org.apache.wiki.auth.authorize.XMLGroupDatabase" />
       <entry key="jspwiki.referenceStyle" value="relative" />
       <entry key="jspwiki.userdatabase.hashPrefix" value="false" />
       <entry key="log4j.appender.TestContainerLog.File" value="${basedir}/${webtests.build}/testcontainer.log" />
@@ -849,8 +849,8 @@
     <webtest-setup context="test-custom-jdbc"
       webxml="${webtests.build}/web.xml.custom">
       <propertyfile-entries>
-        <entry key="jspwiki.userdatabase" value="com.ecyrd.jspwiki.auth.user.JDBCUserDatabase" />
-        <entry key="jspwiki.groupdatabase" value="com.ecyrd.jspwiki.auth.authorize.JDBCGroupDatabase" />
+        <entry key="jspwiki.userdatabase" value="org.apache.wiki.auth.user.JDBCUserDatabase" />
+        <entry key="jspwiki.groupdatabase" value="org.apache.wiki.auth.authorize.JDBCGroupDatabase" />
       </propertyfile-entries>
     </webtest-setup>
 
@@ -858,8 +858,8 @@
     <webtest-setup context="test-container-jdbc"
       webxml="${webtests.build}/web.xml.container">
       <propertyfile-entries>
-        <entry key="jspwiki.userdatabase" value="com.ecyrd.jspwiki.auth.user.JDBCUserDatabase" />
-        <entry key="jspwiki.groupdatabase" value="com.ecyrd.jspwiki.auth.authorize.JDBCGroupDatabase" />
+        <entry key="jspwiki.userdatabase" value="org.apache.wiki.auth.user.JDBCUserDatabase" />
+        <entry key="jspwiki.groupdatabase" value="org.apache.wiki.auth.authorize.JDBCGroupDatabase" />
       </propertyfile-entries>
     </webtest-setup>
 
@@ -987,7 +987,7 @@
 
       <!-- Start Jetty with our test context -->
       <echo message="Starting Jetty."/>
-      <java classname="com.ecyrd.jspwiki.web.TestContainer" fork="true" spawn="true">
+      <java classname="org.apache.wiki.web.TestContainer" fork="true" spawn="true">
         <classpath>
            <path refid="path.tests" />
         </classpath>
@@ -1034,7 +1034,7 @@
        Don't worry about that. The JDBC-related test classes, by the way,
        are these:
 
-          com.ecyrd.jspwiki.auth.user.JDBCUserDatabaseTest
+          org.apache.wiki.auth.user.JDBCUserDatabaseTest
 
        To run JDBC-related unit tests, you need to:
 
@@ -1106,7 +1106,7 @@
           find it, for example CATALINA_HOME/common/lib
        5) Build JSPWiki, and start it up!
 
-       See the Javadoc for com.ecyrd.jspwiki.auth.user.JDBCUserDatabase
+       See the Javadoc for org.apache.wiki.auth.user.JDBCUserDatabase
        for details and examples.
   -->
 

Modified: incubator/jspwiki/trunk/doc/README - Stripes Migration
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/README%20-%20Stripes%20Migration?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/doc/README - Stripes Migration (original)
+++ incubator/jspwiki/trunk/doc/README - Stripes Migration Sun Feb  1 18:04:05 2009
@@ -25,7 +25,7 @@
 What JSP authors must do:
 Include these lines for all top-level JSPs:
 
-<%@ page import="com.ecyrd.jspwiki.action.*" %>
+<%@ page import="org.apache.wiki.action.*" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 
 WikiContext Creation
@@ -39,7 +39,7 @@
 
 ...with these:
 
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.LoginActionBean"/>
+<stripes:useActionBean beanclass="org.apache.wiki.action.LoginActionBean"/>
 
 To retrieve the WikiActionBean later, scriptlet code should call this static method:
 
@@ -209,7 +209,7 @@
 
 1) Injection by UseActionBeanTag due to <stripes:useActionBean> tag in JSP. This is the preferred way because it can be done with only a single changed line at the top of a top-level JSP:
 
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.____ActionBean"/>
+<stripes:useActionBean beanclass="org.apache.wiki.action.____ActionBean"/>
 
 Technically, the WikiActionBean is looked up by Stripes' configured ActionResolver (by default, the AnnotatedClassActionResolver); the bean itself is instantiated using its zero-argument constructor. Stripes guarantees that the following things happen after instantiation, as part of its ActionBeanResolution lifecycle stage:
 - The WikiActionBean's setActionBeanContext() method is called (by AnnotatedClassActionResolver); this causes a reference to a new WikiActionBeanContext to be set in the WikiActionBean
@@ -450,7 +450,7 @@
 with this:
 
       <div class="error">
-        <stripes:errors beanclass="com.ecyrd.jspwiki.action.LoginActionBean"/>
+        <stripes:errors beanclass="org.apache.wiki.action.LoginActionBean"/>
       </div>
 
 However, MessagesTag has been retrofitted to print Stripes errors for the current ActionBean in addition to the standard kind. So even though <stripes:errors> are preferred, <wiki:Messages> works for now (but should be considered deprecated). <wiki:Messages> tag re-factored so the set of Valididation for the current ActionBean are always appended to the messages list. This allows <wiki:message> to be used transparently in place of <stripes:errors>.

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Sun Feb  1 18:04:05 2009
@@ -312,7 +312,7 @@
 # Formerly prefs.fullname
 profile.fullname=Name
 # Formerly prefs.save.submit
-com.ecyrd.jspwiki.action.UserProfileActionBean.save=Save profile
+org.apache.wiki.action.UserProfileActionBean.save=Save profile
 #Formerly prefs.assertedname
 assertedName=
 #Formerly edit.chooseeditor
@@ -334,6 +334,6 @@
 #Formerly prefs.user.timezone
 timeZone=Time zone
 #Formerly prefs.save.prefs.submit
-com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Save preferences
+org.apache.wiki.action.UserPreferencesActionBean.save=Save preferences
 # Formerly prefs.clear.submit
 clearAssertedName=Reset preferences

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties Sun Feb  1 18:04:05 2009
@@ -319,7 +319,7 @@
 # Formerly prefs.fullname
 profile.fullname=Name
 # Formerly prefs.save.submit
-com.ecyrd.jspwiki.action.UserProfileActionBean.save=Profil speichern
+org.apache.wiki.action.UserProfileActionBean.save=Profil speichern
 #Formerly prefs.assertedname
 assertedName=
 #Formerly edit.chooseeditor
@@ -341,7 +341,7 @@
 #Formerly prefs.user.timezone
 timeZone=Zeitzone
 #Formerly prefs.save.prefs.submit
-com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Benutzereinstellungen speichern
+org.apache.wiki.action.UserPreferencesActionBean.save=Benutzereinstellungen speichern
 # Formerly prefs.clear.submit
 clearAssertedName=Benutzereinstellungen zurücksetzen
 

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties Sun Feb  1 18:04:05 2009
@@ -228,7 +228,7 @@
 profile.password=Contraseña
 passwordAgain=Verificación de contraseña
 profile.fullname=Nombre
-com.ecyrd.jspwiki.action.UserProfileActionBean.save=Guardar perfil
+org.apache.wiki.action.UserProfileActionBean.save=Guardar perfil
 assertedName=Nombre
 editor=Editor
 sectionEditing=Edición de Secciones
@@ -239,5 +239,5 @@
 Orientation.RIGHT=Derecha
 timeFormat=Selecciona el formato de la Hora
 timeZone=Selecciona la Zona Horaria
-com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Guardar Preferencias de Usuario
+org.apache.wiki.action.UserPreferencesActionBean.save=Guardar Preferencias de Usuario
 clearAssertedName=Borrar Preferencias de Usuario

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties Sun Feb  1 18:04:05 2009
@@ -183,7 +183,7 @@
 profile.password=Salasana
 passwordAgain=Vahvista salasana
 profile.fullname=Nimi
-com.ecyrd.jspwiki.action.UserProfileActionBean.save=Tallenna profiili
+org.apache.wiki.action.UserProfileActionBean.save=Tallenna profiili
 assertedName=Nimi
 editor=Muokkain
 sectionEditing=Osioiden muokkaus
@@ -194,5 +194,5 @@
 Orientation.RIGHT=Oikealla
 timeFormat=Valitse ajan esitysmuoto
 timeZone=Valitse aikavyöhykkeesi
-com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Tallenna asetukset
+org.apache.wiki.action.UserPreferencesActionBean.save=Tallenna asetukset
 clearAssertedName=Poista käyttäjänimi

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties Sun Feb  1 18:04:05 2009
@@ -241,7 +241,7 @@
 profile.password=Mot de passe
 passwordAgain=V\u00E9rification du mot de passe
 profile.fullname=Nom
-com.ecyrd.jspwiki.action.UserProfileActionBean.save=Enregistrer le profil
+org.apache.wiki.action.UserProfileActionBean.save=Enregistrer le profil
 assertedName=Nom
 editor=Editeur
 sectionEditing=Edition de sections
@@ -252,5 +252,5 @@
 Orientation.RIGHT=Droite
 timeFormat=S\u00E9lectionner le format horaire
 timeZone=S\u00E9lectionner le fuseau horaire
-com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Enregistrer les pr\u00E9f\u00E9rences utilisateur
+org.apache.wiki.action.UserPreferencesActionBean.save=Enregistrer les pr\u00E9f\u00E9rences utilisateur
 clearAssertedName=Nettoyer les pr\u00E9f\u00E9rences utilisateur

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties Sun Feb  1 18:04:05 2009
@@ -222,7 +222,7 @@
 profile.password=Password
 passwordAgain=Verifica password
 profile.fullname=Nome
-com.ecyrd.jspwiki.action.UserProfileActionBean.save=Salva il profilo
+org.apache.wiki.action.UserProfileActionBean.save=Salva il profilo
 assertedName=Nome
 editor=Editor
 sectionEditing=Editing Sezioni
@@ -233,5 +233,5 @@
 Orientation.RIGHT=Destra
 timeFormat=Formato della data
 timeZone=Seleziona la Time Zone
-com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Salva le preferenze
+org.apache.wiki.action.UserPreferencesActionBean.save=Salva le preferenze
 clearAssertedName=Ripulisci le preferenze

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties Sun Feb  1 18:04:05 2009
@@ -227,7 +227,7 @@
 profile.password=Wachtwoord
 passwordAgain=Bevestig wachtwoord
 profile.fullname=Naam
-com.ecyrd.jspwiki.action.UserProfileActionBean.save=Bewaar Gebruikersprofiel
+org.apache.wiki.action.UserProfileActionBean.save=Bewaar Gebruikersprofiel
 assertedName=Naam
 editor=Editor
 sectionEditing=Sectie Editing
@@ -238,5 +238,5 @@
 Orientation.RIGHT=Rechts
 timeFormat=Wijzig het Datum/Tijd-formaat
 timeZone=Wijzig de Tijd-zone
-com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Bewaar Gebruikers Instellingen
+org.apache.wiki.action.UserPreferencesActionBean.save=Bewaar Gebruikers Instellingen
 clearAssertedName=Verwijder Gebruikers Instellingen

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties Sun Feb  1 18:04:05 2009
@@ -226,7 +226,7 @@
 profile.password=\u041f\u0430\u0440\u043e\u043b\u044c
 passwordAgain=\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043f\u0430\u0440\u043e\u043b\u044f
 profile.fullname=\u0418\u043c\u044f
-com.ecyrd.jspwiki.action.UserProfileActionBean.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044c
+org.apache.wiki.action.UserProfileActionBean.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044c
 assertedName=\u0418\u043c\u044f
 editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440
 sectionEditing=\u0421\u0435\u043a\u0446\u0438\u044f \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f
@@ -237,5 +237,5 @@
 Orientation.RIGHT=\u041f\u0440\u0430\u0432\u043e
 timeFormat=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0439 \u0444\u043e\u0440\u043c\u0430\u0442
 timeZone=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u0437\u043e\u043d\u0430
-com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
+org.apache.wiki.action.UserPreferencesActionBean.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
 clearAssertedName=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties Sun Feb  1 18:04:05 2009
@@ -225,7 +225,7 @@
 profile.password=\u5bc6\u7801
 passwordAgain=\u5bc6\u7801\u9a8c\u8bc1
 profile.fullname=\u540d\u5b57
-com.ecyrd.jspwiki.action.UserProfileActionBean.save=\u4fdd\u5b58\u6982\u8981\u4fe1\u606f
+org.apache.wiki.action.UserProfileActionBean.save=\u4fdd\u5b58\u6982\u8981\u4fe1\u606f
 assertedName=\u540d\u5b57
 editor=\u7f16\u8f91\u5668
 sectionEditing=\u6bb5\u843d\u7f16\u8f91
@@ -236,5 +236,5 @@
 Orientation.RIGHT=\u53f3\u4fa7
 timeFormat=\u65f6\u95f4\u683c\u5f0f
 timeZone=\u65f6\u533a
-com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=\u4fdd\u5b58\u7528\u6237\u9996\u9009\u9879
+org.apache.wiki.action.UserPreferencesActionBean.save=\u4fdd\u5b58\u7528\u6237\u9996\u9009\u9879
 clearAssertedName=\u6e05\u9664\u7528\u6237\u9996\u9009\u9879

Modified: incubator/jspwiki/trunk/etc/ini/classmappings.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/ini/classmappings.xml?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/ini/classmappings.xml (original)
+++ incubator/jspwiki/trunk/etc/ini/classmappings.xml Sun Feb  1 18:04:05 2009
@@ -28,7 +28,7 @@
   
 <classmappings>
   <mapping>
-    <requestedClass>com.ecyrd.jspwiki.render.RenderingManager</requestedClass>
-    <mappedClass>com.ecyrd.jspwiki.render.RenderingManager</mappedClass>
+    <requestedClass>org.apache.wiki.render.RenderingManager</requestedClass>
+    <mappedClass>org.apache.wiki.render.RenderingManager</mappedClass>
   </mapping>
 </classmappings>

Modified: incubator/jspwiki/trunk/etc/ini/jspwiki_module.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/ini/jspwiki_module.xml?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/ini/jspwiki_module.xml (original)
+++ incubator/jspwiki/trunk/etc/ini/jspwiki_module.xml Sun Feb  1 18:04:05 2009
@@ -16,7 +16,7 @@
       <path>editors/plain.jsp</path>
       <minVersion>2.4</minVersion>
       <maxVersion>3.0</maxVersion>
-      <adminBean>com.ecyrd.jspwiki.ui.admin.beans.PlainEditorAdminBean</adminBean>
+      <adminBean>org.apache.wiki.ui.admin.beans.PlainEditorAdminBean</adminBean>
    </editor>
 <!-- 
    <editor name="WikiWizard">
@@ -24,21 +24,21 @@
       <path>editors/WikiWizard.jsp</path>
       <minVersion>2.4</minVersion>
       <maxVersion>2.8</maxVersion>
-      <adminBean>com.ecyrd.jspwiki.ui.admin.beans.WikiWizardAdminBean</adminBean>
+      <adminBean>org.apache.wiki.ui.admin.beans.WikiWizardAdminBean</adminBean>
    </editor>
 -->
-   <plugin class="com.ecyrd.jspwiki.plugin.IfPlugin">
+   <plugin class="org.apache.wiki.plugin.IfPlugin">
       <author>Janne Jalkanen</author>
       <minVersion>2.4</minVersion>
       <alias>If</alias>
    </plugin>
 
-   <plugin class="com.ecyrd.jspwiki.plugin.Note">
+   <plugin class="org.apache.wiki.plugin.Note">
       <author>Janne Jalkanen</author>
       <minVersion>2.4</minVersion>
    </plugin>
 
-   <filter class="com.ecyrd.jspwiki.filters.SpamFilter">
+   <filter class="org.apache.wiki.filters.SpamFilter">
       <author>Janne Jalkanen</author>
       <minVersion>2.6</minVersion>
    </filter>

Modified: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl Sun Feb  1 18:04:05 2009
@@ -35,7 +35,7 @@
 #    VersioningFileProvider - for simple, non-RCS based versioning storage.
 #
 #  Note that if you're upgrading from JSPWiki 1.x, then you need to remove the
-#  "com.ecyrd.jspwiki." part from the beginning of the path.
+#  "org.apache.wiki." part from the beginning of the path.
 #
 jspwiki.pageProvider = FileSystemProvider
 
@@ -318,7 +318,7 @@
 #
 #  jspwiki.plugin.searchPath = org.myorganisation.jspwiki.myplugins,com.foobar.myplugins
 #
-#  The default path is "com.ecyrd.jspwiki.plugin", and it will be always
+#  The default path is "org.apache.wiki.plugin", and it will be always
 #  the last item on the path.  This allows you to override JSPWiki default
 #  plugins.  Note that you are only adding to the path, not replacing it (ie.
 #  the default path is never removed.)
@@ -426,14 +426,14 @@
 #  If you do not wish to use container-managed authentication, you can use JSPWiki's
 #  own custom authentication system. This uses a JAAS LoginModule (supplied below)
 #  to log in the user. You can use any JAAS LoginModule you want.
-#  The default class is com.ecyrd.jspwiki.auth.login.UserDatabaseLoginModule,
+#  The default class is org.apache.wiki.auth.login.UserDatabaseLoginModule,
 #  which compares the supplied username and hashed password with the values stored
 #  in the configured UserDatabase (see USER DATABASE below).
 #
 #  Supply the JAAS LoginModule class used for custom authentication here.
 #  The implementation MUST have a zero-argument constructor (as noted in the
 #  javax.security.auth.spi.LoginModule Javadocs).
-jspwiki.loginModule.class = com.ecyrd.jspwiki.auth.login.UserDatabaseLoginModule
+jspwiki.loginModule.class = org.apache.wiki.auth.login.UserDatabaseLoginModule
 
 #
 # JAAS LoginContext parameters used to initialize the LoginModule. Note that 'param1'
@@ -497,7 +497,7 @@
 #  <auth-constraint>/<role-name> elements. However, you can use another
 #  Authorizer if you wish; specify that class here.
 
-jspwiki.authorizer = com.ecyrd.jspwiki.auth.authorize.WebContainerAuthorizer
+jspwiki.authorizer = org.apache.wiki.auth.authorize.WebContainerAuthorizer
 
 #  B) GROUPS
 #  As an additional source of authorization, users can belong to discretionary
@@ -505,7 +505,7 @@
 #  GroupDatabase. The default group database uses an XML file for persistent
 #  storage. Override with your own GroupDatabase implementation with this property:
 
-jspwiki.groupdatabase = com.ecyrd.jspwiki.auth.authorize.XMLGroupDatabase
+jspwiki.groupdatabase = org.apache.wiki.auth.authorize.XMLGroupDatabase
 
 #  The default group database implementation stores member lists
 #  in an XML file. The location of this file should be in a secure directory
@@ -525,7 +525,7 @@
 #  uses an XML file for persistent storage.
 #  Override with your own UserDatabase implementation with this property:
 
-jspwiki.userdatabase = com.ecyrd.jspwiki.auth.user.XMLUserDatabase
+jspwiki.userdatabase = org.apache.wiki.auth.user.XMLUserDatabase
 
 #  The default user database implementation stores usernames and passwords
 #  in an XML file. Passwords are SHA-1 hashed. The location of this file
@@ -545,7 +545,7 @@
 # See the online AuthenticationAndAuthorization2.3 docs for details on
 # how to configure it.
 
-#jspwiki.userdatabase = com.ecyrd.jspwiki.auth.user.JDBCUserDatabase
+#jspwiki.userdatabase = org.apache.wiki.auth.user.JDBCUserDatabase
 
 #  If your JSPWiki user database shares login information with your
 #  web container's authentication realm, you can configure JSPWiki to
@@ -562,7 +562,7 @@
 #  markup. For example: "[{ALLOW edit Charlie}]". If using a custom
 #  ACL manager, specify the AclManager implementation class here:
 
-jspwiki.aclManager = com.ecyrd.jspwiki.auth.acl.DefaultAclManager
+jspwiki.aclManager = org.apache.wiki.auth.acl.DefaultAclManager
 
 #############################################################################
 #
@@ -668,8 +668,8 @@
 #
 #  JDBC Configuration. Tells JSPWiki which tables and columns to map
 #  to for the JDBCUserDatabase and JDBCGroupDatabase. For more info, see the
-#  JavaDoc for classes com.ecyrd.jspwiki.auth.user.JDBCUserDatabase and
-#  com.ecyrd.jspwiki.auth.authorize.JDBCGroupDatabase.
+#  JavaDoc for classes org.apache.wiki.auth.user.JDBCUserDatabase and
+#  org.apache.wiki.auth.authorize.JDBCGroupDatabase.
 #
 jspwiki.userdatabase.datasource=jdbc/UserDatabase
 jspwiki.userdatabase.table=users
@@ -718,7 +718,7 @@
 #     You will need to configure your container to provide a JavaMail
 #     resource factory. See your container documentation, or check our
 #     fairly complete documentation (with examples for Tomcat) in
-#     the JavaDocs for com.ecyrd.jspwiki.util.MailUtil.
+#     the JavaDocs for org.apache.wiki.util.MailUtil.
 #
 #  JNDI resource name. The commented-out value is the default.
 #jspwiki.mail.jndiname = mail/Session

Modified: incubator/jspwiki/trunk/src/WebContent/Captcha.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Captcha.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Captcha.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Captcha.jsp Sun Feb  1 18:04:05 2009
@@ -1,17 +1,17 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
 <%@ page import="org.apache.commons.httpclient.*" %>
 <%@ page import="org.apache.commons.httpclient.methods.*" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.util.*" %>
-<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.util.*" %>
+<%@ page import="org.apache.wiki.ui.EditorManager" %>
 <%@ page import="org.apache.commons.lang.time.StopWatch" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
 
 
 <%!

Modified: incubator/jspwiki/trunk/src/WebContent/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Comment.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Comment.jsp Sun Feb  1 18:04:05 2009
@@ -1,25 +1,25 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.filters.*" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.filters.*" %>
 <%@ page import="java.util.*" %>
 <%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="com.ecyrd.jspwiki.htmltowiki.HtmlStringToWikiTranslator" %>
-<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
-<%@ page import="com.ecyrd.jspwiki.util.HttpUtil" %>
-<%@ page import="com.ecyrd.jspwiki.preferences.Preferences" %>
-<%@ page import="com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule" %>
-<%@ page import="com.ecyrd.jspwiki.workflow.DecisionRequiredException" %>
-<%@ page import="com.ecyrd.jspwiki.preferences.Preferences.TimeFormat" %>
+<%@ page import="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" %>
+<%@ page import="org.apache.wiki.ui.EditorManager" %>
+<%@ page import="org.apache.wiki.util.HttpUtil" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
+<%@ page import="org.apache.wiki.auth.login.CookieAssertionLoginModule" %>
+<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
+<%@ page import="org.apache.wiki.preferences.Preferences.TimeFormat" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="javax.servlet.http.Cookie" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<%@ page import="org.apache.jspwiki.api.WikiPage" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.CommentActionBean" event="comment" id="wikiActionBean" />
+<%@ page import="org.apache.wiki.util.TextUtil" %>
+<%@ page import="org.apache.wiki.api.WikiPage" %>
+<stripes:useActionBean beanclass="org.apache.wiki.action.CommentActionBean" event="comment" id="wikiActionBean" />
 <%!
     Logger log = LoggerFactory.getLogger("JSPWiki");
 

Modified: incubator/jspwiki/trunk/src/WebContent/CookieError.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/CookieError.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/CookieError.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/CookieError.jsp Sun Feb  1 18:04:05 2009
@@ -1,7 +1,7 @@
-<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="org.apache.wiki.*" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" id="wikiActionBean" />
 
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );

Modified: incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.UserProfileActionBean" event="create" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.UserProfileActionBean" event="create" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/CreateProfileContent.jsp" />

Modified: incubator/jspwiki/trunk/src/WebContent/Delete.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Delete.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Delete.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Delete.jsp Sun Feb  1 18:04:05 2009
@@ -1,13 +1,13 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
 <%@ page import="java.util.*" %>
-<%@ page import="com.ecyrd.jspwiki.attachment.Attachment" %>
-<%@ page import="org.apache.jspwiki.api.WikiPage" %>
+<%@ page import="org.apache.wiki.attachment.Attachment" %>
+<%@ page import="org.apache.wiki.api.WikiPage" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.DeleteActionBean" event="delete" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.DeleteActionBean" event="delete" id="wikiActionBean" />
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp Sun Feb  1 18:04:05 2009
@@ -1,2 +1,2 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.GroupActionBean" event="delete" id="wikiActionBean" executeResolution="true" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.GroupActionBean" event="delete" id="wikiActionBean" executeResolution="true" />

Modified: incubator/jspwiki/trunk/src/WebContent/Diff.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Diff.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Diff.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Diff.jsp Sun Feb  1 18:04:05 2009
@@ -1,13 +1,13 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.util.*" %>
-<%@ page import="com.ecyrd.jspwiki.tags.InsertDiffTag" %>
-<%@ page import="org.apache.jspwiki.api.WikiPage" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.util.*" %>
+<%@ page import="org.apache.wiki.tags.InsertDiffTag" %>
+<%@ page import="org.apache.wiki.api.WikiPage" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="diff" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="diff" id="wikiActionBean" />
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 

Modified: incubator/jspwiki/trunk/src/WebContent/Edit.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Edit.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Edit.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Edit.jsp Sun Feb  1 18:04:05 2009
@@ -1,17 +1,17 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.filters.*" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.filters.*" %>
 <%@ page import="java.util.*" %>
-<%@ page import="com.ecyrd.jspwiki.htmltowiki.HtmlStringToWikiTranslator" %>
-<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
-<%@ page import="com.ecyrd.jspwiki.workflow.DecisionRequiredException" %>
-<%@ page import="org.apache.jspwiki.api.WikiPage" %>
+<%@ page import="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" %>
+<%@ page import="org.apache.wiki.ui.EditorManager" %>
+<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
+<%@ page import="org.apache.wiki.api.WikiPage" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="edit" executeResolution="true" id="wikiActionBean" />
+<%@ page import="org.apache.wiki.util.TextUtil" %>
+<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="edit" executeResolution="true" id="wikiActionBean" />
 
 <%!
     Logger log = LoggerFactory.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.GroupActionBean" event="save" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.GroupActionBean" event="save" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/EditGroupContent.jsp" />

Modified: incubator/jspwiki/trunk/src/WebContent/Error.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Error.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Error.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Error.jsp Sun Feb  1 18:04:05 2009
@@ -1,15 +1,15 @@
 <%@ page isErrorPage="true" %>
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.action.*" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.action.*" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<%@ page import="com.ecyrd.jspwiki.util.FileUtil" %>
+<%@ page import="org.apache.wiki.util.FileUtil" %>
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ErrorActionBean" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.ErrorActionBean" id="wikiActionBean" />
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
     WikiContext wikiContext = WikiContextFactory.findContext( pageContext );

Modified: incubator/jspwiki/trunk/src/WebContent/Group.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Group.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Group.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Group.jsp Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.GroupActionBean" event="view" executeResolution="true" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.GroupActionBean" event="view" executeResolution="true" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/GroupContent.jsp" />

Modified: incubator/jspwiki/trunk/src/WebContent/Install.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Install.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Install.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Install.jsp Sun Feb  1 18:04:05 2009
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.auth.AuthenticationManager" %>
-<%@ page import="com.ecyrd.jspwiki.ui.Installer" %>
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.auth.AuthenticationManager" %>
+<%@ page import="org.apache.wiki.ui.Installer" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
 <%@ page import="java.util.ResourceBundle" %>
 <%@ page import="java.text.MessageFormat" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.InstallActionBean" event="install" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.InstallActionBean" event="install" id="wikiActionBean" />
 
 
 <%!

Modified: incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.LoginActionBean" event="view" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.LoginActionBean" event="view" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/LoginContent.jsp" />

Modified: incubator/jspwiki/trunk/src/WebContent/Logout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Logout.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Logout.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Logout.jsp Sun Feb  1 18:04:05 2009
@@ -1 +1 @@
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.LoginActionBean" event="logout" executeResolution="true" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.LoginActionBean" event="logout" executeResolution="true" id="wikiActionBean" />

Modified: incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.LoginActionBean" event="view" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.LoginActionBean" event="view" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/LostPasswordContent.jsp" />

Modified: incubator/jspwiki/trunk/src/WebContent/Message.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Message.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Message.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Message.jsp Sun Feb  1 18:04:05 2009
@@ -1,16 +1,16 @@
 <%@ page isErrorPage="true" %>
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.action.*" %>
-<%@ page import="com.ecyrd.jspwiki.ui.stripes.*" %>
-<%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.action.*" %>
+<%@ page import="org.apache.wiki.ui.stripes.*" %>
+<%@ page import="org.apache.wiki.tags.WikiTagBase" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.MessageActionBean" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.MessageActionBean" id="wikiActionBean" />
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
     WikiContext wikiContext = WikiContextFactory.findContext( pageContext );

Modified: incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp Sun Feb  1 18:04:05 2009
@@ -1,11 +1,11 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.plugin.*" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.plugin.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="edit" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="edit" id="wikiActionBean" />
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp Sun Feb  1 18:04:05 2009
@@ -1,10 +1,10 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.auth.NoSuchPrincipalException" %>
-<%@ page import="com.ecyrd.jspwiki.auth.WikiSecurityException" %>
-<%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
-<%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.auth.NoSuchPrincipalException" %>
+<%@ page import="org.apache.wiki.auth.WikiSecurityException" %>
+<%@ page import="org.apache.wiki.auth.authorize.Group" %>
+<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ page import="java.util.*" %>

Modified: incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="info" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="info" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/InfoContent.jsp" />

Modified: incubator/jspwiki/trunk/src/WebContent/PageModified.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/PageModified.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/PageModified.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/PageModified.jsp Sun Feb  1 18:04:05 2009
@@ -1,13 +1,13 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
 <%@ page import="org.apache.commons.lang.*" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.ui.EditorManager" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.PageModifiedActionBean" event="conflict" id="wikiActionBean" />
+<%@ page import="org.apache.wiki.util.TextUtil" %>
+<stripes:useActionBean beanclass="org.apache.wiki.action.PageModifiedActionBean" event="conflict" id="wikiActionBean" />
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/src/WebContent/Preview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Preview.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Preview.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Preview.jsp Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="preview" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.EditActionBean" event="preview" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/PreviewContent.jsp" />

Modified: incubator/jspwiki/trunk/src/WebContent/Rename.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Rename.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Rename.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Rename.jsp Sun Feb  1 18:04:05 2009
@@ -1,15 +1,15 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="org.apache.jspwiki.api.WikiException" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.api.WikiException" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="java.util.*" %>
 <%@ page import="java.text.*" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.RenameActionBean" event="rename" id="wikiActionBean" />
+<%@ page import="org.apache.wiki.util.TextUtil" %>
+<stripes:useActionBean beanclass="org.apache.wiki.action.RenameActionBean" event="rename" id="wikiActionBean" />
 <%!
     Logger log = LoggerFactory.getLogger("JSPWiki");
 %>

Modified: incubator/jspwiki/trunk/src/WebContent/Search.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Search.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Search.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Search.jsp Sun Feb  1 18:04:05 2009
@@ -1,16 +1,16 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.auth.*" %>
-<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.auth.*" %>
+<%@ page import="org.apache.wiki.auth.permissions.*" %>
 <%@ page import="java.util.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<%@ page import="com.ecyrd.jspwiki.search.*" %>
+<%@ page import="org.apache.wiki.search.*" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<%@ page import="com.ecyrd.jspwiki.util.TextUtil" %>
-<%@ page import="org.apache.jspwiki.api.WikiPage" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.SearchActionBean" event="find" id="wikiActionBean" />
+<%@ page import="org.apache.wiki.util.TextUtil" %>
+<%@ page import="org.apache.wiki.api.WikiPage" %>
+<stripes:useActionBean beanclass="org.apache.wiki.action.SearchActionBean" event="find" id="wikiActionBean" />
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWikiSearch");

Modified: incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp Sun Feb  1 18:04:05 2009
@@ -1,9 +1,9 @@
-<%@ page import="java.util.*,com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
+<%@ page import="java.util.*,org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
 <%@ page import="java.text.*" %>
-<%@ page import="com.ecyrd.jspwiki.rss.*" %>
-<%@ page import="com.ecyrd.jspwiki.util.*" %>
+<%@ page import="org.apache.wiki.rss.*" %>
+<%@ page import="org.apache.wiki.util.*" %>
 <%@ taglib uri="http://www.opensymphony.com/oscache" prefix="oscache" %>
 <%!
     Logger log = LoggerFactory.getLogger("JSPWiki");

Modified: incubator/jspwiki/trunk/src/WebContent/Upload.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Upload.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Upload.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Upload.jsp Sun Feb  1 18:04:05 2009
@@ -1,10 +1,10 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.UploadActionBean" event="upload" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.UploadActionBean" event="upload" id="wikiActionBean" />
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>

Modified: incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.UserPreferencesActionBean" event="prefs" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.UserPreferencesActionBean" event="prefs" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/PreferencesContent.jsp" />

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy Sun Feb  1 18:04:05 2009
@@ -30,11 +30,11 @@
 // If that seems too loose for your needs, you can restrict page-viewing
 // privileges by moving the PagePermission 'view' grant to one of the other blocks.
 
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "All" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "view";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "editPreferences";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "editProfile";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "login";
+grant principal org.apache.wiki.auth.authorize.Role "All" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "view";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "editPreferences";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "editProfile";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "login";
 };
 
 
@@ -48,9 +48,9 @@
 // Note that "modify" implies *both* "edit" and "upload", so if you wish to
 // allow editing only, then replace "modify" with "edit".
 
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "Anonymous" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "modify";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "createPages";
+grant principal org.apache.wiki.auth.authorize.Role "Anonymous" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "modify";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "createPages";
 };
 
 
@@ -59,10 +59,10 @@
 // as well as upload files.
 // They can also view the membership list of groups.
 
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "Asserted" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "modify";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "createPages";
-    permission com.ecyrd.jspwiki.auth.permissions.GroupPermission "*:*", "view";
+grant principal org.apache.wiki.auth.authorize.Role "Asserted" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "modify";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "createPages";
+    permission org.apache.wiki.auth.permissions.GroupPermission "*:*", "view";
 };
 
 
@@ -71,11 +71,11 @@
 // wiki groups; and rename existing pages. Authenticated users can also
 // edit groups they are members of.
 
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "Authenticated" {
-    permission com.ecyrd.jspwiki.auth.permissions.PagePermission "*:*", "modify,rename";
-    permission com.ecyrd.jspwiki.auth.permissions.GroupPermission "*:*", "view";
-    permission com.ecyrd.jspwiki.auth.permissions.GroupPermission "*:<groupmember>", "edit";
-    permission com.ecyrd.jspwiki.auth.permissions.WikiPermission "*", "createPages,createGroups";
+grant principal org.apache.wiki.auth.authorize.Role "Authenticated" {
+    permission org.apache.wiki.auth.permissions.PagePermission "*:*", "modify,rename";
+    permission org.apache.wiki.auth.permissions.GroupPermission "*:*", "view";
+    permission org.apache.wiki.auth.permissions.GroupPermission "*:<groupmember>", "edit";
+    permission org.apache.wiki.auth.permissions.WikiPermission "*", "createPages,createGroups";
 };
 
 
@@ -87,9 +87,9 @@
 // the wiki group "Admin" (stored by default in wiki page GroupAdmin)
 // and the container role "Admin" (managed by the web container).
 
-grant principal com.ecyrd.jspwiki.auth.GroupPrincipal "Admin" {
-    permission com.ecyrd.jspwiki.auth.permissions.AllPermission "*";
+grant principal org.apache.wiki.auth.GroupPrincipal "Admin" {
+    permission org.apache.wiki.auth.permissions.AllPermission "*";
 };
-grant principal com.ecyrd.jspwiki.auth.authorize.Role "Admin" {
-    permission com.ecyrd.jspwiki.auth.permissions.AllPermission "*";
+grant principal org.apache.wiki.auth.authorize.Role "Admin" {
+    permission org.apache.wiki.auth.permissions.AllPermission "*";
 };

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld Sun Feb  1 18:04:05 2009
@@ -13,8 +13,8 @@
 
   <tag>
     <name>AdminBeanIterator</name>
-    <tagclass>com.ecyrd.jspwiki.tags.AdminBeanIteratorTag</tagclass>
-    <teiclass>com.ecyrd.jspwiki.tags.AdminBeanIteratorInfo</teiclass>
+    <tagclass>org.apache.wiki.tags.AdminBeanIteratorTag</tagclass>
+    <teiclass>org.apache.wiki.tags.AdminBeanIteratorInfo</teiclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>id</name>
@@ -28,8 +28,8 @@
 
   <tag>
     <name>AttachmentsIterator</name>
-    <tagclass>com.ecyrd.jspwiki.tags.AttachmentsIteratorTag</tagclass>
-    <teiclass>com.ecyrd.jspwiki.tags.AttachmentsIteratorInfo</teiclass>
+    <tagclass>org.apache.wiki.tags.AttachmentsIteratorTag</tagclass>
+    <teiclass>org.apache.wiki.tags.AttachmentsIteratorInfo</teiclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>id</name>
@@ -38,19 +38,19 @@
 
   <tag>
     <name>Author</name>
-    <tagclass>com.ecyrd.jspwiki.tags.AuthorTag</tagclass>
+    <tagclass>org.apache.wiki.tags.AuthorTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>BaseURL</name>
-    <tagclass>com.ecyrd.jspwiki.tags.BaseURLTag</tagclass>
+    <tagclass>org.apache.wiki.tags.BaseURLTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>Breadcrumbs</name>
-    <tagclass>com.ecyrd.jspwiki.tags.BreadcrumbsTag</tagclass>
+    <tagclass>org.apache.wiki.tags.BreadcrumbsTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>maxpages</name>
@@ -64,7 +64,7 @@
 
   <tag>
     <name>Calendar</name>
-    <tagclass>com.ecyrd.jspwiki.tags.CalendarTag</tagclass>
+    <tagclass>org.apache.wiki.tags.CalendarTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>pageformat</name>
@@ -82,8 +82,8 @@
 
   <tag>
     <name>CheckLock</name>
-    <tagclass>com.ecyrd.jspwiki.tags.CheckLockTag</tagclass>
-    <teiclass>com.ecyrd.jspwiki.tags.CheckLockInfo</teiclass>
+    <tagclass>org.apache.wiki.tags.CheckLockTag</tagclass>
+    <teiclass>org.apache.wiki.tags.CheckLockInfo</teiclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>mode</name>
@@ -95,7 +95,7 @@
 
   <tag>
     <name>CheckRequestContext</name>
-    <tagclass>com.ecyrd.jspwiki.tags.CheckRequestContextTag</tagclass>
+    <tagclass>org.apache.wiki.tags.CheckRequestContextTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>context</name>
@@ -105,7 +105,7 @@
 
   <tag>
     <name>CheckVersion</name>
-    <tagclass>com.ecyrd.jspwiki.tags.CheckVersionTag</tagclass>
+    <tagclass>org.apache.wiki.tags.CheckVersionTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>mode</name>
@@ -114,7 +114,7 @@
 
   <tag>
     <name>CommentLink</name>
-    <tagclass>com.ecyrd.jspwiki.tags.CommentLinkTag</tagclass>
+    <tagclass>org.apache.wiki.tags.CommentLinkTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -127,7 +127,7 @@
 
   <tag>
     <name>Content</name>
-    <tagclass>com.ecyrd.jspwiki.tags.ContentTag</tagclass>
+    <tagclass>org.apache.wiki.tags.ContentTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>view</name>
@@ -173,13 +173,13 @@
 
   <tag>
     <name>ContentEncoding</name>
-    <tagclass>com.ecyrd.jspwiki.tags.ContentEncodingTag</tagclass>
+    <tagclass>org.apache.wiki.tags.ContentEncodingTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>DiffLink</name>
-    <tagclass>com.ecyrd.jspwiki.tags.DiffLinkTag</tagclass>
+    <tagclass>org.apache.wiki.tags.DiffLinkTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -200,7 +200,7 @@
 
   <tag>
     <name>EditLink</name>
-    <tagclass>com.ecyrd.jspwiki.tags.EditLinkTag</tagclass>
+    <tagclass>org.apache.wiki.tags.EditLinkTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -225,14 +225,14 @@
 
   <tag>
     <name>Editor</name>
-    <tagclass>com.ecyrd.jspwiki.tags.EditorTag</tagclass>
+    <tagclass>org.apache.wiki.tags.EditorTag</tagclass>
     <bodycontent>JSP</bodycontent>
   </tag>
 
   <tag>
     <name>EditorIterator</name>
-    <tagclass>com.ecyrd.jspwiki.tags.EditorIteratorTag</tagclass>
-    <teiclass>com.ecyrd.jspwiki.tags.EditorIteratorInfo</teiclass>
+    <tagclass>org.apache.wiki.tags.EditorIteratorTag</tagclass>
+    <teiclass>org.apache.wiki.tags.EditorIteratorInfo</teiclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>id</name>
@@ -241,20 +241,20 @@
 
   <tag>
     <name>FeedDiscovery</name>
-    <tagclass>com.ecyrd.jspwiki.tags.FeedDiscoveryTag</tagclass>
+    <tagclass>org.apache.wiki.tags.FeedDiscoveryTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>HasAttachments</name>
-    <tagclass>com.ecyrd.jspwiki.tags.HasAttachmentsTag</tagclass>
+    <tagclass>org.apache.wiki.tags.HasAttachmentsTag</tagclass>
     <bodycontent>JSP</bodycontent>
   </tag>
 
   <tag>
     <name>HistoryIterator</name>
-    <tagclass>com.ecyrd.jspwiki.tags.HistoryIteratorTag</tagclass>
-    <teiclass>com.ecyrd.jspwiki.tags.HistoryIteratorInfo</teiclass>
+    <tagclass>org.apache.wiki.tags.HistoryIteratorTag</tagclass>
+    <teiclass>org.apache.wiki.tags.HistoryIteratorInfo</teiclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>id</name>
@@ -263,13 +263,13 @@
 
   <tag>
     <name>IfNoSearchResults</name>
-    <tagclass>com.ecyrd.jspwiki.tags.IfNoSearchResultsTag</tagclass>
+    <tagclass>org.apache.wiki.tags.IfNoSearchResultsTag</tagclass>
     <bodycontent>JSP</bodycontent>
   </tag>
 
   <tag>
     <name>Include</name>
-    <tagclass>com.ecyrd.jspwiki.tags.IncludeTag</tagclass>
+    <tagclass>org.apache.wiki.tags.IncludeTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>page</name>
@@ -279,7 +279,7 @@
 
   <tag>
     <name>IncludeResources</name>
-    <tagclass>com.ecyrd.jspwiki.tags.IncludeResourcesTag</tagclass>
+    <tagclass>org.apache.wiki.tags.IncludeResourcesTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>type</name>
@@ -289,7 +289,7 @@
 
   <tag>
     <name>InsertDiff</name>
-    <tagclass>com.ecyrd.jspwiki.tags.InsertDiffTag</tagclass>
+    <tagclass>org.apache.wiki.tags.InsertDiffTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -299,7 +299,7 @@
 
   <tag>
     <name>InsertPage</name>
-    <tagclass>com.ecyrd.jspwiki.tags.InsertPageTag</tagclass>
+    <tagclass>org.apache.wiki.tags.InsertPageTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>page</name>
@@ -313,7 +313,7 @@
 
   <tag>
     <name>Link</name>
-    <tagclass>com.ecyrd.jspwiki.tags.LinkTag</tagclass>
+    <tagclass>org.apache.wiki.tags.LinkTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -378,7 +378,7 @@
 
   <tag>
     <name>LinkTo</name>
-    <tagclass>com.ecyrd.jspwiki.tags.LinkToTag</tagclass>
+    <tagclass>org.apache.wiki.tags.LinkToTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -407,7 +407,7 @@
 
   <tag>
     <name>LinkToParent</name>
-    <tagclass>com.ecyrd.jspwiki.tags.LinkToParentTag</tagclass>
+    <tagclass>org.apache.wiki.tags.LinkToParentTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -424,7 +424,7 @@
 
   <tag>
     <name>Messages</name>
-    <tagclass>com.ecyrd.jspwiki.tags.MessagesTag</tagclass>
+    <tagclass>org.apache.wiki.tags.MessagesTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>action</name>
@@ -446,13 +446,13 @@
 
   <tag>
     <name>NextVersion</name>
-    <tagclass>com.ecyrd.jspwiki.tags.NextVersionTag</tagclass>
+    <tagclass>org.apache.wiki.tags.NextVersionTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>NoSuchPage</name>
-    <tagclass>com.ecyrd.jspwiki.tags.NoSuchPageTag</tagclass>
+    <tagclass>org.apache.wiki.tags.NoSuchPageTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -462,7 +462,7 @@
 
   <tag>
     <name>PageExists</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PageExistsTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PageExistsTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -472,7 +472,7 @@
 
   <tag>
     <name>PageInfoLink</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PageInfoLinkTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PageInfoLinkTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -494,7 +494,7 @@
 
   <tag>
     <name>PageDate</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PageDateTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PageDateTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
         <name>format</name>
@@ -504,19 +504,19 @@
 
   <tag>
     <name>PageName</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PageNameTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PageNameTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>PageSize</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PageSizeTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PageSizeTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>PageType</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PageTypeTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PageTypeTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>type</name>
@@ -526,13 +526,13 @@
 
   <tag>
     <name>PageVersion</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PageVersionTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PageVersionTag</tagclass>
     <bodycontent>JSP</bodycontent>
   </tag>
 
   <tag>
     <name>Param</name>
-    <tagclass>com.ecyrd.jspwiki.tags.ParamTag</tagclass>
+    <tagclass>org.apache.wiki.tags.ParamTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>name</name>
@@ -548,13 +548,13 @@
 
   <tag>
     <name>ParentPageName</name>
-    <tagclass>com.ecyrd.jspwiki.tags.ParentPageNameTag</tagclass>
+    <tagclass>org.apache.wiki.tags.ParentPageNameTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>Permission</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PermissionTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PermissionTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>permission</name>
@@ -564,13 +564,13 @@
 
   <tag>
     <name>PreviousVersion</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PreviousVersionTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PreviousVersionTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>Plugin</name>
-    <tagclass>com.ecyrd.jspwiki.tags.PluginTag</tagclass>
+    <tagclass>org.apache.wiki.tags.PluginTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>plugin</name>
@@ -586,7 +586,7 @@
 
   <tag>
     <name>RequestResource</name>
-    <tagclass>com.ecyrd.jspwiki.tags.RequestResourceTag</tagclass>
+    <tagclass>org.apache.wiki.tags.RequestResourceTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>type</name>
@@ -600,13 +600,13 @@
 
   <tag>
     <name>RSSLink</name>
-    <tagclass>com.ecyrd.jspwiki.tags.RSSLinkTag</tagclass>
+    <tagclass>org.apache.wiki.tags.RSSLinkTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>RSSImageLink</name>
-    <tagclass>com.ecyrd.jspwiki.tags.RSSImageLinkTag</tagclass>
+    <tagclass>org.apache.wiki.tags.RSSImageLinkTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>title</name>
@@ -620,7 +620,7 @@
 
   <tag>
     <name>RSSUserlandLink</name>
-    <tagclass>com.ecyrd.jspwiki.tags.RSSCoffeeCupLinkTag</tagclass>
+    <tagclass>org.apache.wiki.tags.RSSCoffeeCupLinkTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>title</name>
@@ -630,8 +630,8 @@
 
   <tag>
     <name>SearchResultIterator</name>
-    <tagclass>com.ecyrd.jspwiki.tags.SearchResultIteratorTag</tagclass>
-    <teiclass>com.ecyrd.jspwiki.tags.SearchResultIteratorInfo</teiclass>
+    <tagclass>org.apache.wiki.tags.SearchResultIteratorTag</tagclass>
+    <teiclass>org.apache.wiki.tags.SearchResultIteratorInfo</teiclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>id</name>
@@ -654,19 +654,19 @@
 
   <tag>
     <name>SearchResults</name>
-    <tagclass>com.ecyrd.jspwiki.tags.SearchResultsTag</tagclass>
+    <tagclass>org.apache.wiki.tags.SearchResultsTag</tagclass>
     <bodycontent>JSP</bodycontent>
   </tag>
 
   <tag>
     <name>SearchResultsSize</name>
-    <tagclass>com.ecyrd.jspwiki.tags.SearchResultsSizeTag</tagclass>
+    <tagclass>org.apache.wiki.tags.SearchResultsSizeTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>SetPagination</name>
-    <tagclass>com.ecyrd.jspwiki.tags.SetPaginationTag</tagclass>
+    <tagclass>org.apache.wiki.tags.SetPaginationTag</tagclass>
     <bodycontent>empty</bodycontent>
     <info>Returns pagination string and cache it in the pageContext</info>
     <attribute>
@@ -706,7 +706,7 @@
 
   <tag>
     <name>TabbedSection</name>
-    <tagclass>com.ecyrd.jspwiki.tags.TabbedSectionTag</tagclass>
+    <tagclass>org.apache.wiki.tags.TabbedSectionTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <info>A BodyTag for tabbed sections</info>
     <attribute>
@@ -718,7 +718,7 @@
 
   <tag>
     <name>Tab</name>
-    <tagclass>com.ecyrd.jspwiki.tags.TabTag</tagclass>
+    <tagclass>org.apache.wiki.tags.TabTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <info>A Tag for a tab, which is a child of tabbedSection</info>
     <attribute>
@@ -750,19 +750,19 @@
 
   <tag>
     <name>TemplateDir</name>
-    <tagclass>com.ecyrd.jspwiki.tags.TemplateDirTag</tagclass>
+    <tagclass>org.apache.wiki.tags.TemplateDirTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>Translate</name>
-    <tagclass>com.ecyrd.jspwiki.tags.TranslateTag</tagclass>
+    <tagclass>org.apache.wiki.tags.TranslateTag</tagclass>
     <bodycontent>JSP</bodycontent>
   </tag>
 
   <tag>
     <name>UploadLink</name>
-    <tagclass>com.ecyrd.jspwiki.tags.UploadLinkTag</tagclass>
+    <tagclass>org.apache.wiki.tags.UploadLinkTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>page</name>
@@ -775,13 +775,13 @@
 
   <tag>
     <name>UserName</name>
-    <tagclass>com.ecyrd.jspwiki.tags.UserNameTag</tagclass>
+    <tagclass>org.apache.wiki.tags.UserNameTag</tagclass>
     <bodycontent>empty</bodycontent>
   </tag>
 
   <tag>
     <name>UserCheck</name>
-    <tagclass>com.ecyrd.jspwiki.tags.UserCheckTag</tagclass>
+    <tagclass>org.apache.wiki.tags.UserCheckTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>status</name>
@@ -795,7 +795,7 @@
 
   <tag>
     <name>UserProfile</name>
-    <tagclass>com.ecyrd.jspwiki.tags.UserProfileTag</tagclass>
+    <tagclass>org.apache.wiki.tags.UserProfileTag</tagclass>
     <bodycontent>JSP</bodycontent>
     <attribute>
        <name>property</name>
@@ -805,7 +805,7 @@
 
   <tag>
     <name>Variable</name>
-    <tagclass>com.ecyrd.jspwiki.tags.VariableTag</tagclass>
+    <tagclass>org.apache.wiki.tags.VariableTag</tagclass>
     <bodycontent>empty</bodycontent>
     <attribute>
        <name>var</name>
@@ -821,7 +821,7 @@
 
   <tag>
       <name>Cookie</name>
-      <tagclass>com.ecyrd.jspwiki.tags.CookieTag</tagclass>
+      <tagclass>org.apache.wiki.tags.CookieTag</tagclass>
       <bodycontent>empty</bodycontent>
       <attribute>
           <name>name</name>

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml Sun Feb  1 18:04:05 2009
@@ -38,7 +38,7 @@
 
    <filter>
       <filter-name>WikiServletFilter</filter-name>
-      <filter-class>com.ecyrd.jspwiki.ui.WikiServletFilter</filter-class>
+      <filter-class>org.apache.wiki.ui.WikiServletFilter</filter-class>
    </filter>
    
    <!-- Configuration of the Stripes Filter. The Stripes MVC framework provides
@@ -56,7 +56,7 @@
            here (comma-delimited). -->
       <init-param>
          <param-name>ActionResolver.Packages</param-name>
-         <param-value>com.ecyrd.jspwiki.action</param-value>
+         <param-value>org.apache.wiki.action</param-value>
       </init-param>
       <!-- Tell Stripes to auto-discover custom extensions from the "ui.stripes"
            package. Extensions JSPWiki uses includes WikiActionBeanContext,
@@ -64,7 +64,7 @@
            implementations for JSPWiki-specific types. -->
       <init-param>
          <param-name>Extension.Packages</param-name>
-         <param-value>com.ecyrd.jspwiki.ui.stripes</param-value>
+         <param-value>org.apache.wiki.ui.stripes</param-value>
       </init-param>
       <!-- We override Stripes' normal resource bundle to use ours instead. -->
       <init-param>
@@ -88,7 +88,7 @@
       <!-- Exception handler classes -->
       <init-param>
         <param-name>ExceptionHandler.Class</param-name>
-        <param-value>com.ecyrd.jspwiki.ui.stripes.WikiExceptionHandler</param-value>
+        <param-value>org.apache.wiki.ui.stripes.WikiExceptionHandler</param-value>
       </init-param>
    </filter>
 
@@ -99,7 +99,7 @@
    <!--
    <filter>
       <filter-name>WikiJSPFilter</filter-name>
-      <filter-class>com.ecyrd.jspwiki.ui.WikiJSPFilter</filter-class>
+      <filter-class>org.apache.wiki.ui.WikiJSPFilter</filter-class>
    </filter>
    -->
 
@@ -161,7 +161,7 @@
        HttpSessionListener used for managing WikiSessions.
      -->
    <listener>
-      <listener-class>com.ecyrd.jspwiki.auth.SessionMonitor</listener-class>
+      <listener-class>org.apache.wiki.auth.SessionMonitor</listener-class>
    </listener>
    
     <!-- 
@@ -181,10 +181,10 @@
      -->
    <servlet>
        <servlet-name>XMLRPC</servlet-name>
-       <servlet-class>com.ecyrd.jspwiki.xmlrpc.RPCServlet</servlet-class>       
+       <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>       
        <init-param>
            <param-name>handler</param-name>
-           <param-value>com.ecyrd.jspwiki.xmlrpc.RPCHandler</param-value>
+           <param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
        </init-param>
 
        <init-param>
@@ -199,10 +199,10 @@
 
    <servlet>
        <servlet-name>XMLRPC-UTF8</servlet-name>
-       <servlet-class>com.ecyrd.jspwiki.xmlrpc.RPCServlet</servlet-class>       
+       <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>       
        <init-param>
            <param-name>handler</param-name>
-           <param-value>com.ecyrd.jspwiki.xmlrpc.RPCHandlerUTF8</param-value>
+           <param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
        </init-param>
 
        <init-param>
@@ -220,13 +220,13 @@
    <!-- Atom Publishing Protocol -->
    <servlet>
        <servlet-name>ATOM</servlet-name>
-       <servlet-class>com.ecyrd.jspwiki.rpc.atom.AtomAPIServlet</servlet-class>       
+       <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>       
    </servlet>
 
    <!-- Maps short URLS to JSPs; also, detects webapp shutdown. -->
    <servlet>
        <servlet-name>WikiServlet</servlet-name>
-       <servlet-class>com.ecyrd.jspwiki.WikiServlet</servlet-class>
+       <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
        <!--
        <load-on-startup>1</load-on-startup>
        -->
@@ -234,7 +234,7 @@
 
    <servlet>
        <servlet-name>DAVServlet</servlet-name>
-       <servlet-class>com.ecyrd.jspwiki.dav.WikiDavServlet</servlet-class>
+       <servlet-class>org.apache.wiki.dav.WikiDavServlet</servlet-class>
    </servlet>
 
    <!--
@@ -243,7 +243,7 @@
 
    <servlet>
        <servlet-name>AttachmentServlet</servlet-name>
-       <servlet-class>com.ecyrd.jspwiki.attachment.AttachmentServlet</servlet-class>
+       <servlet-class>org.apache.wiki.attachment.AttachmentServlet</servlet-class>
    </servlet>
 
     <servlet-mapping>

Modified: incubator/jspwiki/trunk/src/WebContent/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Wiki.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Wiki.jsp Sun Feb  1 18:04:05 2009
@@ -1,5 +1,5 @@
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" executeResolution="true" id="wikiActionBean" />
+<stripes:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" executeResolution="true" id="wikiActionBean" />
 <stripes:layout-render name="/templates/default/ViewLayout.jsp">
   <stripes:layout-component name="content">
     <jsp:include page="/templates/default/PageContent.jsp" />

Modified: incubator/jspwiki/trunk/src/WebContent/Workflow.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Workflow.jsp?rev=739802&r1=739801&r2=739802&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Workflow.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Workflow.jsp Sun Feb  1 18:04:05 2009
@@ -1,19 +1,19 @@
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.Iterator" %>
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.WikiContext" %>
-<%@ page import="com.ecyrd.jspwiki.WikiSession" %>
-<%@ page import="com.ecyrd.jspwiki.WikiEngine" %>
-<%@ page import="com.ecyrd.jspwiki.workflow.Decision" %>
-<%@ page import="com.ecyrd.jspwiki.workflow.DecisionQueue" %>
-<%@ page import="com.ecyrd.jspwiki.workflow.NoSuchOutcomeException" %>
-<%@ page import="com.ecyrd.jspwiki.workflow.Outcome" %>
-<%@ page import="com.ecyrd.jspwiki.workflow.Workflow" %>
+<%@ page import="org.apache.wiki.log.Logger" %>
+<%@ page import="org.apache.wiki.log.LoggerFactory" %>
+<%@ page import="org.apache.wiki.WikiContext" %>
+<%@ page import="org.apache.wiki.WikiSession" %>
+<%@ page import="org.apache.wiki.WikiEngine" %>
+<%@ page import="org.apache.wiki.workflow.Decision" %>
+<%@ page import="org.apache.wiki.workflow.DecisionQueue" %>
+<%@ page import="org.apache.wiki.workflow.NoSuchOutcomeException" %>
+<%@ page import="org.apache.wiki.workflow.Outcome" %>
+<%@ page import="org.apache.wiki.workflow.Workflow" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.WorkflowActionBean" event="view" id="wikiActionBean"/>
+<stripes:useActionBean beanclass="org.apache.wiki.action.WorkflowActionBean" event="view" id="wikiActionBean"/>
 
 <%! 
     Logger log = LoggerFactory.getLogger("JSPWiki"); 



Mime
View raw message