Skip to content
This repository has been archived by the owner on Jun 3, 2019. It is now read-only.

Commit

Permalink
shit ain't working still
Browse files Browse the repository at this point in the history
  • Loading branch information
@nscharrenberg
nscharrenberg committed May 5, 2019
1 parent 52ff57e commit 8ccb0c3
Show file tree
Hide file tree
Showing 108 changed files with 2,526 additions and 1,956 deletions.
17 changes: 16 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,19 @@ hs_err_pid*
# End of https://www.gitignore.io/api/java,angular,webstorm+all,intellij+all


/angular/src/app/_helpers/api-constants.ts
/angular/src/app/_helpers/api-constants.ts
target/kwetter/WEB-INF/web\.xml

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles\.lst

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles\.lst

target/test-classes/cucumber/feature/GetPermission\.feature

target/test-classes/cucumber/feature/GetRole\.feature

target/test-classes/cucumber/feature/GetTweet\.feature

target/test-classes/cucumber/feature/GetUser\.feature

target/failsafe-reports/failsafe-summary\.xml
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jdk: oraclejdk8
deploy:
provider: pages
skip-cleanup: true
github-token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable
github-token: $GITHUB_TOKEN # Set in the settings page of your com.nscharrenberg.kwetter.repository, as a secure variable
keep-history: true
on:
branch: master
196 changes: 196 additions & 0 deletions Kwetter.iml
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions angular/src/app/pages/home/home.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ export class HomeComponent implements OnInit {
(results: google.maps.GeocoderResult[]) => {
this.address = results[0].formatted_address;
})
.then(() => console.log('Geocoding service: completed.'))
.then(() => console.log('Geocoding com.nscharrenberg.kwetter.service: completed.'))
.catch((error: google.maps.GeocoderStatus) => {
if (error === google.maps.GeocoderStatus.ZERO_RESULTS) {
console.log('Geocoding service: geocoder failed due to: ' + error);
console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + error);
}
});

Expand Down Expand Up @@ -72,7 +72,7 @@ export class HomeComponent implements OnInit {
observer.next(results);
observer.complete();
} else {
console.log('Geocoding service: geocoder failed due to: ' + status);
console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + status);
observer.error(status);
}
})
Expand Down
6 changes: 3 additions & 3 deletions angular/src/app/pages/profile/profile.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ export class ProfileComponent implements OnInit {

this.registerForm.controls["address"].setValue(this.address);
})
.then(() => console.log('Geocoding service: completed.'))
.then(() => console.log('Geocoding com.nscharrenberg.kwetter.service: completed.'))
.catch((error: google.maps.GeocoderStatus) => {
if (error === google.maps.GeocoderStatus.ZERO_RESULTS) {
console.log('Geocoding service: geocoder failed due to: ' + error);
console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + error);
}
});
}
Expand All @@ -159,7 +159,7 @@ export class ProfileComponent implements OnInit {
observer.next(results);
observer.complete();
} else {
console.log('Geocoding service: geocoder failed due to: ' + status);
console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + status);
observer.error(status);
}
})
Expand Down
6 changes: 3 additions & 3 deletions angular/src/app/pages/user/user.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ export class UserComponent implements OnInit {
(results: google.maps.GeocoderResult[]) => {
this.address = results[0].formatted_address;
})
.then(() => console.log('Geocoding service: completed.'))
.then(() => console.log('Geocoding com.nscharrenberg.kwetter.service: completed.'))
.catch((error: google.maps.GeocoderStatus) => {
if (error === google.maps.GeocoderStatus.ZERO_RESULTS) {
console.log('Geocoding service: geocoder failed due to: ' + error);
console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + error);
}
});
});
Expand All @@ -73,7 +73,7 @@ export class UserComponent implements OnInit {
observer.next(results);
observer.complete();
} else {
console.log('Geocoding service: geocoder failed due to: ' + status);
console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + status);
observer.error(status);
}
})
Expand Down
167 changes: 133 additions & 34 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,20 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<version.org.jboss.arquillian>1.1.15.Final</version.org.jboss.arquillian>
</properties>

<dependencyManagement>
<dependencies>
<!-- Arquillian Core dependencies -->
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>javax</groupId>
Expand All @@ -36,6 +48,11 @@
<artifactId>javax.security.enterprise</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.5.0-b01</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
Expand Down Expand Up @@ -156,50 +173,86 @@
<artifactId>gson</artifactId>
<version>2.8.5</version>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>2.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
<version>2.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>arquillian-payara-server-4-embedded</artifactId>
<version>1.0.Beta2</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<finalName>kwetter</finalName>
<!--<testSourceDirectory>src/main/test</testSourceDirectory>-->
<resources>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
</resource>
</resources>
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_war_packaging -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.2</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<!--<plugin>-->
<!--<groupId>uk.co.deliverymind</groupId>-->
<!--<artifactId>wiremock-maven-plugin</artifactId>-->
<!--<version>2.3.0</version>-->
<!--<executions>-->
<!--<execution>-->
<!--<phase>initialize</phase>-->
<!--<goals>-->
<!--<goal>run</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<dir>target/classes</dir>-->
<!--<params>&#45;&#45;port=8888</params>-->
<!--</configuration>-->
<!--</execution>-->
<!--</executions>-->
<!--</plugin>-->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
<plugin>
<!-- Build an executable JAR -->
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -212,6 +265,52 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.20.1</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<!--<profiles>-->
<!--<profile>-->
<!--<id>remote</id>-->
<!--<dependencies>-->
<!--<dependency>-->
<!--<groupId>fish.payara.arquillian</groupId>-->
<!--<artifactId>arquillian-payara-server-4-remote</artifactId>-->
<!--<version>1.0.Beta2</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<!--</dependencies>-->
<!--</profile>-->
<!--<profile>-->
<!--<id>embedded</id>-->
<!--<activation>-->
<!--<activeByDefault>true</activeByDefault>-->
<!--</activation>-->
<!--<dependencies>-->
<!--<dependency>-->
<!--<groupId>fish.payara.arquillian</groupId>-->
<!--<artifactId>arquillian-payara-server-4-embedded</artifactId>-->
<!--<version>1.0.Beta2</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>fish.payara.extras</groupId>-->
<!--<artifactId>payara-embedded-all</artifactId>-->
<!--<version>4.1.1.161</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<!--</dependencies>-->
<!--</profile>-->
<!--</profiles>-->
</project>
84 changes: 0 additions & 84 deletions src/main/java/beans/LoginBean.java
View file

This file was deleted.

Loading

0 comments on commit 8ccb0c3

Please sign in to comment.