Permalink
Browse files

revised: sikulixapi now Maven single module (no submodules)

  • Loading branch information...
1 parent a62beaa commit e03505dea02a8847ae9d2c2dd99ae607760e0b2d @RaiMan committed Jan 11, 2017
Showing with 73 additions and 119 deletions.
  1. +65 −11 pom.xml
  2. +0 −100 sikulixapi/pom.xml
  3. 0 {sikulixapi → }/src/main/java/com/sikulix/api/By.java
  4. 0 {sikulixapi → }/src/main/java/com/sikulix/api/Do.java
  5. 0 {sikulixapi → }/src/main/java/com/sikulix/api/Element.java
  6. 0 {sikulixapi → }/src/main/java/com/sikulix/api/Image.java
  7. 0 {sikulixapi → }/src/main/java/com/sikulix/api/Target.java
  8. 0 {sikulixapi → }/src/main/java/com/sikulix/api/Window.java
  9. 0 {sikulixapi → }/src/main/java/com/sikulix/core/Content.java
  10. 0 {sikulixapi → }/src/main/java/com/sikulix/core/Device.java
  11. 0 {sikulixapi → }/src/main/java/com/sikulix/core/FindFailed.java
  12. 0 {sikulixapi → }/src/main/java/com/sikulix/core/FindResult.java
  13. 0 {sikulixapi → }/src/main/java/com/sikulix/core/Finder.java
  14. 0 {sikulixapi → }/src/main/java/com/sikulix/core/HotkeyEvent.java
  15. 0 {sikulixapi → }/src/main/java/com/sikulix/core/HotkeyListener.java
  16. 0 {sikulixapi → }/src/main/java/com/sikulix/core/HotkeyManager.java
  17. 0 {sikulixapi → }/src/main/java/com/sikulix/core/IRobot.java
  18. 0 {sikulixapi → }/src/main/java/com/sikulix/core/Keys.java
  19. 0 {sikulixapi → }/src/main/java/com/sikulix/core/LocalRobot.java
  20. 0 {sikulixapi → }/src/main/java/com/sikulix/core/Mouse.java
  21. 0 {sikulixapi → }/src/main/java/com/sikulix/core/NativeHook.java
  22. 0 {sikulixapi → }/src/main/java/com/sikulix/core/NativeHookCallback.java
  23. 0 {sikulixapi → }/src/main/java/com/sikulix/core/ObserveEvent.java
  24. 0 {sikulixapi → }/src/main/java/com/sikulix/core/ObserverCallBack.java
  25. +8 −8 {sikulixapi → }/src/main/java/com/sikulix/core/SX.java
  26. 0 {sikulixapi → }/src/main/java/com/sikulix/core/SXElement.java
  27. 0 {sikulixapi → }/src/main/java/com/sikulix/core/SXJson.java
  28. 0 {sikulixapi → }/src/main/java/com/sikulix/core/SXLog.java
  29. 0 {sikulixapi → }/src/main/java/com/sikulix/util/FileChooser.java
  30. 0 {sikulixapi → }/src/main/java/com/sikulix/util/SXMain.java
  31. 0 {sikulixapi → }/src/main/java/com/sikulix/util/Settings.java
  32. 0 {sikulixapi → }/src/main/java/com/sikulix/util/SysJNA.java
  33. 0 {sikulixapi → }/src/main/java/com/sikulix/util/animation/Animator.java
  34. 0 {sikulixapi → }/src/main/java/com/sikulix/util/animation/AnimatorLinear.java
  35. 0 {sikulixapi → }/src/main/java/com/sikulix/util/animation/AnimatorLinearInterpolation.java
  36. 0 {sikulixapi → }/src/main/java/com/sikulix/util/animation/AnimatorOutQuarticEase.java
  37. 0 {sikulixapi → }/src/main/java/com/sikulix/util/animation/AnimatorPulse.java
  38. 0 {sikulixapi → }/src/main/java/com/sikulix/util/animation/AnimatorQuarticEase.java
  39. 0 {sikulixapi → }/src/main/java/com/sikulix/util/animation/AnimatorStopExtention.java
  40. 0 {sikulixapi → }/src/main/java/com/sikulix/util/animation/AnimatorTimeBased.java
  41. 0 {sikulixapi → }/src/main/java/com/sikulix/util/animation/AnimatorTimeValueFunction.java
  42. 0 {sikulixapi → }/src/main/java/org/opencv/core/Algorithm.java
  43. 0 {sikulixapi → }/src/main/java/org/opencv/core/Core.java
  44. 0 {sikulixapi → }/src/main/java/org/opencv/core/CvException.java
  45. 0 {sikulixapi → }/src/main/java/org/opencv/core/CvType.java
  46. 0 {sikulixapi → }/src/main/java/org/opencv/core/DMatch.java
  47. 0 {sikulixapi → }/src/main/java/org/opencv/core/KeyPoint.java
  48. 0 {sikulixapi → }/src/main/java/org/opencv/core/Mat.java
  49. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfByte.java
  50. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfDMatch.java
  51. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfDouble.java
  52. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfFloat.java
  53. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfFloat4.java
  54. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfFloat6.java
  55. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfInt.java
  56. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfInt4.java
  57. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfKeyPoint.java
  58. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfPoint.java
  59. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfPoint2f.java
  60. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfPoint3.java
  61. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfPoint3f.java
  62. 0 {sikulixapi → }/src/main/java/org/opencv/core/MatOfRect.java
  63. 0 {sikulixapi → }/src/main/java/org/opencv/core/Point.java
  64. 0 {sikulixapi → }/src/main/java/org/opencv/core/Point3.java
  65. 0 {sikulixapi → }/src/main/java/org/opencv/core/Range.java
  66. 0 {sikulixapi → }/src/main/java/org/opencv/core/Rect.java
  67. 0 {sikulixapi → }/src/main/java/org/opencv/core/RotatedRect.java
  68. 0 {sikulixapi → }/src/main/java/org/opencv/core/Scalar.java
  69. 0 {sikulixapi → }/src/main/java/org/opencv/core/Size.java
  70. 0 {sikulixapi → }/src/main/java/org/opencv/core/TermCriteria.java
  71. 0 {sikulixapi → }/src/main/java/org/opencv/core/TickMeter.java
  72. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/AKAZE.java
  73. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/AgastFeatureDetector.java
  74. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/BFMatcher.java
  75. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/BOWImgDescriptorExtractor.java
  76. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/BOWKMeansTrainer.java
  77. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/BOWTrainer.java
  78. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/BRISK.java
  79. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/DescriptorExtractor.java
  80. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/DescriptorMatcher.java
  81. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/FastFeatureDetector.java
  82. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/Feature2D.java
  83. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/FeatureDetector.java
  84. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/Features2d.java
  85. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/FlannBasedMatcher.java
  86. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/GFTTDetector.java
  87. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/KAZE.java
  88. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/MSER.java
  89. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/ORB.java
  90. 0 {sikulixapi → }/src/main/java/org/opencv/features2d/Params.java
  91. 0 {sikulixapi → }/src/main/java/org/opencv/imgcodecs/Imgcodecs.java
  92. 0 {sikulixapi → }/src/main/java/org/opencv/imgproc/CLAHE.java
  93. 0 {sikulixapi → }/src/main/java/org/opencv/imgproc/Imgproc.java
  94. 0 {sikulixapi → }/src/main/java/org/opencv/imgproc/LineSegmentDetector.java
  95. 0 {sikulixapi → }/src/main/java/org/opencv/imgproc/Moments.java
  96. 0 {sikulixapi → }/src/main/java/org/opencv/imgproc/Subdiv2D.java
  97. 0 {sikulixapi → }/src/main/java/org/opencv/objdetect/BaseCascadeClassifier.java
  98. 0 {sikulixapi → }/src/main/java/org/opencv/objdetect/CascadeClassifier.java
  99. 0 {sikulixapi → }/src/main/java/org/opencv/objdetect/HOGDescriptor.java
  100. 0 {sikulixapi → }/src/main/java/org/opencv/objdetect/Objdetect.java
  101. 0 {sikulixapi → }/src/main/java/org/opencv/utils/Converters.java
  102. 0 {sikulixapi → }/src/main/java/org/sikuli/basics/Debug.java
  103. 0 {sikulixapi → }/src/main/java/org/sikuli/basics/PreferencesUser.java
  104. 0 {sikulixapi → }/src/main/java/org/sikuli/basics/SplashFrame.java
  105. 0 {sikulixapi → }/src/main/java/org/sikuli/script/Key.java
  106. 0 {sikulixapi → }/src/main/java/org/sikuli/script/KeyModifier.java
  107. 0 {sikulixapi → }/src/main/resources/I18n/SXContent_en_US.properties
  108. 0 {sikulixapi → }/src/main/resources/I18n/SXGlobal_en_US.properties
  109. 0 ...ulixapi → }/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/de.properties
  110. 0 ...xapi → }/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/en_US.properties
  111. 0 ...ulixapi → }/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/es.properties
  112. 0 ...ulixapi → }/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/fr.properties
  113. 0 ...xapi → }/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/fr_CA.properties
  114. 0 ...xapi → }/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/nl_NL.properties
  115. 0 ...ulixapi → }/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/pt.properties
  116. 0 ...ulixapi → }/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/ru.properties
  117. 0 ...ulixapi → }/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/zh.properties
  118. 0 ...}/src/main/resources/I18n/translations/sikulix2.sxcontent_en_usproperties/zh_CN.GB2312.properties
  119. 0 {sikulixapi → }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/de.properties
  120. 0 ...ixapi → }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/en_US.properties
  121. 0 {sikulixapi → }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/es.properties
  122. 0 {sikulixapi → }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/fr.properties
  123. 0 ...ixapi → }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/fr_CA.properties
  124. 0 ...ixapi → }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/nl_NL.properties
  125. 0 {sikulixapi → }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/pt.properties
  126. 0 {sikulixapi → }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/ru.properties
  127. 0 {sikulixapi → }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/zh.properties
  128. 0 ... }/src/main/resources/I18n/translations/sikulix2.sxglobal_en_usproperties/zh_CN.GB2312.properties
  129. 0 {sikulixapi/src/main/resources/Native/windows → src/main/resources/Native/linux}/MadeForSikuliX2
  130. BIN {sikulixapi → }/src/main/resources/Native/linux/libopencv_java320.so
  131. 0 {sikulixapi → }/src/main/resources/Native/mac/MadeForSikuliX2
  132. BIN {sikulixapi → }/src/main/resources/Native/mac/libMacUtil.dylib
  133. BIN {sikulixapi → }/src/main/resources/Native/mac/libopencv_java320.dylib
  134. BIN {sikulixapi → }/src/main/resources/Native/windows/JIntellitype.dll
  135. 0 {sikulixapi/src/main/resources/Native/linux → src/main/resources/Native/windows}/MadeForSikuliX2
  136. BIN {sikulixapi → }/src/main/resources/Native/windows/WinUtil.dll
  137. BIN {sikulixapi → }/src/main/resources/Native/windows/opencv_java320.dll
  138. 0 {sikulixapi → }/src/main/resources/Settings/sxoptions.txt
  139. 0 {sikulixapi/src/test → src/main}/resources/log4j2.xml
  140. 0 {sikulixapi → }/src/test/java/com/sikulix/test/TestAPI.java
  141. BIN {sikulixapi → }/src/test/resources/Images/ich.png
  142. BIN {sikulixapi → }/src/test/resources/Images/shot-tile.png
  143. BIN {sikulixapi → }/src/test/resources/Images/shot.png
  144. BIN {sikulixapi → }/src/test/resources/Images/sikulix2.png
  145. BIN {sikulixapi → }/src/test/resources/Images/white.png
  146. 0 {sikulixapi/src/main → src/test}/resources/log4j2.xml
  147. BIN {sikulixapi → }/testjar.jar
View
@@ -9,11 +9,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.sikulix</groupId>
- <artifactId>sikulix2</artifactId>
+ <artifactId>sikulixapi</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
<description>... for visual testing and automation</description>
<url>http://www.sikulix.com</url>
@@ -43,13 +41,57 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd_HH:mm</maven.build.timestamp.format>
- <sxjython>2.7.0</sxjython>
- <sxjruby>9.0.1.0</sxjruby>
- <sxrepo>${settings.localRepository}</sxrepo>
</properties>
<dependencies>
<dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.melloware</groupId>
+ <artifactId>jintellitype</artifactId>
+ <version>1.3.7</version>
+ </dependency>
+ <dependency>
+ <groupId>com.nativelibs4java</groupId>
+ <artifactId>bridj</artifactId>
+ <version>0.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.tulskiy</groupId>
+ <artifactId>jkeymaster</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20160810</version>
+ </dependency>
+ <dependency>
+ <groupId>com.1stleg</groupId>
+ <artifactId>jnativehook</artifactId>
+ <version>2.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>somegroup</groupId>
+ <artifactId>someartifact</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/testjar.jar</systemPath>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.4</version>
@@ -67,11 +109,23 @@
</dependency>
</dependencies>
- <modules>
- <module>sikulixapi</module>
- </modules>
-
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>Settings/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>Settings/*</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -83,4 +137,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2017 - sikulix.com - License MIT
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.sikulix</groupId>
- <artifactId>sikulix2</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>sikulixapi</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>com.melloware</groupId>
- <artifactId>jintellitype</artifactId>
- <version>1.3.7</version>
- </dependency>
- <dependency>
- <groupId>com.nativelibs4java</groupId>
- <artifactId>bridj</artifactId>
- <version>0.7.0</version>
- </dependency>
- <dependency>
- <groupId>com.github.tulskiy</groupId>
- <artifactId>jkeymaster</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20160810</version>
- </dependency>
- <dependency>
- <groupId>com.1stleg</groupId>
- <artifactId>jnativehook</artifactId>
- <version>2.0.3</version>
- </dependency>
- <dependency>
- <groupId>somegroup</groupId>
- <artifactId>someartifact</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/testjar.jar</systemPath>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>Settings/*</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>Settings/*</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <archive>
- <manifest>
- <mainClass>com.sikulix.util.SXMain</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
@@ -1145,8 +1145,8 @@ public static String getSXVERSION() {
sxBuild = sxBuild.replaceAll("_", "");
sxBuild = sxBuild.replaceAll("\\:", "");
String sxlocalrepo = Content.slashify(sxOptions.getString("sxlocalrepo"), true);
- String sxJythonVersion = sxOptions.getString("sxjython");
- String sxJRubyVersion = sxOptions.getString("sxjruby");
+// String sxJythonVersion = sxOptions.getString("sxjython");
+// String sxJRubyVersion = sxOptions.getString("sxjruby");
debug("getSXVERSION: version: %s build: %s", sxVersion, sxBuild);
sxStamp = String.format("%s_%s", sxVersion, sxBuild);
@@ -1157,12 +1157,12 @@ public static String getSXVERSION() {
// used for download of development versions (nightly builds)
String dlDevLink = "http://nightly.sikuli.de/";
- sxJythonMaven = "org/python/jython-standalone/"
- + sxJythonVersion + "/jython-standalone-" + sxJythonVersion + ".jar";
- sxJython = sxlocalrepo + sxJythonMaven;
- sxJRubyMaven = "org/jruby/jruby-complete/"
- + sxJRubyVersion + "/jruby-complete-" + sxJRubyVersion + ".jar";
- sxJRuby = sxlocalrepo + sxJRubyMaven;
+// sxJythonMaven = "org/python/jython-standalone/"
+// + sxJythonVersion + "/jython-standalone-" + sxJythonVersion + ".jar";
+// sxJython = sxlocalrepo + sxJythonMaven;
+// sxJRubyMaven = "org/jruby/jruby-complete/"
+// + sxJRubyVersion + "/jruby-complete-" + sxJRubyVersion + ".jar";
+// sxJRuby = sxlocalrepo + sxJRubyMaven;
tessData.put("eng", "http://download.sikulix.com/tesseract-ocr-3.02.eng.tar.gz");
sxLibsCheckName = String.format(sxLibsCheckStamp, sxStamp);
File renamed without changes.

0 comments on commit e03505d

Please sign in to comment.