Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'jetty-9.4.x' into 'master'.

This commit is contained in:
Simone Bordet 2017-08-02 23:02:06 +02:00
parent 6494c2ce7c f6c0485933
commit 4bee2e877f
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
View File

@ -513,19 +513,6 @@ public class JettyRunForkedMojo extends JettyRunMojo
props.put("testClasses.dir", webApp.getTestClasses().getAbsolutePath()); props.put("testClasses.dir", webApp.getTestClasses().getAbsolutePath());
} }
if ( !webApp.getClassPathFiles().isEmpty() )
{
StringBuilder stringBuilder = new StringBuilder();
for ( File dependency : webApp.getClassPathFiles() )
{
if (dependency.isDirectory())
{
stringBuilder.append( dependency.getCanonicalPath() ).append( '|' );
}
}
props.put( "projects.classes.dir", stringBuilder.toString() );
}
//web-inf lib //web-inf lib
List<File> deps = webApp.getWebInfLib(); List<File> deps = webApp.getWebInfLib();
StringBuffer strbuff = new StringBuffer(); StringBuffer strbuff = new StringBuffer();

10
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java
View File

@ -314,16 +314,6 @@ public class Starter
jars.add(new File(names[j].trim())); jars.add(new File(names[j].trim()));
webApp.setWebInfLib(jars); webApp.setWebInfLib(jars);
} }
str = props.getProperty( "projects.classes.dir" );
if (str != null && !"".equals(str.trim()))
{
List<File> classesDirectories = //
Arrays.stream(str.split( Pattern.quote("|") )) //
.map( s -> Paths.get( s).toFile() ).collect( Collectors.toList() );
webApp.getWebInfLib().addAll( classesDirectories );
}
} }
public void getConfiguration (String[] args) public void getConfiguration (String[] args)