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.

Sign up for GitHub

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

Jump to bottom

changes to run locally and misc fixes and/or refactoring #114

Merged
merged 4 commits into from
Jul 21, 2015
Merged

changes to run locally and misc fixes and/or refactoring #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d345d2c
Client changes for RUN_LOCALLY=true, Server changes for launching
May 21, 2015
57e84da
Update travis.yml to be on their new docker containers
Jul 9, 2015
b4a9c89
Change SeLion Grid pom so that we build 2 jars -- one uber/one not
Jul 10, 2015
391daef
Update license headers in accordance with eBay/PayPal split
Jul 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: java
sudo: false
jdk:
- oraclejdk7
- openjdk7
install:
- sh -e utilities/install-ios-driver.sh
script:
- sh -e utilities/run-travis-ci-tests.sh
after_success:
Expand All @@ -22,4 +21,4 @@ notifications:
- https://webhooks.gitter.im/e/a8fc34e427360ced7ebf
on_success: change
on_failure: always
on_start: false
on_start: never
11 changes: 10 additions & 1 deletion archetype/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,16 @@
<artifactId>SeLion</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.paypal.selion</groupId>
<artifactId>SeLion-Grid</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
<version>2.45.0</version>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion archetype/src/main/resources/archetype-resources/src/main/java/logging/AppLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/resources/archetype-resources/src/main/java/utilities/server/TestServerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand All @@ -15,8 +15,8 @@

package ${package}.utilities.server;

import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.seleniumhq.jetty7.server.Server;
import org.seleniumhq.jetty7.server.handler.ResourceHandler;
import org.openqa.selenium.net.NetworkUtils;
import org.openqa.selenium.net.PortProber;

Expand Down
2 changes: 1 addition & 1 deletion ...in/resources/archetype-resources/src/test/java/sample/dataobjects/AddressInformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...ype/src/main/resources/archetype-resources/src/test/java/sample/dataobjects/AreaCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion .../main/resources/archetype-resources/src/test/java/sample/dataobjects/BankInformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...type/src/main/resources/archetype-resources/src/test/java/sample/dataobjects/Country.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/resources/archetype-resources/src/test/java/sample/dataobjects/CustomData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/resources/archetype-resources/src/test/java/sample/dataobjects/SimpleData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion .../main/resources/archetype-resources/src/test/java/sample/dataobjects/UserInformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/archetype-resources/src/test/java/sample/selion/AppiumAndroidDemoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2015 eBay Software Foundation |
| Copyright (C) 2015 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...resources/archetype-resources/src/test/java/sample/selion/AppiumAndroidSeLionHubTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2015 eBay Software Foundation |
| Copyright (C) 2015 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/resources/archetype-resources/src/test/java/sample/selion/AppiumIOSDemoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion .../main/resources/archetype-resources/src/test/java/sample/selion/AppiumSauceCloudTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2015 eBay Software Foundation |
| Copyright (C) 2015 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...ources/archetype-resources/src/test/java/sample/selion/DataDrivenWithCustomTypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014-15 eBay Software Foundation |
| Copyright (C) 2014-15 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion .../main/resources/archetype-resources/src/test/java/sample/selion/IOSNativeAppDemoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...s/archetype-resources/src/test/java/sample/selion/NativeAppFlowUsingSeLionPageObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/resources/archetype-resources/src/test/java/sample/selion/SelendroidDemoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2015 eBay Software Foundation |
| Copyright (C) 2015 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion .../main/resources/archetype-resources/src/test/java/sample/selion/SimpleDataDrivenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014-15 eBay Software Foundation |
| Copyright (C) 2014-15 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...rchetype-resources/src/test/java/sample/selion/SimpleDataDrivenWithSelectiveRowsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014-15 eBay Software Foundation |
| Copyright (C) 2014-15 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion .../main/resources/archetype-resources/src/test/java/sample/selion/SimpleUIFlowDemoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/resources/archetype-resources/src/test/java/sample/selion/SoftAssertionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...ces/archetype-resources/src/test/java/sample/selion/UIFlowUsingSeLionPageObjectsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...esources/archetype-resources/src/test/java/sample/selion/WebDriverSessionHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/archetype-resources/src/test/java/sample/selion/WebSessionSharingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014 eBay Software Foundation |
| Copyright (C) 2014 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down
2 changes: 1 addition & 1 deletion .../resources/archetype-resources/src/test/java/sample/selion/YamlPoweredDataDrivenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------------------------------------------------*\
| Copyright (C) 2014-15 eBay Software Foundation |
| Copyright (C) 2014-15 PayPal |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance |
| with the License. |
Expand Down