Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v2.1' into unified
Browse files Browse the repository at this point in the history
  • Loading branch information
Jared Koester committed Jan 11, 2022
2 parents 6758d27 + f9de126 commit ab1b093
Show file tree
Hide file tree
Showing 302 changed files with 3,055 additions and 2,044 deletions.
144 changes: 92 additions & 52 deletions onebusaway-admin-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.0.79-cs-SNAPSHOT</version>
<version>2.1.12-cs-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-admin-webapp</artifactId>
<packaging>war</packaging>
Expand All @@ -12,14 +12,33 @@
<properties>
<xwiki.version>2.3.1</xwiki.version>
<xwiki.integration.version>1.0.1</xwiki.integration.version>
<geotools.version>11-beta</geotools.version>
<spring.security.version>4.2.10.RELEASE</spring.security.version>
<geotools.version>20.5</geotools.version>
<spring.security.version>5.3.2.RELEASE</spring.security.version>
<bundle.builtPath>/var/lib/oba/bundles/builder</bundle.builtPath>
<bundle.stagedPath>/var/lib/oba/bundles/staged</bundle.stagedPath>
<bundle.deployPath>/var/lib/oba/bundles/active</bundle.deployPath>
</properties>

<repositories> <!-- remove after copying to repo.camsys-apps.com -->
<repository>
<id>osgeo</id>
<name>Open Source Geospatial Foundation Repository</name>
<url>https://repo.osgeo.org/repository/release/</url>
</repository>
</repositories>
<dependencies>
<!-- jcl bridge for spring/spring security logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand All @@ -28,16 +47,45 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.5</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>1.9.1</version>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring5</artifactId>
<version>2.31</version>
</dependency>

<!-- this is for struts 2.5 on java 11 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm-version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>${asm-version}</version>
</dependency>


<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
Expand All @@ -59,16 +107,6 @@
<artifactId>spring-security-taglibs</artifactId>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -78,13 +116,12 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<!-- admin web app needs newer version of mockito -->
<version>1.9.0-rc1</version>
<version>3.3.3</version>
</dependency>
<!-- for amazon deployment -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.17</version>
</dependency>
<dependency>
<groupId>org.tuckey</groupId>
Expand Down Expand Up @@ -197,8 +234,7 @@
<dependency>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-collections</artifactId>
<!-- this is on purpose; gtfs transformer needs a newer version of collections -->
<version>1.2.0</version>
<version>${collections-version}</version>
</dependency>
<!-- gtfs validation -->
<dependency>
Expand All @@ -210,30 +246,29 @@
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
<version>${geotools.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-shapefile</artifactId>
<version>${geotools.version}</version>
</dependency>

<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-epsg-hsql</artifactId>
<version>${geotools.version}</version>
<exclusions>
<exclusion>
<artifactId>hsqldb</artifactId>
<groupId>hsqldb</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- todo refactor to use slf4j -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
Expand Down Expand Up @@ -293,24 +328,34 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.10.1</version>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mitre.dsmiley.httpproxy</groupId>
<artifactId>smiley-http-proxy-servlet</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
<type>jar</type>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mitre.dsmiley.httpproxy</groupId>
<artifactId>smiley-http-proxy-servlet</artifactId>
<version>1.7</version>
</dependency>
<!-- http://mvnrepository.com/artifact/joda-time/joda-time -->
<dependency>
<groupId>joda-time</groupId>
Expand All @@ -332,11 +377,6 @@
<type>war</type>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/bundle/StagingBundleProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
import java.io.File;
import java.io.FileNotFoundException;

import org.codehaus.jackson.map.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.onebusaway.admin.bundle.model.BundleMetadata;
import org.onebusaway.transit_data_federation.model.bundle.BundleItem;

public class StagingBundleProvider {
private static final String META_DATA_LOCATION = "metadata.json";
Expand Down
19 changes: 15 additions & 4 deletions ...way-admin-webapp/src/main/java/org/onebusaway/admin/event/handler/LoginEventListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,21 @@ public class LoginEventListener implements ApplicationListener<AuthenticationSuc

@Override
public void onApplicationEvent(AuthenticationSuccessEvent event) {
UserDetails userDetails = (UserDetails) event.getAuthentication().getPrincipal();
String component = System.getProperty("admin.chefRole");
String message = "User '" + userDetails.getUsername() + "' logged in";
loggingService.log(component, Level.INFO, message);
Object obj = event.getAuthentication().getPrincipal();
if (obj instanceof UserDetails) {
UserDetails userDetails = (UserDetails) event.getAuthentication().getPrincipal();
String component = System.getProperty("admin.chefRole");
String message = "User '" + userDetails.getUsername() + "' logged in";
loggingService.log(component, Level.INFO, message);
return;
}
if (obj instanceof String) {
String component = System.getProperty("admin.chefRole");
String message = "User '" + obj + "' logged in";
loggingService.log(component, Level.INFO, message);
return;
}
throw new IllegalArgumentException("unexpected principal" + obj + " of type " + obj.getClass());
}

/**
Expand Down
12 changes: 6 additions & 6 deletions ...in-webapp/src/main/java/org/onebusaway/admin/model/assignments/opengts/AccountRecord.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.annotate.JsonPropertyOrder;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonPropertyOrder({
Expand Down
12 changes: 6 additions & 6 deletions ...admin-webapp/src/main/java/org/onebusaway/admin/model/assignments/opengts/DeviceList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.annotate.JsonPropertyOrder;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonPropertyOrder({
Expand Down
12 changes: 6 additions & 6 deletions ...admin-webapp/src/main/java/org/onebusaway/admin/model/assignments/opengts/EventDatum.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

import java.util.HashMap;
import java.util.Map;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.annotate.JsonPropertyOrder;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonPropertyOrder({
Expand Down
2 changes: 1 addition & 1 deletion ...saway-admin-webapp/src/main/java/org/onebusaway/admin/model/json/DestinationSignCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.onebusaway.admin.model.json;

import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;

public class DestinationSignCode {
private String messageId;
Expand Down
4 changes: 2 additions & 2 deletions ...ay-admin-webapp/src/main/java/org/onebusaway/admin/model/json/VehicleLastKnownRecord.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package org.onebusaway.admin.model.json;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Holds vehicle's last known information
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/model/json/VehiclePullout.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.onebusaway.admin.model.json;

import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Holds vehicle pullout/pullin information
Expand Down
2 changes: 0 additions & 2 deletions onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/service/api/AlertsResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import javax.ws.rs.core.StreamingOutput;

import com.google.transit.realtime.GtfsRealtime;
import com.sun.jersey.api.spring.Autowire;
import org.onebusaway.admin.service.server.ConsoleServiceAlertsService;
import org.onebusaway.alerts.service.ServiceAlerts;
import org.slf4j.Logger;
Expand All @@ -36,7 +35,6 @@
import java.io.OutputStream;

@Component
@Autowire
@Path("/alerts")
/**
* expose service alerts from admin console as a GTFS-RT alerts feed.
Expand Down
4 changes: 1 addition & 3 deletions onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/service/api/ReleaseResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,16 @@
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;

import org.codehaus.jackson.map.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.onebusaway.util.git.GitRepositoryHelper;
import org.onebusaway.util.git.GitRepositoryState;
import org.springframework.stereotype.Component;

import com.sun.jersey.api.spring.Autowire;
/**
* Webservice to show git status.
*
*/
@Component
@Autowire
@Path("/release")
public class ReleaseResource {

Expand Down
Loading

0 comments on commit ab1b093

Please sign in to comment.