Skip to content

fix path resolution under windows #24

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

Open
wants to merge 2 commits into
base: tc8.x
Choose a base branch
from
Open

fix path resolution under windows #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11dd147
fix path resolution under windows
Jun 20, 2016
71c1ac5
Use URI instead of URL in urlToWebResource method
Jun 20, 2016
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
14 changes: 10 additions & 4 deletions tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,11 +470,13 @@ private WebResource urlToWebResource( URL url, String path )
// url.getFile is
// file:/Users/olamy/mvn-repo/org/springframework/spring-web/4.0.0.RELEASE/spring-web-4.0.0.RELEASE.jar!/org/springframework/web/context/ContextLoaderListener.class

int idx = url.getFile().indexOf( '!' );
URI uri = new URI(url.getFile());
String filePath = uri.getPath();
int idx = filePath.indexOf( '!' );

if ( idx >= 0 )
{
String filePath = StringUtils.removeStart( url.getFile().substring( 0, idx ), "file:" );
filePath = filePath.substring( 0, idx);

jarFile = new JarFile( filePath );

Expand All @@ -483,17 +485,21 @@ private WebResource urlToWebResource( URL url, String path )
return new JarResource( this, //
getPath(), //
filePath, //
url.getPath().substring( 0, idx ), //
"file:"+filePath, //
jarEntry, //
"", //
null );
}
else
{
return new FileResource( this, webAppPath, new File( url.getFile() ), true );
return new FileResource( this, webAppPath, new File( filePath ), true );
}

}
catch (URISyntaxException e)
{
throw new RuntimeException( e.getMessage(), e );
}
catch ( IOException e )
{
throw new RuntimeException( e.getMessage(), e );
Expand Down