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.

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

Jaison branch #43

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
42 changes: 42 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="apps/src/main/java"/>
<classpathentry kind="src" path="apps/src/test/java"/>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="apps/lib/i4jruntime.jar"/>
<classpathentry kind="lib" path="apps/lib/ui.jar"/>
<classpathentry kind="lib" path="jruby/lib/sikuli-slides/jars/logback-classic-1.0.13.jar"/>
<classpathentry kind="lib" path="jruby/lib/sikuli-slides/jars/logback-core-1.0.13.jar"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
17 changes: 9 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
# Eclipse specific settings #
.classpath
.settings
.project
#.classpath
#.settings
#.project

# Java Files #
*.class
#*.class

# Binaries
bin/
target/
#bin/
#target/

# Maven generated files
dependency-reduced-pom.xml
#dependency-reduced-pom.xml

# Others
.DS_Store
#.DS_Store

#/target
23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>sikuli-slides</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
6 changes: 6 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
5 changes: 5 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
122 changes: 122 additions & 0 deletions apps/dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.sikuli</groupId>
<artifactId>sikuli-slides</artifactId>
<name>Sikuli Slides Apps</name>
<version>1.5.1-SNAPSHOT</version>
<url>http://lab.sikuli.org</url>
<developers>
<developer>
<id>doubleshow</id>
<name>Tom Yeh</name>
<email>[email protected]</email>
</developer>
<developer>
<id>kalharbi</id>
<name>Khalid Alharbi</name>
<email>[email protected]</email>
</developer>
</developers>
<licenses>
<license>
<name>MIT License</name>
<url>http://www.sikuli.org/LICENSE.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer>
<mainClass>org.sikuli.slides.apps.Main</mainClass>
</transformer>
</transformers>
<artifactSet>
<excludes>
<exclude>com:install4j:*</exclude>
</excludes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifest>
<mainClass>org.sikuli.slides.apps.Main</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.install4j</groupId>
<artifactId>api</artifactId>
<version>5.1.12</version>
<scope>system</scope>
<systemPath>C:\Users\jguglielmi\workspace\sikuli-slides\apps/lib/i4jruntime.jar</systemPath>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<platform.dependency>macosx-x86_64</platform.dependency>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>

Binary file not shown.
34 changes: 29 additions & 5 deletions apps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<artifactId>sikuli-slides</artifactId>
<name>Sikuli Slides Apps</name>
<url>http://lab.sikuli.org</url>
<version>1.5.0</version>
<version>1.5.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -35,14 +35,16 @@
<dependency>
<groupId>org.sikuli</groupId>
<artifactId>sikuli-slides-api</artifactId>
<version>1.5.0</version>
</dependency>
<version>1.5.1-jar-with-dependencies</version>
<!--<scope>system</scope>
<systemPath>${project.basedir}/lib/sikuli-slides-api-1.5.0.jar</systemPath>
--></dependency>
<dependency>
<groupId>com.install4j</groupId>
<artifactId>api</artifactId>
<version>5.1.12</version>
<!-- <scope>system</scope> -->
<!-- <systemPath>${project.basedir}/lib/i4jruntime.jar</systemPath> -->
<scope>system</scope>
<systemPath>${project.basedir}/lib/i4jruntime.jar</systemPath>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -100,6 +102,28 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>org.sikuli.slides.apps.Main</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
Binary file added apps/target/classes/com/sampullara/cli/Args.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 16 additions & 0 deletions apps/target/classes/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Set root logger level to DEBUG and its only appender to A1.
log4j.rootLogger=TRACE, A1

# A1 is set to be a ConsoleAppender.
log4j.appender.A1=org.apache.log4j.ConsoleAppender

# A1 uses PatternLayout.
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n

# log4j.logger.org.sikuli.core.search.algorithm.SearchByTextureAndColorAtOriginalResolution=TRACE
#log4j.logger.org.sikuli.api.event.TargetEventDetectionTask=TRACE
#log4j.logger.org.sikuli.api.SmartTarget=TRACE

log4j.logger.org.sikuli.slides.api.sikuli.CrossSearchStrategy = TRACE
log4j.logger.org.sikuli.slides.api.actions.LabelAction = TRACE
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions apps/target/maven-archiver/pom.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Generated by Maven
#Wed Sep 10 12:11:41 EDT 2014
version=1.5.1-SNAPSHOT
groupId=org.sikuli
artifactId=sikuli-slides
Binary file not shown.
Binary file not shown.
Binary file added apps/target/sikuli-slides-1.5.1-SNAPSHOT.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite failures="0" time="0.733" errors="0" skipped="0" tests="12" name="org.sikuli.slides.apps.ExecuteMainTest">
<properties>
<property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
<property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.7.0_55\jre\bin"/>
<property name="java.vm.version" value="24.55-b03"/>
<property name="java.vm.vendor" value="Oracle Corporation"/>
<property name="java.vendor.url" value="http://java.oracle.com/"/>
<property name="path.separator" value=";"/>
<property name="guice.disable.misplaced.annotation.check" value="true"/>
<property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
<property name="file.encoding.pkg" value="sun.io"/>
<property name="user.script" value=""/>
<property name="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.os.patch.level" value="Service Pack 1"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="user.dir" value="C:\Users\jguglielmi\workspace\sikuli-slides\apps"/>
<property name="java.runtime.version" value="1.7.0_55-b13"/>
<property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/>
<property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.7.0_55\jre\lib\endorsed"/>
<property name="os.arch" value="amd64"/>
<property name="java.io.tmpdir" value="C:\Users\JGUGLI~1\AppData\Local\Temp\"/>
<property name="line.separator" value="
"/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="user.variant" value=""/>
<property name="os.name" value="Windows 7"/>
<property name="classworlds.conf" value="C:\Applications\Maven\apache-maven-3.2.1-bin\apache-maven-3.2.1\bin\..\bin\m2.conf"/>
<property name="sun.jnu.encoding" value="Cp1252"/>
<property name="java.library.path" value="C:\Program Files\Java\jdk1.7.0_55\bin;C:\Windows\Sun\Java\bin;C:\Windows\system32;C:\Windows;C:\Program Files\Common Files\Microsoft Shared\Windows Live;C:\Program Files (x86)\Common Files\Microsoft Shared\Windows Live;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\WIDCOMM\Bluetooth Software\;C:\Program Files\WIDCOMM\Bluetooth Software\syswow64;C:\Program Files\Dell\Dell Data Protection\Access\Advanced\Wave\Gemalto\Access Client\v5\;C:\Program Files (x86)\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files (x86)\Windows Live\Shared;C:\Program Files (x86)\Common Files\Roxio Shared\DLLShared\;C:\Program Files (x86)\Common Files\Roxio Shared\OEM\DLLShared\;C:\Program Files (x86)\Common Files\Roxio Shared\OEM\DLLShared\;C:\Program Files (x86)\Common Files\Roxio Shared\OEM\12.0\DLLShared\;C:\Program Files (x86)\Roxio\OEM\AudioCore\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\Program Files (x86)\Intel\OpenCL SDK\2.0\bin\x86;C:\Program Files (x86)\Intel\OpenCL SDK\2.0\bin\x64;C:\Program Files (x86)\Git\cmd;C:\Program Files\Java\jdk1.7.0_55\bin;C:\Applications\Maven\apache-maven-3.2.1-bin\apache-maven-3.2.1\bin;C:\Applications\Ant\apache-ant-1.9.4\bin;C:\Users\jguglielmi\workspace\OASIS-Maven\lib\wget-1.11.4-1-bin\bin;C:\Applications\Selenium\WebDrivers;C:\Applications\Ruby\bin;C:\Applications\JRuby\jruby-1.7.12\bin;C:\Applications\Sikuli\Script;C:\Applications\Ruby\mingw\bin;C:\Applications\Sikuli\Slides\javacv-0.9-bin\javacv-bin;C:\opencv\build\x64\vc10\bin;."/>
<property name="java.specification.name" value="Java Platform API Specification"/>
<property name="java.class.version" value="51.0"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
<property name="os.version" value="6.1"/>
<property name="user.home" value="C:\Users\jguglielmi"/>
<property name="user.timezone" value="America/New_York"/>
<property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/>
<property name="java.specification.version" value="1.7"/>
<property name="file.encoding" value="Cp1252"/>
<property name="user.name" value="JGuglielmi"/>
<property name="java.class.path" value="C:\Applications\Maven\apache-maven-3.2.1-bin\apache-maven-3.2.1\bin\..\boot\plexus-classworlds-2.5.1.jar"/>
<property name="org.slf4j.simpleLogger.defaultLogLevel" value="info"/>
<property name="java.vm.specification.version" value="1.7"/>
<property name="sun.arch.data.model" value="64"/>
<property name="java.home" value="C:\Program Files\Java\jdk1.7.0_55\jre"/>
<property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher clean install"/>
<property name="java.specification.vendor" value="Oracle Corporation"/>
<property name="user.language" value="en"/>
<property name="awt.toolkit" value="sun.awt.windows.WToolkit"/>
<property name="java.vm.info" value="mixed mode"/>
<property name="java.version" value="1.7.0_55"/>
<property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.7.0_55\jre\lib\ext;C:\Windows\Sun\Java\lib\ext"/>
<property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.7.0_55\jre\lib\resources.jar;C:\Program Files\Java\jdk1.7.0_55\jre\lib\rt.jar;C:\Program Files\Java\jdk1.7.0_55\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.7.0_55\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.7.0_55\jre\lib\jce.jar;C:\Program Files\Java\jdk1.7.0_55\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.7.0_55\jre\lib\jfr.jar;C:\Program Files\Java\jdk1.7.0_55\jre\classes"/>
<property name="java.vendor" value="Oracle Corporation"/>
<property name="maven.home" value="C:\Applications\Maven\apache-maven-3.2.1-bin\apache-maven-3.2.1\bin\.."/>
<property name="file.separator" value="\"/>
<property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
<property name="sun.cpu.endian" value="little"/>
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="sun.desktop" value="windows"/>
<property name="sun.cpu.isalist" value="amd64"/>
</properties>
<testcase time="0.718" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testRangeDefaultToAll"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testRange2andLater"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testMinScoreTooBig"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testBadOptionName"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testInputIsAFilePath"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testInputIsAnURL"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testRange2to3"/>
<testcase time="0.015" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testRange2"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testScreenId"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testWaitTime"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testMinScore"/>
<testcase time="0" classname="org.sikuli.slides.apps.ExecuteMainTest" name="testNoInput"/>
</testsuite>
Loading