Attachment 914483 Details for Bug 956509 – Patch for Tomcat 6 context files creation

[patch] Patch for Tomcat 6 context files creation

storeconfig6-external-patch (text/plain), 9.08 KB, created by Rémy Maucherat on 2014-07-03 14:14:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rémy Maucherat

Created: 2014-07-03 14:14:19 UTC

Size: 9.08 KB

patch

obsolete

>Index: storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StandardContextSF.java
>===================================================================
>--- storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StandardContextSF.java	(revision 1524493)
>+++ storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StandardContextSF.java	(working copy)
>@@ -30,6 +30,7 @@
> import org.apache.catalina.Container;
> import org.apache.catalina.Context;
> import org.apache.catalina.Engine;
>+import org.apache.catalina.Globals;
> import org.apache.catalina.Host;
> import org.apache.catalina.Lifecycle;
> import org.apache.catalina.LifecycleListener;
>@@ -39,6 +40,7 @@
> import org.apache.catalina.Realm;
> import org.apache.catalina.Valve;
> import org.apache.catalina.core.StandardContext;
>+import org.apache.catalina.core.StandardHost;
> import org.apache.catalina.deploy.ApplicationParameter;
> import org.apache.catalina.deploy.NamingResources;
> import org.apache.juli.logging.Log;
>@@ -85,6 +87,19 @@
>                         return;
>                     }
>                 } else if (desc.isExternalOnly()) {
>+                    // Set a configFile so that the configuration is actually saved
>+                    Context context = ((StandardContext) aContext);
>+                    StandardHost host = (StandardHost) context.getParent();
>+                    File configBase = getConfigBaseFile(host);
>+                    ContextName cn = new ContextName(context.getName());
>+                    String baseName = cn.getBaseName();
>+                    File xml = new File(configBase, baseName + ".xml");
>+                    context.setConfigFile(xml.getAbsolutePath());
>+                    if (desc.isBackup())
>+                        storeWithBackup((StandardContext) aContext);
>+                    else
>+                        storeContextSeparate(aWriter, indent,
>+                                (StandardContext) aContext);
>                     return;
>                 }
>             }
>@@ -94,6 +109,33 @@
>     }
> 
>     /**
>+     * Return the Host config base path.
>+     */
>+    protected static File getConfigBaseFile(StandardHost host) {
>+
>+        String path = null;
>+        StringBuilder xmlDir = new StringBuilder("conf");
>+        Container parent = host.getParent();
>+        if (parent instanceof Engine) {
>+            xmlDir.append('/');
>+            xmlDir.append(parent.getName());
>+        }
>+        xmlDir.append('/');
>+        xmlDir.append(host.getName());
>+        path = xmlDir.toString();
>+
>+        File file = new File(path);
>+        File base = new File(System.getProperty("catalina.base"));
>+        if (!file.isAbsolute())
>+            file = new File(base,path);
>+        try {
>+            return file.getCanonicalFile();
>+        } catch (IOException e) {
>+            return file;
>+        }
>+    }
>+
>+    /**
>      * Store a Context without backup add separate file or when configFile =
>      * null a aWriter.
>      * 
>Index: storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ContextName.java
>===================================================================
>--- storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ContextName.java	(revision 0)
>+++ storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ContextName.java	(working copy)
>@@ -0,0 +1,189 @@
>+/*
>+ * Licensed to the Apache Software Foundation (ASF) under one or more
>+ * contributor license agreements.  See the NOTICE file distributed with
>+ * this work for additional information regarding copyright ownership.
>+ * The ASF licenses this file to You under the Apache License, Version 2.0
>+ * (the "License"); you may not use this file except in compliance with
>+ * the License.  You may obtain a copy of the License at
>+ * 
>+ *      http://www.apache.org/licenses/LICENSE-2.0
>+ * 
>+ * 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.apache.catalina.storeconfig;
>+
>+import java.util.Locale;
>+
>+/**
>+ * Utility class to manage context names so there is one place where the
>+ * conversions between baseName, path and version take place.
>+ */
>+public final class ContextName {
>+    private static final String ROOT_NAME = "ROOT";
>+    private static final String VERSION_MARKER = "##";
>+    private static final String FWD_SLASH_REPLACEMENT = "#";
>+
>+    private final String baseName;
>+    private final String path;
>+    private final String version;
>+    private final String name;
>+    
>+    /**
>+     * Creates an instance from a context name, display name, base name,
>+     * directory name, WAR name or context.xml name.
>+     * 
>+     * @param name  The name to use as the basis for this object
>+     * 
>+     * @deprecated  Use {@link ContextName#ContextName(String, boolean)}
>+     */
>+    @Deprecated
>+    public ContextName(String name) {
>+        this(name, true);
>+    }
>+    
>+    
>+    /**
>+     * Creates an instance from a context name, display name, base name,
>+     * directory name, WAR name or context.xml name.
>+     * 
>+     * @param name  The name to use as the basis for this object
>+     * @param stripFileExtension    If a .war or .xml file extension is present
>+     *                              at the end of the provided name should it be
>+     *                              removed?
>+     */
>+    public ContextName(String name, boolean stripFileExtension) {
>+        
>+        String tmp1 = name;
>+        
>+        // Convert Context names and display names to base names
>+        
>+        // Strip off any leading "/"
>+        if (tmp1.startsWith("/")) {
>+            tmp1 = tmp1.substring(1);
>+        }
>+        
>+        // Replace any remaining /
>+        tmp1 = tmp1.replaceAll("/", FWD_SLASH_REPLACEMENT);
>+        
>+        // Insert the ROOT name if required
>+        if (tmp1.startsWith(VERSION_MARKER) || "".equals(tmp1)) {
>+            tmp1 = ROOT_NAME + tmp1;
>+        }
>+
>+        // Remove any file extensions
>+        if (stripFileExtension &&
>+                (tmp1.toLowerCase(Locale.ENGLISH).endsWith(".war") ||
>+                        tmp1.toLowerCase(Locale.ENGLISH).endsWith(".xml"))) {
>+            tmp1 = tmp1.substring(0, tmp1.length() -4);
>+        }
>+
>+        baseName = tmp1;
>+        
>+        String tmp2;
>+        // Extract version number
>+        int versionIndex = baseName.indexOf(VERSION_MARKER);
>+        if (versionIndex > -1) {
>+            version = baseName.substring(versionIndex + 2);
>+            tmp2 = baseName.substring(0, versionIndex);
>+        } else {
>+            version = "";
>+            tmp2 = baseName;
>+        }
>+
>+        if (ROOT_NAME.equals(tmp2)) {
>+            path = "";
>+        } else {
>+            path = "/" + tmp2.replaceAll(FWD_SLASH_REPLACEMENT, "/");
>+        }
>+        
>+        if (versionIndex > -1) {
>+            this.name = path + VERSION_MARKER + version;
>+        } else {
>+            this.name = path;
>+        }
>+    }
>+    
>+    /**
>+     * Construct an instance from a path and version.
>+     * 
>+     * @param path      Context path to use
>+     * @param version   Context version to use
>+     */
>+    public ContextName(String path, String version) {
>+        // Path should never be null, '/' or '/ROOT'
>+        if (path == null || "/".equals(path) || "/ROOT".equals(path)) {
>+            this.path = "";
>+        } else {
>+            this.path = path;
>+        }
>+
>+        // Version should never be null
>+        if (version == null) {
>+            this.version = "";
>+        } else {
>+            this.version = version;
>+        }
>+        
>+        // Name is path + version
>+        if ("".equals(this.version)) {
>+            name = this.path;
>+        } else {
>+            name = this.path + VERSION_MARKER + this.version;
>+        }
>+
>+        // Base name is converted path + version
>+        StringBuilder tmp = new StringBuilder();
>+        if ("".equals(this.path)) {
>+            tmp.append(ROOT_NAME);
>+        } else {
>+            tmp.append(this.path.substring(1).replaceAll("/",
>+                    FWD_SLASH_REPLACEMENT));
>+        }
>+        if (this.version.length() > 0) {
>+            tmp.append(VERSION_MARKER);
>+            tmp.append(this.version);
>+        }
>+        this.baseName = tmp.toString();
>+    }
>+
>+    public String getBaseName() {
>+        return baseName;
>+    }
>+    
>+    public String getPath() {
>+        return path;
>+    }
>+    
>+    public String getVersion() {
>+        return version;
>+    }
>+    
>+    public String getName() {
>+        return name;
>+    }
>+
>+    public String getDisplayName() {
>+        StringBuilder tmp = new StringBuilder();
>+        if ("".equals(path)) {
>+            tmp.append('/');
>+        } else {
>+            tmp.append(path);
>+        }
>+        
>+        if (!"".equals(version)) {
>+            tmp.append(VERSION_MARKER);
>+            tmp.append(version);
>+        }
>+        
>+        return tmp.toString();
>+    }
>+    
>+    @Override
>+    public String toString() {
>+        return getDisplayName();
>+    }
>+}
>

Actions: View | Diff

Attachments on bug 956509: 790881 | 790882 | 790974 | 793762 | 793764 | 793768 | 810029 | 810181 | 810182 | 911655 | 911656 | 911657 | 911658 | 911676 | 912410 | 914483