diff --git a/assemblies/apache-karaf/src/main/descriptors/src.xml b/assemblies/apache-karaf/src/main/descriptors/src.xml index 84c2ec18fad..fabbde4b09d 100644 --- a/assemblies/apache-karaf/src/main/descriptors/src.xml +++ b/assemblies/apache-karaf/src/main/descriptors/src.xml @@ -34,7 +34,14 @@ **/.idea/** **/*.jar **/*.kar - **/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/** + **/*.dll + **/*.exe + **/*.so + **/*.jnilib + **/*.dylib + **/*.lib + **/*.a + **/*.o diff --git a/wrapper/pom.xml b/wrapper/pom.xml index ac0424f28f7..8e285594664 100644 --- a/wrapper/pom.xml +++ b/wrapper/pom.xml @@ -100,6 +100,99 @@ + + org.apache.maven.plugins + maven-antrun-plugin + + + get-wrapper-native-lib + generate-resources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-dependency-plugin @@ -146,10 +239,7 @@ org.apache.karaf.wrapper.commands, - org.apache.karaf.wrapper.internal, - org.apache.karaf.wrapper.internal.all, - org.apache.karaf.wrapper.internal.osgi, - org.apache.karaf.wrapper.internal.service, + org.apache.karaf.wrapper.internal*, org.apache.karaf.wrapper.management.internal, diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc32/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc32/karaf-wrapper deleted file mode 100755 index 5215c2edd87..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc32/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc32/libwrapper.a b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc32/libwrapper.a deleted file mode 100755 index 4bcc342686d..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc32/libwrapper.a and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc64/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc64/karaf-wrapper deleted file mode 100755 index 6ba0351341b..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc64/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc64/libwrapper.a b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc64/libwrapper.a deleted file mode 100755 index b569e3f7e3c..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/aix/ppc64/libwrapper.a and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/hpux/parisc64/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/hpux/parisc64/karaf-wrapper deleted file mode 100755 index ad883d7e9fe..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/hpux/parisc64/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/hpux/parisc64/libwrapper.sl b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/hpux/parisc64/libwrapper.sl deleted file mode 100755 index 08adc5246a0..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/hpux/parisc64/libwrapper.sl and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux/karaf-wrapper deleted file mode 100644 index 7e0064596e2..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux/libwrapper.so b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux/libwrapper.so deleted file mode 100644 index 2cc4ab3cebe..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux/libwrapper.so and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux64/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux64/karaf-wrapper deleted file mode 100644 index 3128b95b491..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux64/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux64/libwrapper.so b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux64/libwrapper.so deleted file mode 100644 index 24197bf6e20..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/linux64/libwrapper.so and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/macosx/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/macosx/karaf-wrapper deleted file mode 100644 index 0165db0b9f0..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/macosx/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/macosx/libwrapper.jnilib b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/macosx/libwrapper.jnilib deleted file mode 100644 index 63567057bd2..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/macosx/libwrapper.jnilib and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc32/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc32/karaf-wrapper deleted file mode 100755 index 7cac2080fa5..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc32/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc32/libwrapper.so b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc32/libwrapper.so deleted file mode 100755 index 409326265d3..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc32/libwrapper.so and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc64/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc64/karaf-wrapper deleted file mode 100755 index 91257c600e9..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc64/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc64/libwrapper.so b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc64/libwrapper.so deleted file mode 100755 index 008bef61814..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/sparc64/libwrapper.so and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86/karaf-wrapper deleted file mode 100755 index bdec2543160..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86/libwrapper.so b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86/libwrapper.so deleted file mode 100755 index 963ff498f90..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86/libwrapper.so and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper deleted file mode 100755 index 6bd165e3683..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so deleted file mode 100755 index 0d52ffa7927..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.exe b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.exe deleted file mode 100644 index b4cfc557c06..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.exe and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/wrapper.dll b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/wrapper.dll deleted file mode 100644 index cb553c12340..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/wrapper.dll and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.exe b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.exe deleted file mode 100755 index db2dddae8c4..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.exe and /dev/null differ diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/wrapper.dll b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/wrapper.dll deleted file mode 100644 index f07fc9e582b..00000000000 Binary files a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/wrapper.dll and /dev/null differ