LPS-32447

1

@@ -0,0 +1,193 @@
+<!--
+<!DOCTYPE hook PUBLIC
+	"-//Liferay//DTD Hook 6.1.0//EN"
+	"http://www.liferay.com/dtd/liferay-hook_6_1_0.dtd">
+-->
+
+<!ELEMENT hook (portal-properties?, language-properties*, custom-jsp-dir?,
+custom-jsp-global?, indexer-post-processor*, service*, servlet-filter*,
+servlet-filter-mapping*, struts-action*)>
+
+<!--
+Not all portal properties can be overridden via a hook. The supported properties
+are:
+
+<pre>
+admin.default.group.names
+admin.default.role.names
+admin.default.user.group.names
+asset.publisher.display.styles
+auth.forward.by.last.path
+auth.public.paths
+auto.deploy.listeners
+application.startup.events
+auth.failure
+auth.max.failures
+auth.token.impl
+auth.pipeline.post
+auth.pipeline.pre
+auto.login.hooks
+captcha.check.portal.create_account
+captcha.engine.impl
+com.liferay.portal.servlet.filters.*Filter
+company.default.locale
+company.default.time.zone
+company.settings.form.configuration
+company.settings.form.identification
+company.settings.form.miscellaneous
+control.panel.entry.class.default
+convert.processes
+default.landing.page.path
+dl.file.entry.drafts.enabled
+dl.file.entry.processors
+dl.repository.impl
+dl.store.antivirus.impl
+dl.store.impl
+dockbar.add.portlets
+field.enable.com.liferay.portal.model.Contact.birthday
+field.enable.com.liferay.portal.model.Contact.male
+field.enable.com.liferay.portal.model.Organization.status
+hot.deploy.listeners
+javascript.fast.load
+journal.article.form.add
+journal.article.form.translate
+journal.article.form.update
+layout.form.add
+layout.form.update
+layout.set.form.update
+layout.static.portlets.all
+layout.template.cache.enabled
+layout.types
+layout.user.private.layouts.auto.create
+layout.user.private.layouts.enabled
+layout.user.private.layouts.modifiable
+layout.user.private.layouts.power.user.required
+layout.user.public.layouts.auto.create
+layout.user.public.layouts.enabled
+layout.user.public.layouts.modifiable
+layout.user.public.layouts.power.user.required
+ldap.attrs.transformer.impl
+locales
+locales.beta
+lock.listeners
+login.create.account.allow.custom.password
+login.events.post
+login.events.pre
+logout.events.post
+logout.events.pre
+mail.hook.impl
+my.sites.show.private.sites.with.no.layouts
+my.sites.show.public.sites.with.no.layouts
+my.sites.show.user.private.sites.with.no.layouts
+my.sites.show.user.public.sites.with.no.layouts
+organizations.form.add.identification
+organizations.form.add.main
+organizations.form.add.miscellaneous
+passwords.passwordpolicytoolkit.generator
+passwords.passwordpolicytoolkit.static
+passwords.toolkit
+phone.number.format.impl
+phone.number.format.international.regexp
+phone.number.format.usa.regexp
+portlet.add.default.resource.check.enabled
+portlet.add.default.resource.check.whitelist
+portlet.add.default.resource.check.whitelist.actions
+sanitizer.impl
+servlet.session.create.events
+servlet.session.destroy.events
+servlet.service.events.post
+servlet.service.events.pre
+session.max.allowed
+session.phishing.protected.attributes
+session.store.password
+sites.form.add.advanced
+sites.form.add.main
+sites.form.add.seo
+sites.form.update.advanced
+sites.form.update.main
+sites.form.update.seo
+social.bookmark.*
+terms.of.use.required
+theme.css.fast.load
+theme.images.fast.load
+theme.jsp.override.enabled
+theme.loader.new.theme.id.on.import
+theme.portlet.decorate.default
+theme.portlet.sharing.default
+theme.shortcut.icon
+time.zones
+upgrade.processes
+user.notification.event.confirmation.enabled
+users.email.address.generator
+users.email.address.required
+users.email.address.validator
+users.form.add.identification
+users.form.add.main
+users.form.add.miscellaneous
+users.form.my.account.identification
+users.form.my.account.main
+users.form.my.account.miscellaneous
+users.form.update.identification
+users.form.update.main
+users.form.update.miscellaneous
+users.full.name.generator
+users.full.name.validator
+users.image.max.height
+users.image.max.width
+users.screen.name.always.autogenerate
+users.screen.name.generator
+users.screen.name.validator
+value.object.listener.*
+wiki.formats.*
+</pre>
+-->
+<!ELEMENT portal-properties (#PCDATA)>
+
+<!ELEMENT language-properties (#PCDATA)>
+
+<!ELEMENT custom-jsp-dir (#PCDATA)>
+
+<!ELEMENT custom-jsp-global (#PCDATA)>
+
+<!ELEMENT indexer-post-processor (indexer-class-name,
+indexer-post-processor-impl)>
+
+<!ELEMENT indexer-class-name (#PCDATA)>
+
+<!ELEMENT indexer-post-processor-impl (#PCDATA)>
+
+<!ELEMENT service (service-type, service-impl)>
+
+<!ELEMENT service-type (#PCDATA)>
+
+<!ELEMENT service-impl (#PCDATA)>
+
+<!ELEMENT servlet-filter (servlet-filter-name, servlet-filter-impl,
+init-param*)>
+
+<!ELEMENT servlet-filter-name (#PCDATA)>
+
+<!ELEMENT servlet-filter-impl (#PCDATA)>
+
+<!ELEMENT init-param (param-name, param-value)>
+
+<!ELEMENT param-name (#PCDATA)>
+
+<!ELEMENT param-value (#PCDATA)>
+
+<!ELEMENT servlet-filter-mapping (servlet-filter-name, (after-filter |
+before-filter)?, url-pattern+, dispatcher*)>
+
+<!ELEMENT after-filter (#PCDATA)>
+
+<!ELEMENT before-filter (#PCDATA)>
+
+<!ELEMENT url-pattern (#PCDATA)>
+
+<!ELEMENT dispatcher (#PCDATA)>
+
+<!ELEMENT struts-action (struts-action-path, struts-action-impl)>
+
+<!ELEMENT struts-action-path (#PCDATA)>
+
+<!ELEMENT struts-action-impl (#PCDATA)>

definitions/liferay-hook_6_1_0.dtd

@@ -44,6 +44,7 @@ dl.repository.impl
 dl.store.antivirus.impl
 dl.store.impl
 dockbar.add.portlets
+editor.wysiwyg.portal-web.docroot.html.portlet.wiki.edit.*
 field.enable.com.liferay.portal.model.Contact.birthday
 field.enable.com.liferay.portal.model.Contact.male
 field.enable.com.liferay.portal.model.Organization.status
@@ -138,6 +139,8 @@ users.screen.name.always.autogenerate
 users.screen.name.generator
 users.screen.name.validator
 value.object.listener.*
+wiki.formats.*
+wiki.importers.*
 </pre>
 -->
 <!ELEMENT portal-properties (#PCDATA)>
@@ -189,4 +192,4 @@ before-filter)?, url-pattern+, dispatcher*)>
 
 <!ELEMENT struts-action-path (#PCDATA)>
 
-<!ELEMENT struts-action-impl (#PCDATA)>
+<!ELEMENT struts-action-impl (#PCDATA)>

definitions/liferay-hook_6_2_0.dtd

@@ -45,6 +45,7 @@ dl.repository.impl
 dl.store.antivirus.impl
 dl.store.impl
 dockbar.add.portlets
+editor.wysiwyg.portal-web.docroot.html.portlet.wiki.edit.*
 field.enable.com.liferay.portal.model.Contact.birthday
 field.enable.com.liferay.portal.model.Contact.male
 field.enable.com.liferay.portal.model.Organization.status
@@ -140,6 +141,8 @@ users.screen.name.always.autogenerate
 users.screen.name.generator
 users.screen.name.validator
 value.object.listener.*
+wiki.formats.*
+wiki.importers.*
 </pre>
 -->
 <!ELEMENT portal-properties (#PCDATA)>
@@ -191,4 +194,4 @@ before-filter)?, url-pattern+, dispatcher*)>
 
 <!ELEMENT struts-action-path (#PCDATA)>
 
-<!ELEMENT struts-action-impl (#PCDATA)>
+<!ELEMENT struts-action-impl (#PCDATA)>

portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java

@@ -1952,6 +1952,21 @@ protected void initPortalProperties(
 			ScreenNameValidatorFactory.setInstance(screenNameValidator);
 		}
 
+                if (portalProperties.containsKey(
+                                PropsKeys.USERS_SCREEN_NAME_VALIDATOR)) {
+
+                        String screenNameValidatorClassName = portalProperties.getProperty(
+                                PropsKeys.USERS_SCREEN_NAME_VALIDATOR);
+
+                        ScreenNameValidator screenNameValidator =
+                                (ScreenNameValidator)newInstance(
+                                        portletClassLoader, ScreenNameValidator.class,
+                                        screenNameValidatorClassName);
+
+                        ScreenNameValidatorFactory.setInstance(screenNameValidator);
+                }
+
+
 		Set<String> liferayFilterClassNames =
 			LiferayFilterTracker.getClassNames();
 

portal-impl/src/com/liferay/portal/events/GlobalStartupAction.java

@@ -49,8 +49,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jamwiki.Environment;
-
 /**
  * @author Brian Wing Shun Chan
  */
@@ -251,17 +249,6 @@ public void run(String[] ids) {
 
 		AuthPublicPathRegistry.register(PropsValues.AUTH_PUBLIC_PATHS);
 
-		// JAMWiki
-
-		try {
-			String tmpDir = SystemProperties.get(SystemProperties.TMP_DIR);
-
-			Environment.setValue(Environment.PROP_BASE_FILE_DIR, tmpDir);
-		}
-		catch (Throwable t) {
-			_log.error(t);
-		}
-
 		// Javadoc
 
 		ClassLoader contextClassLoader =
@@ -324,4 +311,4 @@ public void run(String[] ids) {
 	private static List<AutoDeployListener> _autoDeployListeners;
 	private static List<HotDeployListener> _hotDeployListeners;
 
-}
+}