diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-31 08:57:43 +0100 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-31 08:57:43 +0100 |
| commit | 327a7e538d35ca6a582e2d812a2d1c8afd625d17 (patch) | |
| tree | 68482b0a3a95cb99b43a3b838e104910b064dd48 /src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java | |
| parent | fcb737024b9672dd73b014a53246252f95628989 (diff) | |
| download | maven-nar-plugin-327a7e538d35ca6a582e2d812a2d1c8afd625d17.tar.gz maven-nar-plugin-327a7e538d35ca6a582e2d812a2d1c8afd625d17.tar.bz2 maven-nar-plugin-327a7e538d35ca6a582e2d812a2d1c8afd625d17.tar.xz maven-nar-plugin-327a7e538d35ca6a582e2d812a2d1c8afd625d17.zip | |
Libs now in correct place in target, part of NAR-90
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java')
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java index ce700a5..b81de03 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java @@ -972,7 +972,7 @@ public class NarIntegrationTestMojo if ( testJNIModule() ) { // Add libraries to java.library.path for testing - File jniLibraryPathEntry = new File( project.getBasedir(), "target/nar/lib/" + getAOL() + "/jni" ); + File jniLibraryPathEntry = getLayout().getLibDirectory( getTargetDirectory(), getAOL().toString(), Library.JNI ); if ( jniLibraryPathEntry.exists() ) { getLog().debug( "Adding library directory to java.library.path: " + jniLibraryPathEntry ); @@ -981,7 +981,7 @@ public class NarIntegrationTestMojo javaLibraryPath.append( jniLibraryPathEntry ); } - File sharedLibraryPathEntry = new File( project.getBasedir(), "target/nar/lib/" + getAOL() + "/shared" ); + File sharedLibraryPathEntry = getLayout().getLibDirectory( getTargetDirectory(), getAOL().toString(), Library.SHARED ); if ( sharedLibraryPathEntry.exists() ) { getLog().debug( "Adding library directory to java.library.path: " + sharedLibraryPathEntry ); @@ -1011,6 +1011,7 @@ public class NarIntegrationTestMojo String binding = bindings[j]; if ( !binding.equals( Library.STATIC ) ) { + // FIXME NAR-90 in repo File depLibPathEntry = new File( getNarManager().getNarFile( dependency ).getParent(), "nar/lib/" + getAOL() + "/" + binding ); |