Added some XML update actions to the updater.

Author: gWestenberger

src-setup/org/opencms/setup/xml/CmsSetupXmlManager.java

@@ -198,6 +198,7 @@ public void initialize(int detectedVersion) {
         m_plugins.add(new org.opencms.setup.xml.v8.CmsXmlAddResourceTypeParams());
         m_plugins.add(new org.opencms.setup.xml.v8.CmsXmlAddWidgets());
         m_plugins.add(new org.opencms.setup.xml.v8.CmsXmlAddCollectors());
+        m_plugins.add(new org.opencms.setup.xml.v8.CmsXmlAddTypeMappings());
         //m_plugins.add(new org.opencms.setup.xml.v8.CmsXmlUpdateSchemaTypes());
 
         // workplace

src-setup/org/opencms/setup/xml/v8/CmsXmlAddADESearch.java

@@ -164,6 +164,42 @@ protected void removeTypes(Node node) {
         }
     }
 
+    class ElementReplaceAction extends CmsXmlUpdateAction {
+
+        private String m_replacementXml;
+
+        private String m_xpath;
+
+        public ElementReplaceAction(String xpath, String replacementXml) {
+
+            m_xpath = xpath;
+            m_replacementXml = replacementXml;
+        }
+
+        @Override
+        public boolean executeUpdate(Document doc, String xpath, boolean forReal) {
+
+            if (!forReal) {
+                return true;
+            }
+            Node node = doc.selectSingleNode(m_xpath);
+            if (node != null) {
+                Element parent = node.getParent();
+                node.detach();
+                try {
+                    Element element = createElementFromXml(m_replacementXml);
+                    parent.add(element);
+                    return true;
+                } catch (DocumentException e) {
+                    e.printStackTrace(System.out);
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+    }
+
     /** A map from xpaths to XML update actions.<p> */
     private Map<String, CmsXmlUpdateAction> m_actions;
 
@@ -795,5 +831,19 @@ public boolean executeUpdate(Document document, String xpath, boolean forReal) {
             buildXpathForIndexedDocumentType("source1", "containerpage"),
             createIndexedTypeAction("containerpage"));
 
+        //=============================================================================================================
+
+        String analyzerEnPath = "/opencms/search/analyzers/analyzer[class='org.apache.lucene.analysis.standard.StandardAnalyzer'][locale='en']";
+        m_actions.put(analyzerEnPath, new ElementReplaceAction(analyzerEnPath, "<analyzer>\n"
+            + "                <class>org.apache.lucene.analysis.en.EnglishAnalyzer</class>\n"
+            + "                <locale>en</locale>\n"
+            + "            </analyzer>"));
+
+        String analyzerItPath = "/opencms/search/analyzers/analyzer[class='org.apache.lucene.analysis.snowball.SnowballAnalyzer'][stemmer='Italian']";
+        m_actions.put(analyzerItPath, new ElementReplaceAction(analyzerItPath, "<analyzer>\n"
+            + "                <class>org.apache.lucene.analysis.it.ItalianAnalyzer</class>\n"
+            + "                <locale>it</locale>\n"
+            + "            </analyzer>"));
+
     }
 }

src-setup/org/opencms/setup/xml/v8/CmsXmlAddTypeMappings.java

@@ -47,13 +47,13 @@
  */
 public class CmsXmlAddTypeMappings extends A_CmsXmlVfs {
 
-    /** List of xpaths to update. */
-    private List<String> m_xpaths;
-
     /** 
      * The new widget definition data.<p>
      */
-    private String[] m_suffixes = {".flv", ".swf"};
+    private String[] m_suffixes = {".flv", ".swf", ".docx", ".xlsx", ".pptx"};
+
+    /** List of xpaths to update. */
+    private List<String> m_xpaths;
 
     /**
      * @see org.opencms.setup.xml.I_CmsSetupXmlUpdate#getName()
@@ -78,16 +78,16 @@ public boolean validate(CmsSetupBean setupBean) throws Exception {
     @Override
     protected boolean executeUpdate(Document document, String xpath, boolean forReal) {
 
+        boolean result = false;
         for (int i = 0; i < m_suffixes.length; i++) {
             if (xpath.equals(getXPathsToUpdate().get(i))) {
-                if (document.selectSingleNode(xpath) != null) {
-                    return false;
+                if (document.selectSingleNode(xpath) == null) {
+                    CmsSetupXmlHelper.setValue(document, xpath, "");
+                    result = true;
                 }
-                CmsSetupXmlHelper.setValue(document, xpath, "");
-                return true;
             }
         }
-        return false;
+        return result;
     }
 
     /**
@@ -114,23 +114,6 @@ protected List<String> getXPathsToUpdate() {
         return m_xpaths;
     }
 
-    /**
-     * Returns the xpath for a the resourcetypes node.<p>
-     * 
-     * @return the xpath for the resourcetypes node 
-     */
-    protected String xpathForTypes() {
-
-        return "/"
-            + CmsConfigurationManager.N_ROOT
-            + "/"
-            + CmsVfsConfiguration.N_VFS
-            + "/"
-            + CmsVfsConfiguration.N_RESOURCES
-            + "/"
-            + CmsVfsConfiguration.N_RESOURCETYPES;
-    }
-
     /**
      * Returns the xpath for the type node with a given type name.<p>
      * 
@@ -171,4 +154,21 @@ protected String xpathForTypeMapping(String type, String suffix) {
             + "']";
     }
 
+    /**
+     * Returns the xpath for a the resourcetypes node.<p>
+     * 
+     * @return the xpath for the resourcetypes node 
+     */
+    protected String xpathForTypes() {
+
+        return "/"
+            + CmsConfigurationManager.N_ROOT
+            + "/"
+            + CmsVfsConfiguration.N_VFS
+            + "/"
+            + CmsVfsConfiguration.N_RESOURCES
+            + "/"
+            + CmsVfsConfiguration.N_RESOURCETYPES;
+    }
+
 }