diff --git a/.gitignore b/.gitignore index e09c89c..bfaa32d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -/target -/.settings -/.classpath -/.project +target +.settings +.classpath +.project libtool install-sh Makefile.in diff --git a/TODO.txt b/TODO.txt deleted file mode 100644 index 0ae00a0..0000000 --- a/TODO.txt +++ /dev/null @@ -1,5 +0,0 @@ -* Do extensive tests with USB pipes. interrupt data transfer seems to work - (MouseDriver demo is working) but never used bulk transfer and it's unclear - if the queue implementation is working correctly under stress. - -* Implement Control transfers in pipe. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2275c6c..3443dea 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 de.ailis.usb4java - usb4java - jar + usb4java-parent + pom usb4java - 0.3.5-SNAPSHOT - http://kayahr.github.com/${project.artifactId}/ + 0.4.0-SNAPSHOT + http://kayahr.github.com/usb4java/ USB library for Java based on libusb-0.1.x and implementing javax.usb (JSR-80). @@ -41,79 +41,37 @@ UTF-8 - http://nexus.ailis.de/content/repositories/releases/de/ailis/${project.artifactId}/${project.artifactId}/${project.version} - http://nexus.ailis.de/content/repositories/snapshots/de/ailis/${project.artifactId}/${project.artifactId} + http://nexus.ailis.de/content/repositories/releases/de/ailis/usb4java/usb4java/${project.version} + http://nexus.ailis.de/content/repositories/snapshots/de/ailis/usb4java/usb4java - scm:git:git://github.com/kayahr/${project.artifactId}.git - scm:git:ssh://git@github.com/kayahr/${project.artifactId}.git - http://github.com/kayahr/${project.artifactId} + scm:git:git://github.com/kayahr/usb4java.git + scm:git:ssh://git@github.com/kayahr/usb4java.git + http://github.com/kayahr/usb4java GitHub - https://github.com/kayahr/${project.artifactId}/issues + https://github.com/kayahr/usb4java/issues - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - + + - - org.apache.maven.plugins - maven-site-plugin - 3.0 - - false - en - ${project.build.sourceEncoding} - ${project.build.sourceEncoding} - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.4 - - false - false - - - summary - dependencies - project-team - issue-tracking - license - scm - - - - org.apache.maven.plugins - maven-changes-plugin - 2.6 - - - - changes-report - - - - - - - - - + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + ${project.build.sourceEncoding} + + + + @@ -136,7 +94,7 @@ project-website - file://${project.basedir}/../${project.artifactId}-site/ + file://${project.basedir}/../usb4java-site/ ailis-releases @@ -150,12 +108,29 @@ - - - javax.usb - usb - 1.0.2 - - + + + + de.ailis.usb4java + usb4java + ${project.version} + + + de.ailis.usb4java + usb4java-natives + ${project.version} + + + javax.usb + usb + 1.0.2 + + + + + usb4java + usb4java-natives + + diff --git a/src/config/usb4java_checks.xml b/src/config/usb4java_checks.xml deleted file mode 100644 index d54dbb7..0000000 --- a/src/config/usb4java_checks.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/windows-x86/libusb4java.dll b/src/main/resources/windows-x86/libusb4java.dll deleted file mode 100755 index bd840d9..0000000 Binary files a/src/main/resources/windows-x86/libusb4java.dll and /dev/null differ diff --git a/src/main/resources/windows-x86_64/libusb4java.dll b/src/main/resources/windows-x86_64/libusb4java.dll deleted file mode 100755 index d4aa5c4..0000000 Binary files a/src/main/resources/windows-x86_64/libusb4java.dll and /dev/null differ diff --git a/src/site/apt/download.apt.vm b/src/site/apt/download.apt.vm deleted file mode 100644 index c427d71..0000000 --- a/src/site/apt/download.apt.vm +++ /dev/null @@ -1,51 +0,0 @@ - ----------------------------------------------------------------------------- - Download - ----------------------------------------------------------------------------- - -Download - -* Binaries - - First of all you need the platform independent Java library for usb4java: - - * {{{${releasesUrl}/usb4java-${project.version}.jar}usb4java-${project.version}.jar}} - - [] - - Additionally you need the JNI library for the platform on which you want - to use usb4java. The JARs for Windows and Mac OS X also contain the libusb - shared library. On Linux machines this library is provided by the linux - distribution (Usually a package called libusb, make sure it is version 0.x - and not the newer 1.x). - - * {{{${releasesUrl}/usb4java-${project.version}-linux-x86.jar}usb4java-${project.version}-linux-x86.jar}} - - * {{{${releasesUrl}/usb4java-${project.version}-linux-x86_64.jar}usb4java-${project.version}-linux-x86_64.jar}} - - * {{{${releasesUrl}/usb4java-${project.version}-windows-x86.jar}usb4java-${project.version}-windows-x86.jar}} - - * {{{${releasesUrl}/usb4java-${project.version}-windows-x86_64.jar}usb4java-${project.version}-windows-x86_64.jar}} - - * {{{${releasesUrl}/usb4java-${project.version}-macosx-universal.jar}usb4java-${project.version}-macosx-universal.jar}} - - [] - - If you prefer using bleeding edge snapshots then you can download - them from the {{{$snapshotsUrl/}snapshot repository}}. - - -* Sources - - You can also compile usb4java manually. Simply download one of the following - archives and run <>. The source archive contains the pre-compiled - shared libraries for Linux, Windows and Mac OS X but also the C source code - of the JNI library if you want to compile it yourself or want to use usb4java - on a different platform. - - * {{{http://www.ailis.de/nexus/content/repositories/releases/de/ailis/usb4java/usb4java/${project.version}/usb4java-${project.version}-src.tar.bz2}usb4java-${project.version}-src.tar.bz2}} - - * {{{http://www.ailis.de/nexus/content/repositories/releases/de/ailis/usb4java/usb4java/${project.version}/usb4java-${project.version}-src.zip}usb4java-${project.version}-src.zip}} - - [] - - Sources are also available in the {{{./source-repository.html}source repository}}. diff --git a/usb4java-natives/pom.xml b/usb4java-natives/pom.xml new file mode 100644 index 0000000..c26f680 --- /dev/null +++ b/usb4java-natives/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + de.ailis.usb4java + usb4java-parent + 0.4.0-SNAPSHOT + + + usb4java-natives + jar + usb4java native libraries + + diff --git a/src/main/c/AUTHORS b/usb4java-natives/src/main/c/AUTHORS similarity index 100% rename from src/main/c/AUTHORS rename to usb4java-natives/src/main/c/AUTHORS diff --git a/src/main/c/COPYING b/usb4java-natives/src/main/c/COPYING similarity index 100% rename from src/main/c/COPYING rename to usb4java-natives/src/main/c/COPYING diff --git a/src/main/c/ChangeLog b/usb4java-natives/src/main/c/ChangeLog similarity index 100% rename from src/main/c/ChangeLog rename to usb4java-natives/src/main/c/ChangeLog diff --git a/src/main/c/Makefile.am b/usb4java-natives/src/main/c/Makefile.am similarity index 100% rename from src/main/c/Makefile.am rename to usb4java-natives/src/main/c/Makefile.am diff --git a/src/main/c/Makefile.scm b/usb4java-natives/src/main/c/Makefile.scm similarity index 100% rename from src/main/c/Makefile.scm rename to usb4java-natives/src/main/c/Makefile.scm diff --git a/src/main/c/NEWS b/usb4java-natives/src/main/c/NEWS similarity index 100% rename from src/main/c/NEWS rename to usb4java-natives/src/main/c/NEWS diff --git a/src/main/c/README b/usb4java-natives/src/main/c/README similarity index 100% rename from src/main/c/README rename to usb4java-natives/src/main/c/README diff --git a/src/main/c/acinclude.m4 b/usb4java-natives/src/main/c/acinclude.m4 similarity index 100% rename from src/main/c/acinclude.m4 rename to usb4java-natives/src/main/c/acinclude.m4 diff --git a/src/main/c/build/linux-x86.sh b/usb4java-natives/src/main/c/build/linux-x86.sh similarity index 57% rename from src/main/c/build/linux-x86.sh rename to usb4java-natives/src/main/c/build/linux-x86.sh index e30ea6d..4628c30 100755 --- a/src/main/c/build/linux-x86.sh +++ b/usb4java-natives/src/main/c/build/linux-x86.sh @@ -1,8 +1,15 @@ #!/bin/sh # # Builds libusb4java for 32 bit linux. -# If running on 32 bit linux you need libusb-dev. -# If running on 64 bit linux you need ia32-libs-dev and libc6-dev-i386. +# +# If running on 32 bit linux you just need libusb-dev. +# +# If running on 64 bit linux you need ia32-libs-dev and libc6-dev-i386 +# or gcc-multilib and libusb-0.1-4:i386 or something like that an newer +# systems. Depending on your multilib installation it may be required to +# create a manual symlink libusb.so in /lib/i386-linux-gnu or otherwise +# compilation will fail because the compiler can't find the 32 bit +# library. set -e cd $(dirname $0)/.. @@ -27,4 +34,5 @@ fi make clean install-strip DESTDIR=$TMPDIR mkdir -p $DISTDIR cp -faL $TMPDIR/lib/libusb4java.so $DISTDIR/ +chmod -x $DISTDIR/libusb4java.so rm -rf $TMPDIR diff --git a/src/main/c/build/linux-x86_64.sh b/usb4java-natives/src/main/c/build/linux-x86_64.sh similarity index 94% rename from src/main/c/build/linux-x86_64.sh rename to usb4java-natives/src/main/c/build/linux-x86_64.sh index bf7774e..3e5ecf2 100755 --- a/src/main/c/build/linux-x86_64.sh +++ b/usb4java-natives/src/main/c/build/linux-x86_64.sh @@ -26,4 +26,5 @@ fi make clean install-strip DESTDIR=$TMPDIR mkdir -p $DISTDIR cp -faL $TMPDIR/lib/libusb4java.so $DISTDIR/ +chmod -x $DISTDIR/libusb4java.so rm -rf $TMPDIR diff --git a/src/main/c/build/macosx-universal.sh b/usb4java-natives/src/main/c/build/macosx-universal.sh similarity index 94% rename from src/main/c/build/macosx-universal.sh rename to usb4java-natives/src/main/c/build/macosx-universal.sh index 5117f5b..243b0d0 100755 --- a/src/main/c/build/macosx-universal.sh +++ b/usb4java-natives/src/main/c/build/macosx-universal.sh @@ -1,6 +1,8 @@ #!/bin/sh # # Builds universal libusb4java for Mac OS X (x86_64, x86, ppc) +# This is meant to be run on a Mac (With XCode command line stuff +# installed), it doesn't cross compile on linux! set -e cd $(dirname $0)/.. diff --git a/src/main/c/build/mingw-windows-x86.sh b/usb4java-natives/src/main/c/build/mingw-windows-x86.sh similarity index 92% rename from src/main/c/build/mingw-windows-x86.sh rename to usb4java-natives/src/main/c/build/mingw-windows-x86.sh index 22fb4cf..7d997f0 100755 --- a/src/main/c/build/mingw-windows-x86.sh +++ b/usb4java-natives/src/main/c/build/mingw-windows-x86.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Cross-compiles libusb4java for 64 bit windows using mingw. +# Cross-compiles libusb4java for 32 bit windows using mingw. # libusb-dev is needed. set -e @@ -42,4 +42,5 @@ make clean install-strip DESTDIR=$TMPDIR mkdir -p $DISTDIR cp -faL $TMPDIR/bin/libusb4java-0.dll $DISTDIR/libusb4java.dll cp -faL $BINS/libusb0_x86.dll $DISTDIR/libusb0.dll +chmod -x $DISTDIR/libusb4java.dll rm -rf $TMPDIR diff --git a/src/main/c/build/mingw-windows-x86_64.sh b/usb4java-natives/src/main/c/build/mingw-windows-x86_64.sh similarity index 97% rename from src/main/c/build/mingw-windows-x86_64.sh rename to usb4java-natives/src/main/c/build/mingw-windows-x86_64.sh index 53d7fd3..c7df3cc 100755 --- a/src/main/c/build/mingw-windows-x86_64.sh +++ b/usb4java-natives/src/main/c/build/mingw-windows-x86_64.sh @@ -42,4 +42,5 @@ make clean install-strip DESTDIR=$TMPDIR mkdir -p $DISTDIR cp -faL $TMPDIR/bin/libusb4java-0.dll $DISTDIR/libusb4java.dll cp -faL $BINS/libusb0.dll $DISTDIR/libusb0.dll +chmod -x $DISTDIR/libusb4java.dll rm -rf $TMPDIR diff --git a/src/main/c/configure.ac b/usb4java-natives/src/main/c/configure.ac similarity index 90% rename from src/main/c/configure.ac rename to usb4java-natives/src/main/c/configure.ac index 355c1c1..cc1f81f 100644 --- a/src/main/c/configure.ac +++ b/usb4java-natives/src/main/c/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) -AC_INIT([libusb4java], [0.3.1], [k@ailis.de]) +AC_INIT([libusb4java], [0.4.0], [k@ailis.de]) AM_INIT_AUTOMAKE(foreign -Wall -Werror) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) diff --git a/src/main/c/src/Makefile.am b/usb4java-natives/src/main/c/src/Makefile.am similarity index 100% rename from src/main/c/src/Makefile.am rename to usb4java-natives/src/main/c/src/Makefile.am diff --git a/src/main/c/src/USB.c b/usb4java-natives/src/main/c/src/USB.c similarity index 100% rename from src/main/c/src/USB.c rename to usb4java-natives/src/main/c/src/USB.c diff --git a/src/main/c/src/USB_Bus.c b/usb4java-natives/src/main/c/src/USB_Bus.c similarity index 100% rename from src/main/c/src/USB_Bus.c rename to usb4java-natives/src/main/c/src/USB_Bus.c diff --git a/src/main/c/src/USB_Bus.h b/usb4java-natives/src/main/c/src/USB_Bus.h similarity index 100% rename from src/main/c/src/USB_Bus.h rename to usb4java-natives/src/main/c/src/USB_Bus.h diff --git a/src/main/c/src/USB_Config_Descriptor.c b/usb4java-natives/src/main/c/src/USB_Config_Descriptor.c similarity index 100% rename from src/main/c/src/USB_Config_Descriptor.c rename to usb4java-natives/src/main/c/src/USB_Config_Descriptor.c diff --git a/src/main/c/src/USB_Config_Descriptor.h b/usb4java-natives/src/main/c/src/USB_Config_Descriptor.h similarity index 100% rename from src/main/c/src/USB_Config_Descriptor.h rename to usb4java-natives/src/main/c/src/USB_Config_Descriptor.h diff --git a/src/main/c/src/USB_Descriptor_Header.c b/usb4java-natives/src/main/c/src/USB_Descriptor_Header.c similarity index 100% rename from src/main/c/src/USB_Descriptor_Header.c rename to usb4java-natives/src/main/c/src/USB_Descriptor_Header.c diff --git a/src/main/c/src/USB_Dev_Handle.c b/usb4java-natives/src/main/c/src/USB_Dev_Handle.c similarity index 100% rename from src/main/c/src/USB_Dev_Handle.c rename to usb4java-natives/src/main/c/src/USB_Dev_Handle.c diff --git a/src/main/c/src/USB_Dev_Handle.h b/usb4java-natives/src/main/c/src/USB_Dev_Handle.h similarity index 100% rename from src/main/c/src/USB_Dev_Handle.h rename to usb4java-natives/src/main/c/src/USB_Dev_Handle.h diff --git a/src/main/c/src/USB_Device.c b/usb4java-natives/src/main/c/src/USB_Device.c similarity index 100% rename from src/main/c/src/USB_Device.c rename to usb4java-natives/src/main/c/src/USB_Device.c diff --git a/src/main/c/src/USB_Device.h b/usb4java-natives/src/main/c/src/USB_Device.h similarity index 100% rename from src/main/c/src/USB_Device.h rename to usb4java-natives/src/main/c/src/USB_Device.h diff --git a/src/main/c/src/USB_Device_Descriptor.c b/usb4java-natives/src/main/c/src/USB_Device_Descriptor.c similarity index 100% rename from src/main/c/src/USB_Device_Descriptor.c rename to usb4java-natives/src/main/c/src/USB_Device_Descriptor.c diff --git a/src/main/c/src/USB_Device_Descriptor.h b/usb4java-natives/src/main/c/src/USB_Device_Descriptor.h similarity index 100% rename from src/main/c/src/USB_Device_Descriptor.h rename to usb4java-natives/src/main/c/src/USB_Device_Descriptor.h diff --git a/src/main/c/src/USB_Endpoint_Descriptor.c b/usb4java-natives/src/main/c/src/USB_Endpoint_Descriptor.c similarity index 100% rename from src/main/c/src/USB_Endpoint_Descriptor.c rename to usb4java-natives/src/main/c/src/USB_Endpoint_Descriptor.c diff --git a/src/main/c/src/USB_Endpoint_Descriptor.h b/usb4java-natives/src/main/c/src/USB_Endpoint_Descriptor.h similarity index 100% rename from src/main/c/src/USB_Endpoint_Descriptor.h rename to usb4java-natives/src/main/c/src/USB_Endpoint_Descriptor.h diff --git a/src/main/c/src/USB_Interface.c b/usb4java-natives/src/main/c/src/USB_Interface.c similarity index 100% rename from src/main/c/src/USB_Interface.c rename to usb4java-natives/src/main/c/src/USB_Interface.c diff --git a/src/main/c/src/USB_Interface.h b/usb4java-natives/src/main/c/src/USB_Interface.h similarity index 100% rename from src/main/c/src/USB_Interface.h rename to usb4java-natives/src/main/c/src/USB_Interface.h diff --git a/src/main/c/src/USB_Interface_Descriptor.c b/usb4java-natives/src/main/c/src/USB_Interface_Descriptor.c similarity index 100% rename from src/main/c/src/USB_Interface_Descriptor.c rename to usb4java-natives/src/main/c/src/USB_Interface_Descriptor.c diff --git a/src/main/c/src/USB_Interface_Descriptor.h b/usb4java-natives/src/main/c/src/USB_Interface_Descriptor.h similarity index 100% rename from src/main/c/src/USB_Interface_Descriptor.h rename to usb4java-natives/src/main/c/src/USB_Interface_Descriptor.h diff --git a/src/main/c/src/usb4java.h b/usb4java-natives/src/main/c/src/usb4java.h similarity index 100% rename from src/main/c/src/usb4java.h rename to usb4java-natives/src/main/c/src/usb4java.h diff --git a/src/main/resources/linux-x86/libusb4java.so b/usb4java-natives/src/main/resources/linux-x86/libusb4java.so old mode 100755 new mode 100644 similarity index 99% rename from src/main/resources/linux-x86/libusb4java.so rename to usb4java-natives/src/main/resources/linux-x86/libusb4java.so index 3d14ca4..bc4c143 Binary files a/src/main/resources/linux-x86/libusb4java.so and b/usb4java-natives/src/main/resources/linux-x86/libusb4java.so differ diff --git a/src/main/resources/linux-x86_64/libusb4java.so b/usb4java-natives/src/main/resources/linux-x86_64/libusb4java.so old mode 100755 new mode 100644 similarity index 99% rename from src/main/resources/linux-x86_64/libusb4java.so rename to usb4java-natives/src/main/resources/linux-x86_64/libusb4java.so index da94456..ed969fa Binary files a/src/main/resources/linux-x86_64/libusb4java.so and b/usb4java-natives/src/main/resources/linux-x86_64/libusb4java.so differ diff --git a/src/main/resources/macosx-universal/libusb.dylib b/usb4java-natives/src/main/resources/macosx-universal/libusb.dylib old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/macosx-universal/libusb.dylib rename to usb4java-natives/src/main/resources/macosx-universal/libusb.dylib diff --git a/src/main/resources/macosx-universal/libusb4java.dylib b/usb4java-natives/src/main/resources/macosx-universal/libusb4java.dylib old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/macosx-universal/libusb4java.dylib rename to usb4java-natives/src/main/resources/macosx-universal/libusb4java.dylib diff --git a/src/main/resources/windows-x86/libusb0.dll b/usb4java-natives/src/main/resources/windows-x86/libusb0.dll similarity index 100% rename from src/main/resources/windows-x86/libusb0.dll rename to usb4java-natives/src/main/resources/windows-x86/libusb0.dll diff --git a/usb4java-natives/src/main/resources/windows-x86/libusb4java.dll b/usb4java-natives/src/main/resources/windows-x86/libusb4java.dll new file mode 100644 index 0000000..3677979 Binary files /dev/null and b/usb4java-natives/src/main/resources/windows-x86/libusb4java.dll differ diff --git a/src/main/resources/windows-x86_64/libusb0.dll b/usb4java-natives/src/main/resources/windows-x86_64/libusb0.dll similarity index 100% rename from src/main/resources/windows-x86_64/libusb0.dll rename to usb4java-natives/src/main/resources/windows-x86_64/libusb0.dll diff --git a/usb4java-natives/src/main/resources/windows-x86_64/libusb4java.dll b/usb4java-natives/src/main/resources/windows-x86_64/libusb4java.dll new file mode 100644 index 0000000..3a404b8 Binary files /dev/null and b/usb4java-natives/src/main/resources/windows-x86_64/libusb4java.dll differ diff --git a/usb4java/pom.xml b/usb4java/pom.xml new file mode 100644 index 0000000..bd92524 --- /dev/null +++ b/usb4java/pom.xml @@ -0,0 +1,73 @@ + + + 4.0.0 + + + de.ailis.usb4java + usb4java-parent + 0.4.0-SNAPSHOT + + + usb4java + jar + usb4java java library + + + + + org.apache.maven.plugins + maven-site-plugin + 3.0 + + false + en + ${project.build.sourceEncoding} + ${project.build.sourceEncoding} + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + false + false + + + summary + dependencies + project-team + issue-tracking + license + scm + + + + org.apache.maven.plugins + maven-changes-plugin + 2.6 + + + + changes-report + + + + + + + + + + + + + javax.usb + usb + + + de.ailis.usb4java + usb4java-natives + + + + diff --git a/src/changes/changes.xml b/usb4java/src/changes/changes.xml similarity index 66% rename from src/changes/changes.xml rename to usb4java/src/changes/changes.xml index 59298b8..185cc3f 100644 --- a/src/changes/changes.xml +++ b/usb4java/src/changes/changes.xml @@ -8,44 +8,56 @@ Klaus Reimer + + + Corrected endpoint index in JNI libraries. + + + Refactored loading of native libraries. The libraries are now a + standard Java dependency and are automatically extracted during + runtime. So no java.library.path or LD_LIBRARY_PATH tinkering + needed anymore. Just put the two JARs into your class path and + that's it. + + - + Improved error messages when loading the JNI library fails. - + Fixed library paths in dylibs so they can be placed in *.app/Contents/MacOS. - + Now trying to load the JNI library with the following library names: usb4java, usb4java32, libusb4java, libusb4java32. - + Fixed missing support for custom buffer offsets and lengths. - + Fixed problem with empty control requests on Mac OS X. - + Implemented configuration to control the communication timeout. - + Implemented configuration to control the scan mode and to improve scan performance by filtering for specific vendor and product ids. - + libusb reports broken bus root devices when detaching USB devices and when user has no root permissions on linux. Fixed it by only trusting root devices which are also in the device list of a bus. diff --git a/src/main/java/de/ailis/usb4java/Services.java b/usb4java/src/main/java/de/ailis/usb4java/Services.java similarity index 100% rename from src/main/java/de/ailis/usb4java/Services.java rename to usb4java/src/main/java/de/ailis/usb4java/Services.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/LibUsbConfigurationDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbConfigurationDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/LibUsbConfigurationDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbConfigurationDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/LibUsbDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/LibUsbDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/LibUsbDeviceDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbDeviceDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/LibUsbDeviceDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbDeviceDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/LibUsbEndpointDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbEndpointDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/LibUsbEndpointDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbEndpointDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/LibUsbInterfaceDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbInterfaceDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/LibUsbInterfaceDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbInterfaceDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/LibUsbStringDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbStringDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/LibUsbStringDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/LibUsbStringDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDeviceDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDeviceDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDeviceDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDeviceDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java diff --git a/src/main/java/de/ailis/usb4java/descriptors/package-info.java b/usb4java/src/main/java/de/ailis/usb4java/descriptors/package-info.java similarity index 100% rename from src/main/java/de/ailis/usb4java/descriptors/package-info.java rename to usb4java/src/main/java/de/ailis/usb4java/descriptors/package-info.java diff --git a/src/main/java/de/ailis/usb4java/exceptions/LibUsbException.java b/usb4java/src/main/java/de/ailis/usb4java/exceptions/LibUsbException.java similarity index 100% rename from src/main/java/de/ailis/usb4java/exceptions/LibUsbException.java rename to usb4java/src/main/java/de/ailis/usb4java/exceptions/LibUsbException.java diff --git a/src/main/java/de/ailis/usb4java/exceptions/NativesException.java b/usb4java/src/main/java/de/ailis/usb4java/exceptions/NativesException.java similarity index 100% rename from src/main/java/de/ailis/usb4java/exceptions/NativesException.java rename to usb4java/src/main/java/de/ailis/usb4java/exceptions/NativesException.java diff --git a/src/main/java/de/ailis/usb4java/exceptions/package-info.java b/usb4java/src/main/java/de/ailis/usb4java/exceptions/package-info.java similarity index 100% rename from src/main/java/de/ailis/usb4java/exceptions/package-info.java rename to usb4java/src/main/java/de/ailis/usb4java/exceptions/package-info.java diff --git a/src/main/java/de/ailis/usb4java/jni/NativesLoader.java b/usb4java/src/main/java/de/ailis/usb4java/jni/NativesLoader.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/NativesLoader.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/NativesLoader.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Bus.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_Bus.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_Bus.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_Bus.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Config_Descriptor.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_Config_Descriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_Config_Descriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_Config_Descriptor.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Descriptor_Header.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_Descriptor_Header.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_Descriptor_Header.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_Descriptor_Header.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Dev_Handle.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_Dev_Handle.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_Dev_Handle.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_Dev_Handle.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Device.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_Device.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_Device.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_Device.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Device_Descriptor.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_Device_Descriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_Device_Descriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_Device_Descriptor.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Endpoint_Descriptor.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_Endpoint_Descriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_Endpoint_Descriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_Endpoint_Descriptor.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Interface.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_Interface.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_Interface.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_Interface.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Interface_Descriptor.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_Interface_Descriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_Interface_Descriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_Interface_Descriptor.java diff --git a/src/main/java/de/ailis/usb4java/jni/USB_String_Descriptor.java b/usb4java/src/main/java/de/ailis/usb4java/jni/USB_String_Descriptor.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/USB_String_Descriptor.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/USB_String_Descriptor.java diff --git a/src/main/java/de/ailis/usb4java/jni/package-info.java b/usb4java/src/main/java/de/ailis/usb4java/jni/package-info.java similarity index 100% rename from src/main/java/de/ailis/usb4java/jni/package-info.java rename to usb4java/src/main/java/de/ailis/usb4java/jni/package-info.java diff --git a/src/main/java/de/ailis/usb4java/package-info.java b/usb4java/src/main/java/de/ailis/usb4java/package-info.java similarity index 100% rename from src/main/java/de/ailis/usb4java/package-info.java rename to usb4java/src/main/java/de/ailis/usb4java/package-info.java diff --git a/src/main/java/de/ailis/usb4java/support/AbstractIrpQueue.java b/usb4java/src/main/java/de/ailis/usb4java/support/AbstractIrpQueue.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/AbstractIrpQueue.java rename to usb4java/src/main/java/de/ailis/usb4java/support/AbstractIrpQueue.java diff --git a/src/main/java/de/ailis/usb4java/support/Config.java b/usb4java/src/main/java/de/ailis/usb4java/support/Config.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/Config.java rename to usb4java/src/main/java/de/ailis/usb4java/support/Config.java diff --git a/src/main/java/de/ailis/usb4java/support/ControlIrpQueue.java b/usb4java/src/main/java/de/ailis/usb4java/support/ControlIrpQueue.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/ControlIrpQueue.java rename to usb4java/src/main/java/de/ailis/usb4java/support/ControlIrpQueue.java diff --git a/src/main/java/de/ailis/usb4java/support/EventListenerList.java b/usb4java/src/main/java/de/ailis/usb4java/support/EventListenerList.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/EventListenerList.java rename to usb4java/src/main/java/de/ailis/usb4java/support/EventListenerList.java diff --git a/src/main/java/de/ailis/usb4java/support/IOUtils.java b/usb4java/src/main/java/de/ailis/usb4java/support/IOUtils.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/IOUtils.java rename to usb4java/src/main/java/de/ailis/usb4java/support/IOUtils.java diff --git a/src/main/java/de/ailis/usb4java/support/IrpQueue.java b/usb4java/src/main/java/de/ailis/usb4java/support/IrpQueue.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/IrpQueue.java rename to usb4java/src/main/java/de/ailis/usb4java/support/IrpQueue.java diff --git a/src/main/java/de/ailis/usb4java/support/UsbDeviceListenerList.java b/usb4java/src/main/java/de/ailis/usb4java/support/UsbDeviceListenerList.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/UsbDeviceListenerList.java rename to usb4java/src/main/java/de/ailis/usb4java/support/UsbDeviceListenerList.java diff --git a/src/main/java/de/ailis/usb4java/support/UsbLock.java b/usb4java/src/main/java/de/ailis/usb4java/support/UsbLock.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/UsbLock.java rename to usb4java/src/main/java/de/ailis/usb4java/support/UsbLock.java diff --git a/src/main/java/de/ailis/usb4java/support/UsbPipeListenerList.java b/usb4java/src/main/java/de/ailis/usb4java/support/UsbPipeListenerList.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/UsbPipeListenerList.java rename to usb4java/src/main/java/de/ailis/usb4java/support/UsbPipeListenerList.java diff --git a/src/main/java/de/ailis/usb4java/support/UsbServicesListenerList.java b/usb4java/src/main/java/de/ailis/usb4java/support/UsbServicesListenerList.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/UsbServicesListenerList.java rename to usb4java/src/main/java/de/ailis/usb4java/support/UsbServicesListenerList.java diff --git a/src/main/java/de/ailis/usb4java/support/UsbUtils.java b/usb4java/src/main/java/de/ailis/usb4java/support/UsbUtils.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/UsbUtils.java rename to usb4java/src/main/java/de/ailis/usb4java/support/UsbUtils.java diff --git a/src/main/java/de/ailis/usb4java/support/package-info.java b/usb4java/src/main/java/de/ailis/usb4java/support/package-info.java similarity index 100% rename from src/main/java/de/ailis/usb4java/support/package-info.java rename to usb4java/src/main/java/de/ailis/usb4java/support/package-info.java diff --git a/src/main/java/de/ailis/usb4java/tools/Dump.java b/usb4java/src/main/java/de/ailis/usb4java/tools/Dump.java similarity index 100% rename from src/main/java/de/ailis/usb4java/tools/Dump.java rename to usb4java/src/main/java/de/ailis/usb4java/tools/Dump.java diff --git a/src/main/java/de/ailis/usb4java/tools/package-info.java b/usb4java/src/main/java/de/ailis/usb4java/tools/package-info.java similarity index 100% rename from src/main/java/de/ailis/usb4java/tools/package-info.java rename to usb4java/src/main/java/de/ailis/usb4java/tools/package-info.java diff --git a/src/main/java/de/ailis/usb4java/topology/LibUsbConfiguration.java b/usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbConfiguration.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/LibUsbConfiguration.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbConfiguration.java diff --git a/src/main/java/de/ailis/usb4java/topology/LibUsbDevice.java b/usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbDevice.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/LibUsbDevice.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbDevice.java diff --git a/src/main/java/de/ailis/usb4java/topology/LibUsbEndpoint.java b/usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbEndpoint.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/LibUsbEndpoint.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbEndpoint.java diff --git a/src/main/java/de/ailis/usb4java/topology/LibUsbHub.java b/usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbHub.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/LibUsbHub.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbHub.java diff --git a/src/main/java/de/ailis/usb4java/topology/LibUsbInterface.java b/usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbInterface.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/LibUsbInterface.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbInterface.java diff --git a/src/main/java/de/ailis/usb4java/topology/LibUsbNonHub.java b/usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbNonHub.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/LibUsbNonHub.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbNonHub.java diff --git a/src/main/java/de/ailis/usb4java/topology/LibUsbPipe.java b/usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbPipe.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/LibUsbPipe.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbPipe.java diff --git a/src/main/java/de/ailis/usb4java/topology/LibUsbPort.java b/usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbPort.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/LibUsbPort.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbPort.java diff --git a/src/main/java/de/ailis/usb4java/topology/LibUsbPorts.java b/usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbPorts.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/LibUsbPorts.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/LibUsbPorts.java diff --git a/src/main/java/de/ailis/usb4java/topology/UsbDeviceScanner.java b/usb4java/src/main/java/de/ailis/usb4java/topology/UsbDeviceScanner.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/UsbDeviceScanner.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/UsbDeviceScanner.java diff --git a/src/main/java/de/ailis/usb4java/topology/UsbPorts.java b/usb4java/src/main/java/de/ailis/usb4java/topology/UsbPorts.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/UsbPorts.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/UsbPorts.java diff --git a/src/main/java/de/ailis/usb4java/topology/VirtualRootHub.java b/usb4java/src/main/java/de/ailis/usb4java/topology/VirtualRootHub.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/VirtualRootHub.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/VirtualRootHub.java diff --git a/src/main/java/de/ailis/usb4java/topology/VirtualRootHubConfiguration.java b/usb4java/src/main/java/de/ailis/usb4java/topology/VirtualRootHubConfiguration.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/VirtualRootHubConfiguration.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/VirtualRootHubConfiguration.java diff --git a/src/main/java/de/ailis/usb4java/topology/VirtualRootHubInterface.java b/usb4java/src/main/java/de/ailis/usb4java/topology/VirtualRootHubInterface.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/VirtualRootHubInterface.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/VirtualRootHubInterface.java diff --git a/src/main/java/de/ailis/usb4java/topology/package-info.java b/usb4java/src/main/java/de/ailis/usb4java/topology/package-info.java similarity index 100% rename from src/main/java/de/ailis/usb4java/topology/package-info.java rename to usb4java/src/main/java/de/ailis/usb4java/topology/package-info.java diff --git a/src/site/apt/configuration.apt.vm b/usb4java/src/site/apt/configuration.apt.vm similarity index 97% rename from src/site/apt/configuration.apt.vm rename to usb4java/src/site/apt/configuration.apt.vm index 3cbe93e..2cb0b2b 100644 --- a/src/site/apt/configuration.apt.vm +++ b/usb4java/src/site/apt/configuration.apt.vm @@ -70,7 +70,7 @@ de.ailis.usb4java.products = 01aa The purpose of this device filtering is performance. When your machine has many USB devices connected then it may slow down your application when has to read all the descriptors of all connected devices on - startup and everytime a USB device has been attached or detached. + startup and every time a USB device has been attached or detached. So filtering for vendor ID and/or product ID will hide all uninteresting devices from the . When using this feature then it is recommended to disable hierarchy scan, too, because then hubs can be totally diff --git a/usb4java/src/site/apt/download.apt.vm b/usb4java/src/site/apt/download.apt.vm new file mode 100644 index 0000000..4141135 --- /dev/null +++ b/usb4java/src/site/apt/download.apt.vm @@ -0,0 +1,32 @@ + ----------------------------------------------------------------------------- + Download + ----------------------------------------------------------------------------- + +Download + +* Binaries + + First of all you need the platform independent Java library for usb4java: + + * {{{${releasesUrl}/usb4java-${project.version}.jar}usb4java-${project.version}.jar}} + + [] + + Additionally you need the JAR file which contains the native libraries for + all supported platforms. This JAR file also contains the libusb + shared library for Windows and Mac OS X. Linux users must install the + libusb package included in their Linux distribution (Usually a package + called libusb, make sure it is version 0.x and not the newer 1.x). + + * {{{${releasesUrl}/usb4java-natives-${project.version}.jar}usb4java-natives-${project.version}.jar}} + + [] + + If you prefer using bleeding edge snapshots then you can download + them from the {{{$snapshotsUrl/}snapshot repository}}. + + +* Sources + + Sources (Java and C) are available in + the {{{./source-repository.html}source repository}}. diff --git a/src/site/apt/faq.apt.vm b/usb4java/src/site/apt/faq.apt.vm similarity index 100% rename from src/site/apt/faq.apt.vm rename to usb4java/src/site/apt/faq.apt.vm diff --git a/src/site/apt/index.apt.vm b/usb4java/src/site/apt/index.apt.vm similarity index 96% rename from src/site/apt/index.apt.vm rename to usb4java/src/site/apt/index.apt.vm index dc024d4..89415ec 100644 --- a/src/site/apt/index.apt.vm +++ b/usb4java/src/site/apt/index.apt.vm @@ -8,7 +8,7 @@ What is usb4java? based on the native {{{http://www.libusb.org/}libusb 0.1}} shared library and reflects this API as complete as possible. Java NIO buffers are used for data exchange between libusb and Java. The high-level part implements - the {{{http://www.javax-usb.org/}javax.usb standard (JSR-80)}}. + the {{{http://javax-usb.sourceforge.net/}javax.usb standard (JSR-80)}}. Supported platforms are Linux (x86 32/64 bit), Mac OS X (x86 32/64 bit, PowerPC 32 bit) and Windows (x86 32/64 bit). But other platforms may work diff --git a/src/site/apt/quickstart.apt.vm b/usb4java/src/site/apt/quickstart.apt.vm similarity index 92% rename from src/site/apt/quickstart.apt.vm rename to usb4java/src/site/apt/quickstart.apt.vm index 34217f1..8a58c40 100644 --- a/src/site/apt/quickstart.apt.vm +++ b/usb4java/src/site/apt/quickstart.apt.vm @@ -4,15 +4,12 @@ Installation - {{{./download.html}Download}} the and a binary JAR matching - your platform. Copy the into your class path and extract - the binary JAR to a directory from which Java can load JNI shared libraries. - You may specify a custom directory with the java option - <-Djava.library.path=some/dir> when running your java programs. + {{{./download.html}Download}} the and + files and add them to your class path. If you are using the high-level API then you also need the which can be downloaded from the - {{{http://sourceforge.net/projects/javax-usb/files/}javax.usb project site}}. + {{{http://javax-usb.sourceforge.net/}javax.usb project site}}. This JAR must also be copied into your class path. @@ -100,7 +97,7 @@ public class Dump The high-level API The high-level API implements the - {{{http://www.javax-usb.org/}javax.usb (JSR-80)}} standard. It is + {{{http://javax-usb.sourceforge.net/}javax.usb (JSR-80)}} standard. It is recommended to use this API because it is object-oriented, event-driven and uses exceptions for error-handling instead of negative return values like the low-level API. Another advantage is that you may switch to a @@ -201,7 +198,7 @@ System.out.println(irp.getData()[0]); * {{{./apidocs/index.html}API documentation of usb4java}} - * {{{http://www.javax-usb.org/}javax-usb website}} + * {{{http://javax-usb.sourceforge.net/}javax-usb website}} [] \ No newline at end of file diff --git a/src/site/resources/css/site.css b/usb4java/src/site/resources/css/site.css similarity index 100% rename from src/site/resources/css/site.css rename to usb4java/src/site/resources/css/site.css diff --git a/src/site/resources/favicon.ico b/usb4java/src/site/resources/favicon.ico similarity index 100% rename from src/site/resources/favicon.ico rename to usb4java/src/site/resources/favicon.ico diff --git a/src/site/resources/images/add.gif b/usb4java/src/site/resources/images/add.gif similarity index 100% rename from src/site/resources/images/add.gif rename to usb4java/src/site/resources/images/add.gif diff --git a/src/site/resources/images/favicon-16-8.png b/usb4java/src/site/resources/images/favicon-16-8.png similarity index 100% rename from src/site/resources/images/favicon-16-8.png rename to usb4java/src/site/resources/images/favicon-16-8.png diff --git a/src/site/resources/images/favicon-16.png b/usb4java/src/site/resources/images/favicon-16.png similarity index 100% rename from src/site/resources/images/favicon-16.png rename to usb4java/src/site/resources/images/favicon-16.png diff --git a/src/site/resources/images/favicon-24.png b/usb4java/src/site/resources/images/favicon-24.png similarity index 100% rename from src/site/resources/images/favicon-24.png rename to usb4java/src/site/resources/images/favicon-24.png diff --git a/src/site/resources/images/favicon-32.png b/usb4java/src/site/resources/images/favicon-32.png similarity index 100% rename from src/site/resources/images/favicon-32.png rename to usb4java/src/site/resources/images/favicon-32.png diff --git a/src/site/resources/images/favicon-48.png b/usb4java/src/site/resources/images/favicon-48.png similarity index 100% rename from src/site/resources/images/favicon-48.png rename to usb4java/src/site/resources/images/favicon-48.png diff --git a/src/site/resources/images/favicon-64.png b/usb4java/src/site/resources/images/favicon-64.png similarity index 100% rename from src/site/resources/images/favicon-64.png rename to usb4java/src/site/resources/images/favicon-64.png diff --git a/src/site/resources/images/favicon.xcf b/usb4java/src/site/resources/images/favicon.xcf similarity index 100% rename from src/site/resources/images/favicon.xcf rename to usb4java/src/site/resources/images/favicon.xcf diff --git a/src/site/resources/images/fix.gif b/usb4java/src/site/resources/images/fix.gif similarity index 100% rename from src/site/resources/images/fix.gif rename to usb4java/src/site/resources/images/fix.gif diff --git a/src/site/resources/images/logo.png b/usb4java/src/site/resources/images/logo.png similarity index 100% rename from src/site/resources/images/logo.png rename to usb4java/src/site/resources/images/logo.png diff --git a/src/site/resources/images/logo.xcf b/usb4java/src/site/resources/images/logo.xcf similarity index 100% rename from src/site/resources/images/logo.xcf rename to usb4java/src/site/resources/images/logo.xcf diff --git a/src/site/resources/images/remove.gif b/usb4java/src/site/resources/images/remove.gif similarity index 100% rename from src/site/resources/images/remove.gif rename to usb4java/src/site/resources/images/remove.gif diff --git a/src/site/resources/images/update.gif b/usb4java/src/site/resources/images/update.gif similarity index 100% rename from src/site/resources/images/update.gif rename to usb4java/src/site/resources/images/update.gif diff --git a/src/site/site.xml b/usb4java/src/site/site.xml similarity index 94% rename from src/site/site.xml rename to usb4java/src/site/site.xml index d5e08b3..9599aa8 100644 --- a/src/site/site.xml +++ b/usb4java/src/site/site.xml @@ -16,7 +16,7 @@ - +