Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the issue with spaces into the designer path on "viewer web server" side (part 02, #1621) #1629

Merged
merged 1 commit into from
Apr 7, 2024
Merged

Fix the issue with spaces into the designer path on "viewer web server" side (part 02, #1621) #1629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...ipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/utilities/ViewerWebServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.eclipse.birt.report.viewer.ViewerPlugin;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.URIUtil;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.resource.ResourceFactory;
Expand Down Expand Up @@ -93,17 +94,17 @@ private static Server startAndConfigure(String httpListenOnAddress, int httpServ

for (String xmlFile : configFiles) {
URL url = bundle.getEntry(jettyBase + xmlFile);
URL fileURL = FileLocator.toFileURL(url);
URL fileURL = URIUtil.toURI(FileLocator.toFileURL(url)).toURL();
if (fileURL != null) {
resolvedXmlPaths.add(fileURL);
}
}

URL jettyHomeUrl = bundle.getEntry(JETTY_FOLDER_NAME + "/" + JETTY_HOME_FOLDER_NAME);
URL jettyHomeFileUrl = FileLocator.toFileURL(jettyHomeUrl);
URL jettyHomeFileUrl = URIUtil.toURI(FileLocator.toFileURL(jettyHomeUrl)).toURL();

URL jettyBaseUrl = bundle.getEntry(JETTY_FOLDER_NAME + "/" + JETTY_BASE_FOLDER_NAME);
URL jettyBaseFileUrl = FileLocator.toFileURL(jettyBaseUrl);
URL jettyBaseFileUrl = URIUtil.toURI(FileLocator.toFileURL(jettyBaseUrl)).toURL();

// Lets load our properties
Map<String, String> properties = new HashMap<>();
Expand Down
Loading