/*
 * [The "BSD licence"]
 * Copyright (c) 2013 Dandelion
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 * notice, this list of conditions and the following disclaimer in the
 * documentation and/or other materials provided with the distribution.
 * 3. Neither the name of Dandelion nor the names of its contributors
 * may be used to endorse or promote products derived from this software
 * without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package com.github.dandelion.core.asset.wrapper.impl;

import com.github.dandelion.core.asset.Asset;
import com.github.dandelion.core.asset.wrapper.spi.AssetLocationWrapper;
import com.github.dandelion.core.utils.RequestUtils;
import com.github.dandelion.core.utils.ResourceUtils;

import javax.servlet.http.HttpServletRequest;

/**
 * Wrapper for "webapp" location
 */
public class WebappLocationWrapper implements AssetLocationWrapper {

    /**
     * {@inheritDoc}
     */
    @Override
    public String locationKey() {
        return "webapp";
    }

    /**
     * {@inheritDoc}
     */
    @Override
    public String wrapLocation(Asset asset, HttpServletRequest request) {
        String location = asset.getLocations().get(locationKey());
        String base = RequestUtils.getBaseUrl(request);
        return (base.endsWith("/")?base:base+"/") + location;
    }

    /**
     * {@inheritDoc}
     */
    @Override
    public String getWrappedContent(Asset asset, HttpServletRequest request) {
        String location = asset.getLocations().get(locationKey());
        return ResourceUtils.getContentFromUrl(location, true);
    }
}
@@ -2330,49 +2330,305 @@
     
-return (base.endsWith(%22/%22)?base:base+%22/%22)
+boolean pathLocation = location.startsWith(%22/%22);%0A        boolean pathBase = base.endsWith(%22/%22);%0A        if(pathLocation && pathBase) %7B%0A            location = location.substring(1);%0A        %7D else if(!pathLocation && !pathBase) %7B%0A            location = %22/%22 + location;%0A        %7D%0A        return base
  + l

Fix the dual slash on webapp generated location