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

Jump to bottom

#58 issue fix #59

Closed
wants to merge 1 commit into from
Closed

#58 issue fix #59

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
11 changes: 8 additions & 3 deletions src/main/java/com/lazerycode/jmeter/JMeterAbstractMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ public abstract class JMeterAbstractMojo extends AbstractMojo {
* @description JMeter Global Properties that override those given in jmeterProps. <br>
* This sets local and remote properties (JMeter's definition of global properties is actually remote properties)
* and overrides any local/remote properties already set.
*
*/
protected Map<String, String> propertiesGlobal;

Expand Down Expand Up @@ -195,6 +194,7 @@ public abstract class JMeterAbstractMojo extends AbstractMojo {

/**
* JMeter outputs.
*
* @parameter expression="${project.build.directory}/jmeter"
* @description Place where the JMeter files will be generated.
*/
Expand Down Expand Up @@ -222,7 +222,7 @@ public abstract class JMeterAbstractMojo extends AbstractMojo {
* Generate the directory tree utilised by JMeter.
*/
protected void generateJMeterDirectoryTree() {
this.logsDir = new File(this.workDir,"logs");
this.logsDir = new File(this.workDir, "logs");
this.logsDir.mkdirs();
this.binDir = new File(this.workDir, "bin");
this.binDir.mkdirs();
Expand Down Expand Up @@ -285,7 +285,12 @@ protected void populateJMeterDirectoryTree() throws MojoExecutionException {
* Need more info on above, how do we know which ones to exclude??
* Most of the files pulled down by maven are required in /lib to match standard JMeter install
*/
FileUtils.copyFile(artifact.getFile(), new File(this.libDir + File.separator + artifact.getFile().getName()));
// runtime dependencies copy to /lib/ext folder
if (Artifact.SCOPE_RUNTIME.equals(artifact.getScope())) {
FileUtils.copyFile(artifact.getFile(), new File(this.libExtDir + File.separator + artifact.getFile().getName()));
} else {
FileUtils.copyFile(artifact.getFile(), new File(this.libDir + File.separator + artifact.getFile().getName()));
}
}
} catch (IOException e) {
throw new MojoExecutionException("Unable to populate the JMeter directory tree: " + e);
Expand Down