Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3781] magnoliamodules/trunk
|
From: <fg...@us...> - 2012-03-10 22:22:47
|
Revision: 3781
http://openutils.svn.sourceforge.net/openutils/?rev=3781&view=rev
Author: fgiust
Date: 2012-03-10 22:22:36 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
initial cleanup
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/BaseAnalyzer.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/ConjunctionTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/ExactContentFilter.java
magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcImageProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/magnolia/MobileModule.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/tags/MobilePreviewButtonTag.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/BaseMobileParagraphDecorator.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/BaseMobileTemplateDecorator.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/DefaultMobileParagraphDecorator.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/DefaultMobileTemplate.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/DefaultMobileTemplateDecorator.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileParagraph.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileParagraphManager.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileTemplate.java
magnoliamodules/trunk/openutils-mgnlmobile/src/main/java/net/sourceforge/openutils/mgnlmobile/templating/MobileTemplateManager.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesAwareParagraphManager.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/pages/StripesConfigurationPage.java
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.java
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraph.java
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsParagraphRegister.java
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/render/StrutsRenderer.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/bean/TagCloud.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/groovyscripts/testCreatingPageTag.groovy
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
magnoliamodules/trunk/pom.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java
magnoliamodules/trunk/openutils-mgnlspring/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-03-10 22:22:36 UTC (rev 3781)
@@ -151,11 +151,6 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlspring</artifactId>
- <version>3.5.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstripes</artifactId>
<version>4.1.4-SNAPSHOT</version>
</dependency>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp 2012-03-10 22:22:36 UTC (rev 3781)
@@ -40,7 +40,7 @@
<jsp:scriptlet><![CDATA[
Criteria criteria = JCRCriteriaFactory
.createCriteria()
- .setWorkspace(ContentRepository.WEBSITE)
+ .setWorkspace(RepositoryConstants.WEBSITE)
.setBasePath("/Criteria/pets")
.add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT.getSystemName()))
.addOrder(Order.asc("@birthDate"));
Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,10 +19,10 @@
package net.sourceforge.openutils.mgnlsimplecache.filesystem;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.util.MBeanUtil;
import info.magnolia.cms.util.ObservationUtil;
+import info.magnolia.repository.RepositoryConstants;
import info.magnolia.voting.Voter;
import java.io.File;
@@ -410,7 +410,7 @@
// start observing repositories
if (repositoryUrls.size() == 0)
{
- repositoryUrls.add(ContentRepository.WEBSITE);
+ repositoryUrls.add(RepositoryConstants.WEBSITE);
}
for (String repositoryUrl : repositoryUrls)
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlcontextmenu.tags;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.taglibs.CmsFunctions;
import info.magnolia.context.MgnlContext;
import java.io.IOException;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlcontextmenu.tags;
-import info.magnolia.cms.taglibs.CmsFunctions;
import info.magnolia.context.MgnlContext;
import java.io.IOException;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlcontextmenu.tags;
-import info.magnolia.cms.taglibs.CmsFunctions;
import info.magnolia.context.MgnlContext;
import java.io.IOException;
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,13 +19,13 @@
package net.sourceforge.openutils.mgnlcontrols.configuration;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.List;
@@ -86,7 +86,7 @@
{
String repository = StringUtils.defaultIfEmpty(
NodeDataUtil.getString(colConfig, "repository"),
- ContentRepository.WEBSITE);
+ RepositoryConstants.WEBSITE);
for (int index = 0; index < column.length; index++)
{
@@ -111,7 +111,7 @@
{
String repository = StringUtils.defaultIfEmpty(
NodeDataUtil.getString(colConfig, "repository"),
- ContentRepository.WEBSITE);
+ RepositoryConstants.WEBSITE);
for (int index = 0; index < column.length; index++)
{
if (!StringUtils.isEmpty(column[index]))
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -36,7 +36,7 @@
* Calendar end = Calendar.getInstance();
* end.set(2001, Calendar.DECEMBER, 31);
*
- * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE)
+ * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE)
* .setBasePath("/pets")
* .add(Restrictions.contains("@title", "Lucky"))
* .add(Restrictions.eq("@petType", "dog"))
@@ -60,7 +60,7 @@
* <pre>
* Criteria criteria = JCRCriteriaFactory
* .createCriteria()
- * .setWorkspace(ContentRepository.WEBSITE)
+ * .setWorkspace(RepositoryConstants.WEBSITE)
* .setBasePath("/pets")
* .add(Restrictions.betweenDates("@birthDate", begin, end))
* .addOrder(Order.asc("@birthDate"))
@@ -75,7 +75,7 @@
* Another way to paginate results is by using the <code>setPaging</code> method:
*
* <pre>
- * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE)
+ * Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE)
* .setBasePath("/pets")
* .add(Restrictions.betweenDates("@birthDate", begin, end))
* .addOrder(Order.asc("@birthDate"))
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -39,8 +39,8 @@
import org.apache.jackrabbit.core.query.lucene.MatchAllDocsQuery;
import org.apache.jackrabbit.core.query.lucene.QueryDecoratorSupport;
import org.apache.jackrabbit.core.query.lucene.SearchIndex;
+import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.BooleanClause.Occur;
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,8 +19,8 @@
package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.impl;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.Collection;
@@ -66,7 +66,7 @@
protected String spellCheckString;
- protected String workspace = ContentRepository.WEBSITE;
+ protected String workspace = RepositoryConstants.WEBSITE;
protected boolean forcePagingWithDocumentOrder;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingAnalyzer.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlcriteria.utils;
+import org.apache.lucene.analysis.ASCIIFoldingFilter;
import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardFilter;
Deleted: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java 2012-03-10 21:55:32 UTC (rev 3780)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/utils/ASCIIFoldingFilter.java 2012-03-10 22:22:36 UTC (rev 3781)
@@ -1,2017 +0,0 @@
-/**
- *
- * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
- * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlcriteria.utils;
-
-import org.apache.lucene.analysis.Token;
-import org.apache.lucene.analysis.TokenFilter;
-import org.apache.lucene.analysis.TokenStream;
-
-
-/**
- * A filter backported da lucene 2.9.1 which converts any character variation into its ASCII equivalent.
- * @author fgiust
- * @version $Id$
- */
-
-public class ASCIIFoldingFilter extends TokenFilter
-{
-
- public ASCIIFoldingFilter(TokenStream input)
- {
- super(input);
- }
-
- private char[] output = new char[256];
-
- private int outputPos;
-
- @Override
- public final Token next(final Token reusableToken) throws java.io.IOException
- {
- assert reusableToken != null;
- Token nextToken = input.next(reusableToken);
- if (nextToken != null)
- {
- final char[] buffer = nextToken.termBuffer();
- final int length = nextToken.termLength();
- // If no characters actually require rewriting then we
- // just return token as-is:
- for (int i = 0; i < length; i++)
- {
- final char c = buffer[i];
- if (c >= '\u0080')
- {
- removeAccents(buffer, length);
- nextToken.setTermBuffer(output, 0, outputPos);
- break;
- }
- }
- return nextToken;
- }
- else
- return null;
- }
-
- /**
- * To replace accented characters in a String by unaccented equivalents.
- */
- public final void removeAccents(char[] input, int length)
- {
-
- // Worst-case length required:
- final int maxSizeNeeded = 2 * length;
-
- int size = output.length;
- while (size < maxSizeNeeded)
- size *= 2;
-
- if (size != output.length)
- output = new char[size];
-
- outputPos = 0;
-
- for (int pos = 0; pos < length; ++pos)
- {
- final char c = input[pos];
-
- // Quick test: if it's not in range then just keep current character
- if (c < '\u0080')
- {
- output[outputPos++] = c;
- }
- else
- {
- switch (c)
- {
- case '\u00C0' : // À [LATIN CAPITAL LETTER A WITH GRAVE]
- case '\u00C1' : // Á [LATIN CAPITAL LETTER A WITH ACUTE]
- case '\u00C2' : // Â [LATIN CAPITAL LETTER A WITH CIRCUMFLEX]
- case '\u00C3' : // Ã [LATIN CAPITAL LETTER A WITH TILDE]
- case '\u00C4' : // Ä [LATIN CAPITAL LETTER A WITH DIAERESIS]
- case '\u00C5' : // Å [LATIN CAPITAL LETTER A WITH RING ABOVE]
- case '\u0100' : // Ā [LATIN CAPITAL LETTER A WITH MACRON]
- case '\u0102' : // Ă [LATIN CAPITAL LETTER A WITH BREVE]
- case '\u0104' : // Ą [LATIN CAPITAL LETTER A WITH OGONEK]
- case '\u018F' : // Ə http://en.wikipedia.org/wiki/Schwa [LATIN CAPITAL LETTER SCHWA]
- case '\u01CD' : // Ǎ [LATIN CAPITAL LETTER A WITH CARON]
- case '\u01DE' : // Ǟ [LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON]
- case '\u01E0' : // Ǡ [LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON]
- case '\u01FA' : // Ǻ [LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE]
- case '\u0200' : // Ȁ [LATIN CAPITAL LETTER A WITH DOUBLE GRAVE]
- case '\u0202' : // Ȃ [LATIN CAPITAL LETTER A WITH INVERTED BREVE]
- case '\u0226' : // Ȧ [LATIN CAPITAL LETTER A WITH DOT ABOVE]
- case '\u023A' : // Ⱥ [LATIN CAPITAL LETTER A WITH STROKE]
- case '\u1D00' : // ᴀ [LATIN LETTER SMALL CAPITAL A]
- case '\u1E00' : // Ḁ [LATIN CAPITAL LETTER A WITH RING BELOW]
- case '\u1EA0' : // Ạ [LATIN CAPITAL LETTER A WITH DOT BELOW]
- case '\u1EA2' : // Ả [LATIN CAPITAL LETTER A WITH HOOK ABOVE]
- case '\u1EA4' : // Ấ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE]
- case '\u1EA6' : // Ầ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE]
- case '\u1EA8' : // Ẩ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE]
- case '\u1EAA' : // Ẫ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE]
- case '\u1EAC' : // Ậ [LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW]
- case '\u1EAE' : // Ắ [LATIN CAPITAL LETTER A WITH BREVE AND ACUTE]
- case '\u1EB0' : // Ằ [LATIN CAPITAL LETTER A WITH BREVE AND GRAVE]
- case '\u1EB2' : // Ẳ [LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE]
- case '\u1EB4' : // Ẵ [LATIN CAPITAL LETTER A WITH BREVE AND TILDE]
- case '\u1EB6' : // Ặ [LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW]
- case '\u24B6' : // Ⓐ [CIRCLED LATIN CAPITAL LETTER A]
- case '\uFF21' : // Ａ [FULLWIDTH LATIN CAPITAL LETTER A]
- output[outputPos++] = 'A';
- break;
- case '\u00E0' : // à [LATIN SMALL LETTER A WITH GRAVE]
- case '\u00E1' : // á [LATIN SMALL LETTER A WITH ACUTE]
- case '\u00E2' : // â [LATIN SMALL LETTER A WITH CIRCUMFLEX]
- case '\u00E3' : // ã [LATIN SMALL LETTER A WITH TILDE]
- case '\u00E4' : // ä [LATIN SMALL LETTER A WITH DIAERESIS]
- case '\u00E5' : // å [LATIN SMALL LETTER A WITH RING ABOVE]
- case '\u0101' : // ā [LATIN SMALL LETTER A WITH MACRON]
- case '\u0103' : // ă [LATIN SMALL LETTER A WITH BREVE]
- case '\u0105' : // ą [LATIN SMALL LETTER A WITH OGONEK]
- case '\u01CE' : // ǎ [LATIN SMALL LETTER A WITH CARON]
- case '\u01DF' : // ǟ [LATIN SMALL LETTER A WITH DIAERESIS AND MACRON]
- case '\u01E1' : // ǡ [LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON]
- case '\u01FB' : // ǻ [LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE]
- case '\u0201' : // ȁ [LATIN SMALL LETTER A WITH DOUBLE GRAVE]
- case '\u0203' : // ȃ [LATIN SMALL LETTER A WITH INVERTED BREVE]
- case '\u0227' : // ȧ [LATIN SMALL LETTER A WITH DOT ABOVE]
- case '\u0250' : // ɐ [LATIN SMALL LETTER TURNED A]
- case '\u0259' : // ə [LATIN SMALL LETTER SCHWA]
- case '\u025A' : // ɚ [LATIN SMALL LETTER SCHWA WITH HOOK]
- case '\u1D8F' : // ᶏ [LATIN SMALL LETTER A WITH RETROFLEX HOOK]
- case '\u1D95' : // ᶕ [LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK]
- case '\u1E01' : // ạ [LATIN SMALL LETTER A WITH RING BELOW]
- case '\u1E9A' : // ả [LATIN SMALL LETTER A WITH RIGHT HALF RING]
- case '\u1EA1' : // ạ [LATIN SMALL LETTER A WITH DOT BELOW]
- case '\u1EA3' : // ả [LATIN SMALL LETTER A WITH HOOK ABOVE]
- case '\u1EA5' : // ấ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE]
- case '\u1EA7' : // ầ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE]
- case '\u1EA9' : // ẩ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE]
- case '\u1EAB' : // ẫ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE]
- case '\u1EAD' : // ậ [LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW]
- case '\u1EAF' : // ắ [LATIN SMALL LETTER A WITH BREVE AND ACUTE]
- case '\u1EB1' : // ằ [LATIN SMALL LETTER A WITH BREVE AND GRAVE]
- case '\u1EB3' : // ẳ [LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE]
- case '\u1EB5' : // ẵ [LATIN SMALL LETTER A WITH BREVE AND TILDE]
- case '\u1EB7' : // ặ [LATIN SMALL LETTER A WITH BREVE AND DOT BELOW]
- case '\u2090' : // ₐ [LATIN SUBSCRIPT SMALL LETTER A]
- case '\u2094' : // ₔ [LATIN SUBSCRIPT SMALL LETTER SCHWA]
- case '\u24D0' : // ⓐ [CIRCLED LATIN SMALL LETTER A]
- case '\u2C65' : // ⱥ [LATIN SMALL LETTER A WITH STROKE]
- case '\u2C6F' : // Ɐ [LATIN CAPITAL LETTER TURNED A]
- case '\uFF41' : // ａ [FULLWIDTH LATIN SMALL LETTER A]
- output[outputPos++] = 'a';
- break;
- case '\uA732' : // Ꜳ [LATIN CAPITAL LETTER AA]
- output[outputPos++] = 'A';
- output[outputPos++] = 'A';
- break;
- case '\u00C6' : // Æ [LATIN CAPITAL LETTER AE]
- case '\u01E2' : // Ǣ [LATIN CAPITAL LETTER AE WITH MACRON]
- case '\u01FC' : // Ǽ [LATIN CAPITAL LETTER AE WITH ACUTE]
- case '\u1D01' : // ᴁ [LATIN LETTER SMALL CAPITAL AE]
- output[outputPos++] = 'A';
- output[outputPos++] = 'E';
- break;
- case '\uA734' : // Ꜵ [LATIN CAPITAL LETTER AO]
- output[outputPos++] = 'A';
- output[outputPos++] = 'O';
- break;
- case '\uA736' : // Ꜷ [LATIN CAPITAL LETTER AU]
- output[outputPos++] = 'A';
- output[outputPos++] = 'U';
- break;
- case '\uA738' : // Ꜹ [LATIN CAPITAL LETTER AV]
- case '\uA73A' : // Ꜻ [LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR]
- output[outputPos++] = 'A';
- output[outputPos++] = 'V';
- break;
- case '\uA73C' : // Ꜽ [LATIN CAPITAL LETTER AY]
- output[outputPos++] = 'A';
- output[outputPos++] = 'Y';
- break;
- case '\u249C' : // ⒜ [PARENTHESIZED LATIN SMALL LETTER A]
- output[outputPos++] = '(';
- output[outputPos++] = 'a';
- output[outputPos++] = ')';
- break;
- case '\uA733' : // ꜳ [LATIN SMALL LETTER AA]
- output[outputPos++] = 'a';
- output[outputPos++] = 'a';
- break;
- case '\u00E6' : // æ [LATIN SMALL LETTER AE]
- case '\u01E3' : // ǣ [LATIN SMALL LETTER AE WITH MACRON]
- case '\u01FD' : // ǽ [LATIN SMALL LETTER AE WITH ACUTE]
- case '\u1D02' : // ᴂ [LATIN SMALL LETTER TURNED AE]
- output[outputPos++] = 'a';
- output[outputPos++] = 'e';
- break;
- case '\uA735' : // ꜵ [LATIN SMALL LETTER AO]
- output[outputPos++] = 'a';
- output[outputPos++] = 'o';
- break;
- case '\uA737' : // ꜷ [LATIN SMALL LETTER AU]
- output[outputPos++] = 'a';
- output[outputPos++] = 'u';
- break;
- case '\uA739' : // ꜹ [LATIN SMALL LETTER AV]
- case '\uA73B' : // ꜻ [LATIN SMALL LETTER AV WITH HORIZONTAL BAR]
- output[outputPos++] = 'a';
- output[outputPos++] = 'v';
- break;
- case '\uA73D' : // ꜽ [LATIN SMALL LETTER AY]
- output[outputPos++] = 'a';
- output[outputPos++] = 'y';
- break;
- case '\u0181' : // Ɓ [LATIN CAPITAL LETTER B WITH HOOK]
- case '\u0182' : // Ƃ [LATIN CAPITAL LETTER B WITH TOPBAR]
- case '\u0243' : // Ƀ [LATIN CAPITAL LETTER B WITH STROKE]
- case '\u0299' : // ʙ [LATIN LETTER SMALL CAPITAL B]
- case '\u1D03' : // ᴃ [LATIN LETTER SMALL CAPITAL BARRED B]
- case '\u1E02' : // Ḃ [LATIN CAPITAL LETTER B WITH DOT ABOVE]
- case '\u1E04' : // Ḅ [LATIN CAPITAL LETTER B WITH DOT BELOW]
- case '\u1E06' : // Ḇ [LATIN CAPITAL LETTER B WITH LINE BELOW]
- case '\u24B7' : // Ⓑ [CIRCLED LATIN CAPITAL LETTER B]
- case '\uFF22' : // Ｂ [FULLWIDTH LATIN CAPITAL LETTER B]
- output[outputPos++] = 'B';
- break;
- case '\u0180' : // ƀ [LATIN SMALL LETTER B WITH STROKE]
- case '\u0183' : // ƃ [LATIN SMALL LETTER B WITH TOPBAR]
- case '\u0253' : // ɓ [LATIN SMALL LETTER B WITH HOOK]
- case '\u1D6C' : // ᵬ [LATIN SMALL LETTER B WITH MIDDLE TILDE]
- case '\u1D80' : // ᶀ [LATIN SMALL LETTER B WITH PALATAL HOOK]
- case '\u1E03' : // ḃ [LATIN SMALL LETTER B WITH DOT ABOVE]
- case '\u1E05' : // ḅ [LATIN SMALL LETTER B WITH DOT BELOW]
- case '\u1E07' : // ḇ [LATIN SMALL LETTER B WITH LINE BELOW]
- case '\u24D1' : // ⓑ [CIRCLED LATIN SMALL LETTER B]
- case '\uFF42' : // ｂ [FULLWIDTH LATIN SMALL LETTER B]
- output[outputPos++] = 'b';
- break;
- case '\u249D' : // ⒝ [PARENTHESIZED LATIN SMALL LETTER B]
- output[outputPos++] = '(';
- output[outputPos++] = 'b';
- output[outputPos++] = ')';
- break;
- case '\u00C7' : // Ç [LATIN CAPITAL LETTER C WITH CEDILLA]
- case '\u0106' : // Ć [LATIN CAPITAL LETTER C WITH ACUTE]
- case '\u0108' : // Ĉ [LATIN CAPITAL LETTER C WITH CIRCUMFLEX]
- case '\u010A' : // Ċ [LATIN CAPITAL LETTER C WITH DOT ABOVE]
- case '\u010C' : // Č [LATIN CAPITAL LETTER C WITH CARON]
- case '\u0187' : // Ƈ [LATIN CAPITAL LETTER C WITH HOOK]
- case '\u023B' : // Ȼ [LATIN CAPITAL LETTER C WITH STROKE]
- case '\u0297' : // ʗ [LATIN LETTER STRETCHED C]
- case '\u1D04' : // ᴄ [LATIN LETTER SMALL CAPITAL C]
- case '\u1E08' : // Ḉ [LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE]
- case '\u24B8' : // Ⓒ [CIRCLED LATIN CAPITAL LETTER C]
- case '\uFF23' : // Ｃ [FULLWIDTH LATIN CAPITAL LETTER C]
- output[outputPos++] = 'C';
- break;
- case '\u00E7' : // ç [LATIN SMALL LETTER C WITH CEDILLA]
- case '\u0107' : // ć [LATIN SMALL LETTER C WITH ACUTE]
- case '\u0109' : // ĉ [LATIN SMALL LETTER C WITH CIRCUMFLEX]
- case '\u010B' : // ċ [LATIN SMALL LETTER C WITH DOT ABOVE]
- case '\u010D' : // č [LATIN SMALL LETTER C WITH CARON]
- case '\u0188' : // ƈ [LATIN SMALL LETTER C WITH HOOK]
- case '\u023C' : // ȼ [LATIN SMALL LETTER C WITH STROKE]
- case '\u0255' : // ɕ [LATIN SMALL LETTER C WITH CURL]
- case '\u1E09' : // ḉ [LATIN SMALL LETTER C WITH CEDILLA AND ACUTE]
- case '\u2184' : // ↄ [LATIN SMALL LETTER REVERSED C]
- case '\u24D2' : // ⓒ [CIRCLED LATIN SMALL LETTER C]
- case '\uA73E' : // Ꜿ [LATIN CAPITAL LETTER REVERSED C WITH DOT]
- case '\uA73F' : // ꜿ [LATIN SMALL LETTER REVERSED C WITH DOT]
- case '\uFF43' : // ｃ [FULLWIDTH LATIN SMALL LETTER C]
- output[outputPos++] = 'c';
- break;
- case '\u249E' : // ⒞ [PARENTHESIZED LATIN SMALL LETTER C]
- output[outputPos++] = '(';
- output[outputPos++] = 'c';
- output[outputPos++] = ')';
- break;
- case '\u00D0' : // Ð [LATIN CAPITAL LETTER ETH]
- case '\u010E' : // Ď [LATIN CAPITAL LETTER D WITH CARON]
- case '\u0110' : // Đ [LATIN CAPITAL LETTER D WITH STROKE]
- case '\u0189' : // Ɖ [LATIN CAPITAL LETTER AFRICAN D]
- case '\u018A' : // Ɗ [LATIN CAPITAL LETTER D WITH HOOK]
- case '\u018B' : // Ƌ [LATIN CAPITAL LETTER D WITH TOPBAR]
- case '\u1D05' : // ᴅ [LATIN LETTER SMALL CAPITAL D]
- case '\u1D06' : // ᴆ [LATIN LETTER SMALL CAPITAL ETH]
- case '\u1E0A' : // Ḋ [LATIN CAPITAL LETTER D WITH DOT ABOVE]
- case '\u1E0C' : // Ḍ [LATIN CAPITAL LETTER D WITH DOT BELOW]
- case '\u1E0E' : // Ḏ [LATIN CAPITAL LETTER D WITH LINE BELOW]
- case '\u1E10' : // Ḑ [LATIN CAPITAL LETTER D WITH CEDILLA]
- case '\u1E12' : // Ḓ [LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW]
- case '\u24B9' : // Ⓓ [CIRCLED LATIN CAPITAL LETTER D]
- case '\uA779' : // Ꝺ [LATIN CAPITAL LETTER INSULAR D]
- case '\uFF24' : // Ｄ [FULLWIDTH LATIN CAPITAL LETTER D]
- output[outputPos++] = 'D';
- break;
- case '\u00F0' : // ð [LATIN SMALL LETTER ETH]
- case '\u010F' : // ď [LATIN SMALL LETTER D WITH CARON]
- case '\u0111' : // đ [LATIN SMALL LETTER D WITH STROKE]
- case '\u018C' : // ƌ [LATIN SMALL LETTER D WITH TOPBAR]
- case '\u0221' : // ȡ [LATIN SMALL LETTER D WITH CURL]
- case '\u0256' : // ɖ [LATIN SMALL LETTER D WITH TAIL]
- case '\u0257' : // ɗ [LATIN SMALL LETTER D WITH HOOK]
- case '\u1D6D' : // ᵭ [LATIN SMALL LETTER D WITH MIDDLE TILDE]
- case '\u1D81' : // ᶁ [LATIN SMALL LETTER D WITH PALATAL HOOK]
- case '\u1D91' : // ᶑ [LATIN SMALL LETTER D WITH HOOK AND TAIL]
- case '\u1E0B' : // ḋ [LATIN SMALL LETTER D WITH DOT ABOVE]
- case '\u1E0D' : // ḍ [LATIN SMALL LETTER D WITH DOT BELOW]
- case '\u1E0F' : // ḏ [LATIN SMALL LETTER D WITH LINE BELOW]
- case '\u1E11' : // ḑ [LATIN SMALL LETTER D WITH CEDILLA]
- case '\u1E13' : // ḓ [LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW]
- case '\u24D3' : // ⓓ [CIRCLED LATIN SMALL LETTER D]
- case '\uA77A' : // ꝺ [LATIN SMALL LETTER INSULAR D]
- case '\uFF44' : // ｄ [FULLWIDTH LATIN SMALL LETTER D]
- output[outputPos++] = 'd';
- break;
- case '\u01C4' : // DŽ [LATIN CAPITAL LETTER DZ WITH CARON]
- case '\u01F1' : // DZ [LATIN CAPITAL LETTER DZ]
- output[outputPos++] = 'D';
- output[outputPos++] = 'Z';
- break;
- case '\u01C5' : // Dž [LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON]
- case '\u01F2' : // Dz [LATIN CAPITAL LETTER D WITH SMALL LETTER Z]
- output[outputPos++] = 'D';
- output[outputPos++] = 'z';
- break;
- case '\u249F' : // ⒟ [PARENTHESIZED LATIN SMALL LETTER D]
- output[outputPos++] = '(';
- output[outputPos++] = 'd';
- output[outputPos++] = ')';
- break;
- case '\u0238' : // ȸ [LATIN SMALL LETTER DB DIGRAPH]
- output[outputPos++] = 'd';
- output[outputPos++] = 'b';
- break;
- case '\u01C6' : // dž [LATIN SMALL LETTER DZ WITH CARON]
- case '\u01F3' : // dz [LATIN SMALL LETTER DZ]
- case '\u02A3' : // ʣ [LATIN SMALL LETTER DZ DIGRAPH]
- case '\u02A5' : // ʥ [LATIN SMALL LETTER DZ DIGRAPH WITH CURL]
- output[outputPos++] = 'd';
- output[outputPos++] = 'z';
- break;
- case '\u00C8' : // È [LATIN CAPITAL LETTER E WITH GRAVE]
- case '\u00C9' : // É [LATIN CAPITAL LETTER E WITH ACUTE]
- case '\u00CA' : // Ê [LATIN CAPITAL LETTER E WITH CIRCUMFLEX]
- case '\u00CB' : // Ë [LATIN CAPITAL LETTER E WITH DIAERESIS]
- case '\u0112' : // Ē [LATIN CAPITAL LETTER E WITH MACRON]
- case '\u0114' : // Ĕ [LATIN CAPITAL LETTER E WITH BREVE]
- case '\u0116' : // Ė [LATIN CAPITAL LETTER E WITH DOT ABOVE]
- case '\u0118' : // Ę [LATIN CAPITAL LETTER E WITH OGONEK]
- case '\u011A' : // Ě [LATIN CAPITAL LETTER E WITH CARON]
- case '\u018E' : // Ǝ [LATIN CAPITAL LETTER REVERSED E]
- case '\u0190' : // Ɛ [LATIN CAPITAL LETTER OPEN E]
- case '\u0204' : // Ȅ [LATIN CAPITAL LETTER E WITH DOUBLE GRAVE]
- case '\u0206' : // Ȇ [LATIN CAPITAL LETTER E WITH INVERTED BREVE]
- case '\u0228' : // Ȩ [LATIN CAPITAL LETTER E WITH CEDILLA]
- case '\u0246' : // Ɇ [LATIN CAPITAL LETTER E WITH STROKE]
- case '\u1D07' : // ᴇ [LATIN LETTER SMALL CAPITAL E]
- case '\u1E14' : // Ḕ [LATIN CAPITAL LETTER E WITH MACRON AND GRAVE]
- case '\u1E16' : // Ḗ [LATIN CAPITAL LETTER E WITH MACRON AND ACUTE]
- case '\u1E18' : // Ḙ [LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW]
- case '\u1E1A' : // Ḛ [LATIN CAPITAL LETTER E WITH TILDE BELOW]
- case '\u1E1C' : // Ḝ [LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE]
- case '\u1EB8' : // Ẹ [LATIN CAPITAL LETTER E WITH DOT BELOW]
- case '\u1EBA' : // Ẻ [LATIN CAPITAL LETTER E WITH HOOK ABOVE]
- case '\u1EBC' : // Ẽ [LATIN CAPITAL LETTER E WITH TILDE]
- case '\u1EBE' : // Ế [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE]
- case '\u1EC0' : // Ề [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE]
- case '\u1EC2' : // Ể [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE]
- case '\u1EC4' : // Ễ [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE]
- case '\u1EC6' : // Ệ [LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW]
- case '\u24BA' : // Ⓔ [CIRCLED LATIN CAPITAL LETTER E]
- case '\u2C7B' : // ⱻ [LATIN LETTER SMALL CAPITAL TURNED E]
- case '\uFF25' : // Ｅ [FULLWIDTH LATIN CAPITAL LETTER E]
- output[outputPos++] = 'E';
- break;
- case '\u00E8' : // è [LATIN SMALL LETTER E WITH GRAVE]
- case '\u00E9' : // é [LATIN SMALL LETTER E WITH ACUTE]
- case '\u00EA' : // ê [LATIN SMALL LETTER E WITH CIRCUMFLEX]
- case '\u00EB' : // ë [LATIN SMALL LETTER E WITH DIAERESIS]
- case '\u0113' : // ē [LATIN SMALL LETTER E WITH MACRON]
- case '\u0115' : // ĕ [LATIN SMALL LETTER E WITH BREVE]
- case '\u0117' : // ė [LATIN SMALL LETTER E WITH DOT ABOVE]
- case '\u0119' : // ę [LATIN SMALL LETTER E WITH OGONEK]
- case '\u011B' : // ě [LATIN SMALL LETTER E WITH CARON]
- case '\u01DD' : // ǝ [LATIN SMALL LETTER TURNED E]
- case '\u0205' : // ȅ [LATIN SMALL LETTER E WITH DOUBLE GRAVE]
- case '\u0207' : // ȇ [LATIN SMALL LETTER E WITH INVERTED BREVE]
- case '\u0229' : // ȩ [LATIN SMALL LETTER E WITH CEDILLA]
- case '\u0247' : // ɇ [LATIN SMALL LETTER E WITH STROKE]
- case '\u0258' : // ɘ [LATIN SMALL LETTER REVERSED E]
- case '\u025B' : // ɛ [LATIN SMALL LETTER OPEN E]
- case '\u025C' : // ɜ [LATIN SMALL LETTER REVERSED OPEN E]
- case '\u025D' : // ɝ [LATIN SMALL LETTER REVERSED OPEN E WITH HOOK]
- case '\u025E' : // ɞ [LATIN SMALL LETTER CLOSED REVERSED OPEN E]
- case '\u029A' : // ʚ [LATIN SMALL LETTER CLOSED OPEN E]
- case '\u1D08' : // ᴈ [LATIN SMALL LETTER TURNED OPEN E]
- case '\u1D92' : // ᶒ [LATIN SMALL LETTER E WITH RETROFLEX HOOK]
- case '\u1D93' : // ᶓ [LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK]
- case '\u1D94' : // ᶔ [LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK]
- case '\u1E15' : // ḕ [LATIN SMALL LETTER E WITH MACRON AND GRAVE]
- case '\u1E17' : // ḗ [LATIN SMALL LETTER E WITH MACRON AND ACUTE]
- case '\u1E19' : // ḙ [LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW]
- case '\u1E1B' : // ḛ [LATIN SMALL LETTER E WITH TILDE BELOW]
- case '\u1E1D' : // ḝ [LATIN SMALL LETTER E WITH CEDILLA AND BREVE]
- case '\u1EB9' : // ẹ [LATIN SMALL LETTER E WITH DOT BELOW]
- case '\u1EBB' : // ẻ [LATIN SMALL LETTER E WITH HOOK ABOVE]
- case '\u1EBD' : // ẽ [LATIN SMALL LETTER E WITH TILDE]
- case '\u1EBF' : // ế [LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE]
- case '\u1EC1' : // ề [LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE]
- case '\u1EC3' : // ể [LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE]
- case '\u1EC5' : // ễ [LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE]
- case '\u1EC7' : // ệ [LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW]
- case '\u2091' : // ₑ [LATIN SUBSCRIPT SMALL LETTER E]
- case '\u24D4' : // ⓔ [CIRCLED LATIN SMALL LETTER E]
- case '\u2C78' : // ⱸ [LATIN SMALL LETTER E WITH NOTCH]
- case '\uFF45' : // ｅ [FULLWIDTH LATIN SMALL LETTER E]
- output[outputPos++] = 'e';
- break;
- case '\u24A0' : // ⒠ [PARENTHESIZED LATIN SMALL LETTER E]
- output[outputPos++] = '(';
- output[outputPos++] = 'e';
- output[outputPos++] = ')';
- break;
- case '\u0191' : // Ƒ [LATIN CAPITAL LETTER F WITH HOOK]
- case '\u1E1E' : // Ḟ [LATIN CAPITAL LETTER F WITH DOT ABOVE]
- case '\u24BB' : // Ⓕ [CIRCLED LATIN CAPITAL LETTER F]
- case '\uA730' : // ꜰ [LATIN LETTER SMALL CAPITAL F]
- case '\uA77B' : // Ꝼ [LATIN CAPITAL LETTER INSULAR F]
- case '\uA7FB' : // ꟻ [LATIN EPIGRAPHIC LETTER REVERSED F]
- case '\uFF26' : // Ｆ [FULLWIDTH LATIN CAPITAL LETTER F]
- output[outputPos++] = 'F';
- break;
- case '\u0192' : // ƒ [LATIN SMALL LETTER F WITH HOOK]
- case '\u1D6E' : // ᵮ [LATIN SMALL LETTER F WITH MIDDLE TILDE]
- case '\u1D82' : // ᶂ [LATIN SMALL LETTER F WITH PALATAL HOOK]
- case '\u1E1F' : // ḟ [LATIN SMALL LETTER F WITH DOT ABOVE]
- case '\u1E9B' : // ẛ [LATIN SMALL LETTER LONG S WITH DOT ABOVE]
- case '\u24D5' : // ⓕ [CIRCLED LATIN SMALL LETTER F]
- case '\uA77C' : // ꝼ [LATIN SMALL LETTER INSULAR F]
- case '\uFF46' : // ｆ [FULLWIDTH LATIN SMALL LETTER F]
- output[outputPos++] = 'f';
- break;
- case '\u24A1' : // ⒡ [PARENTHESIZED LATIN SMALL LETTER F]
- output[outputPos++] = '(';
- output[outputPos++] = 'f';
- output[outputPos++] = ')';
- break;
- case '\uFB00' : // ff [LATIN SMALL LIGATURE FF]
- output[outputPos++] = 'f';
- output[outputPos++] = 'f';
- break;
- case '\uFB03' : // ffi [LATIN SMALL LIGATURE FFI]
- output[outputPos++] = 'f';
- output[outputPos++] = 'f';
- output[outputPos++] = 'i';
- break;
- case '\uFB04' : // ffl [LATIN SMALL LIGATURE FFL]
- output[outputPos++] = 'f';
- output[outputPos++] = 'f';
- output[outputPos++] = 'l';
- break;
- case '\uFB01' : // fi [LATIN SMALL LIGATURE FI]
- output[outputPos++] = 'f';
- output[outputPos++] = 'i';
- break;
- case '\uFB02' : // fl [LATIN SMALL LIGATURE FL]
- output[outputPos++] = 'f';
- output[outputPos++] = 'l';
- break;
- case '\u011C' : // Ĝ [LATIN CAPITAL LETTER G WITH CIRCUMFLEX]
- case '\u011E' : // Ğ [LATIN CAPITAL LETTER G WITH BREVE]
- case '\u0120' : // Ġ [LATIN CAPITAL LETTER G WITH DOT ABOVE]
- case '\u0122' : // Ģ [LATIN CAPITAL LETTER G WITH CEDILLA]
- case '\u0193' : // Ɠ [LATIN CAPITAL LETTER G WITH HOOK]
- case '\u01E4' : // Ǥ [LATIN CAPITAL LETTER G WITH STROKE]
- case '\u01E5' : // ǥ [LATIN SMALL LETTER G WITH STROKE]
- case '\u01E6' : // Ǧ [LATIN CAPITAL LETTER G WITH CARON]
- case '\u01E7' : // ǧ [LATIN SMALL LETTER G WITH CARON]
- case '\u01F4' : // Ǵ [LATIN CAPITAL LETTER G WITH ACUTE]
- case '\u0262' : // ɢ [LATIN LETTER SMALL CAPITAL G]
- case '\u029B' : // ʛ [LATIN LETTER SMALL CAPITAL G WITH HOOK]
- case '\u1E20' : // Ḡ [LATIN CAPITAL LETTER G WITH MACRON]
- case '\u24BC' : // Ⓖ [CIRCLED LATIN CAPITAL LETTER G]
- case '\uA77D' : // Ᵹ [LATIN CAPITAL LETTER INSULAR G]
- case '\uA77E' : // Ꝿ [LATIN CAPITAL LETTER TURNED INSULAR G]
- case '\uFF27' : // Ｇ [FULLWIDTH LATIN CAPITAL LETTER G]
- output[outputPos++] = 'G';
- break;
- case '\u011D' : // ĝ [LATIN SMALL LETTER G WITH CIRCUMFLEX]
- case '\u011F' : // ğ [LATIN SMALL LETTER G WITH BREVE]
- case '\u0121' : // ġ [LATIN SMALL LETTER G WITH DOT ABOVE]
- case '\u0123' : // ģ [LATIN SMALL LETTER G WITH CEDILLA]
- case '\u01F5' : // ǵ [LATIN SMALL LETTER G WITH ACUTE]
- case '\u0260' : // ɠ [LATIN SMALL LETTER G WITH HOOK]
- case '\u0261' : // ɡ [LATIN SMALL LETTER SCRIPT G]
- case '\u1D77' : // ᵷ [LATIN SMALL LETTER TURNED G]
- case '\u1D79' : // ᵹ [LATIN SMALL LETTER INSULAR G]
- case '\u1D83' : // ᶃ [LATIN SMALL LETTER G WITH PALATAL HOOK]
- case '\u1E21' : // ḡ [LATIN SMALL LETTER G WITH MACRON]
- case '\u24D6' : // ⓖ [CIRCLED LATIN SMALL LETTER G]
- case '\uA77F' : // ꝿ [LATIN SMALL LETTER TURNED INSULAR G]
- case '\uFF47' : // ｇ [FULLWIDTH LATIN SMALL LETTER G]
- output[outputPos++] = 'g';
- break;
- case '\u24A2' : // ⒢ [PARENTHESIZED LATIN SMALL LETTER G]
- output[outputPos++] = '(';
- output[outputPos++] = 'g';
- output[outputPos++] = ')';
- break;
- case '\u0124' : // Ĥ [LATIN CAPITAL LETTER H WITH CIRCUMFLEX]
- case '\u0126' : // Ħ [LATIN CAPITAL LETTER H WITH STROKE]
- case '\u021E' : // Ȟ [LATIN CAPITAL LETTER H WITH CARON]
- case '\u029C' : // ʜ [LATIN LETTER SMALL CAPITAL H]
- case '\u1E22' : // Ḣ [LATIN CAPITAL LETTER H WITH DOT ABOVE]
- case '\u1E24' : // Ḥ [LATIN CAPITAL LETTER H WITH DOT BELOW]
- case '\u1E26' : // Ḧ [LATIN CAPITAL LETTER H WITH DIAERESIS]
- case '\u1E28' : // Ḩ [LATIN CAPITAL LETTER H WITH CEDILLA]
- case '\u1E2A' : // Ḫ [LATIN CAPITAL LETTER H WITH BREVE BELOW]
- case '\u24BD' : // Ⓗ [CIRCLED LATIN CAPITAL LETTER H]
- case '\u2C67' : // Ⱨ [LATIN CAPITAL LETTER H WITH DESCENDER]
- case '\u2C75' : // Ⱶ [LATIN CAPITAL LETTER HALF H]
- case '\uFF28' : // Ｈ [FULLWIDTH LATIN CAPITAL LETTER H]
- output[outputPos++] = 'H';
- break;
- case '\u0125' : // ĥ [LATIN SMALL LETTER H WITH CIRCUMFLEX]
- case '\u0127' : // ħ [LATIN SMALL LETTER H WITH STROKE]
- case '\u021F' : // ȟ [LATIN SMALL LETTER H WITH CARON]
- case '\u0265' : // ɥ [LATIN SMALL LETTER TURNED H]
- case '\u0266' : // ɦ [LATIN SMALL LETTER H WITH HOOK]
- case '\u02AE' : // ʮ [LATIN SMALL LETTER TURNED H WITH FISHHOOK]
- case '\u02AF' : // ʯ [LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL]
- case '\u1E23' : // ḣ [LATIN SMALL LETTER H WITH DOT ABOVE]
- case '\u1E25' : // ḥ [LATIN SMALL LETTER H WITH DOT BELOW]
- case '\u1E27' : // ḧ [LATIN SMALL LETTER H WITH DIAERESIS]
- case '\u1E29' : // ḩ [LATIN SMALL LETTER H WITH CEDILLA]
- case '\u1E2B' : // ḫ [LATIN SMALL LETTER H WITH BREVE BELOW]
- case '\u1E96' : // ẖ [LATIN SMALL LETTER H WITH LINE BELOW]
- case '\u24D7' : // ⓗ [CIRCLED LATIN SMALL LETTER H]
- case '\u2C68' : // ⱨ [LATIN SMALL LETTER H WITH DESCENDER]
- case '\u2C76' : // ⱶ [LATIN SMALL LETTER HALF H]
- case '\uFF48' : // ｈ [FULLWIDTH LATIN SMALL LETTER H]
- output[outputPos++] = 'h';
- break;
- case '\u01F6' : // Ƕ http://en.wikipedia.org/wiki/Hwair [LATIN CAPITAL LETTER HWAIR]
- output[outputPos++] = 'H';
- output[outputPos++] = 'V';
- break;
- case '\u24A3' : // ⒣ [PARENTHESIZED LATIN SMALL LETTER H]
- output[outputPos++] = '(';
- output[outputPos++] = 'h';
- output[outputPos++] = ')';
- break;
- case '\u0195' : // ƕ [LATIN SMALL LETTER HV]
- output[outputPos++] = 'h';
- output[outputPos++] = 'v';
- break;
- case '\u00CC' : // Ì [LATIN CAPITAL LETTER I WITH GRAVE]
- case '\u00CD' : // Í [LATIN CAPITAL LETTER I WITH ACUTE...
[truncated message content] |
