Merge 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4351 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4352 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4353 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4362 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-07-24 17:32:48 +00:00 · 2006-12-19 14:36:46 +00:00
parent 488450a988
commit 760cb0fe77
20 changed files with 332 additions and 148 deletions
--- a/source/java/org/alfresco/repo/admin/patch/impl/SystemDescriptorContentPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/SystemDescriptorContentPatch.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.repo.admin.patch.impl;
+
+import java.io.InputStream;
+
+import org.alfresco.i18n.I18NUtil;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.admin.ConfigurationChecker;
+import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.admin.PatchException;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+
+/**
+ * Ensures that the required content snippet is added to the system descriptor
+ * to enable robust checking of the content store by the configuration checker.
+ * 
+ * @author Derek Hulley
+ */
+public class SystemDescriptorContentPatch extends AbstractPatch
+{
+    private static final String MSG_SUCCESS = "patch.systemDescriptorContent.result";
+    private static final String ERR_NO_VERSION_PROPERTIES = "patch.systemDescriptorContent.err.no_version_properties";
+    private static final String ERR_NO_SYSTEM_DESCRIPTOR = "patch.systemDescriptorContent.err.no_descriptor";
+    
+    private ConfigurationChecker configurationChecker;
+    private ContentService contentService;
+    
+    public SystemDescriptorContentPatch()
+    {
+    }
+    
+    public void setConfigurationChecker(ConfigurationChecker configurationChecker)
+    {
+        this.configurationChecker = configurationChecker;
+    }
+
+    public void setContentService(ContentService contentService)
+    {
+        this.contentService = contentService;
+    }
+
+    @Override
+    protected void checkProperties()
+    {
+        super.checkProperties();
+        checkPropertyNotNull(configurationChecker, "configurationChecker");
+        checkPropertyNotNull(contentService, "contentService");
+    }
+
+    @Override
+    protected String applyInternal() throws Exception
+    {
+        InputStream is = null;
+        try
+        {
+            // get the version.properties
+            ResourceLoader resourceLoader = new DefaultResourceLoader();
+            Resource resource = resourceLoader.getResource("classpath:alfresco/version.properties");
+            if (!resource.exists())
+            {
+                throw new PatchException(ERR_NO_VERSION_PROPERTIES);
+            }
+            is = resource.getInputStream();
+            // get the system descriptor
+            NodeRef descriptorNodeRef = configurationChecker.getSystemDescriptor();
+            if (descriptorNodeRef == null)
+            {
+                throw new PatchException(ERR_NO_SYSTEM_DESCRIPTOR);
+            }
+            // get the writer
+            ContentWriter writer = contentService.getWriter(descriptorNodeRef, ContentModel.PROP_SYS_VERSION_PROPERTIES, true);
+            // upload
+            writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            writer.setEncoding("UTF8");
+            writer.putContent(is);
+            // done
+            String msg = I18NUtil.getMessage(MSG_SUCCESS);
+            return msg;
+        }
+        finally
+        {
+            if (is != null)
+            {
+                try { is.close(); } catch (Throwable e) {}
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+