Skip to content

Commit cdabb10

Browse files
ls661nls661n
authored
Merge pull request #57 from attdevsupport/VO_4.6_OpenSource
Release Video Optimizer 4.6 open source
2 parents ec31161 + c4b1d37 commit cdabb10

228 files changed

Lines changed: 6462 additions & 3842 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ARO.Analytics/pom.xml‎

Lines changed: 25 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.att.aro</groupId>
66
<artifactId>vo-parent</artifactId>
7-
<version>4.5.0</version>
7+
<version>${vo.version}</version>
88
<relativePath>../ARO.Parent</relativePath>
99
</parent>
1010

@@ -14,175 +14,38 @@
1414
<name>VO Analytics</name>
1515
<description>Google Analytics Library for ARO</description>
1616

17-
<properties>
18-
<maven.deploy.skip>true</maven.deploy.skip>
19-
<vo.version>4.5.0</vo.version>
20-
</properties>
21-
22-
<repositories>
23-
<repository>
24-
<id>central</id>
25-
<name>MavenCentral Repository</name>
26-
<url>https://repo1.maven.org/maven2</url>
27-
</repository>
28-
<repository>
29-
<id>apache-releases</id>
30-
<name>Apache Releases</name>
31-
<url>https://repository.apache.org/content/repositories/releases</url>
32-
<releases>
33-
<enabled>true</enabled>
34-
</releases>
35-
<snapshots>
36-
<enabled>false</enabled>
37-
</snapshots>
38-
</repository>
39-
<repository>
40-
<id>apache-snapshots</id>
41-
<name>Apache Snapshots</name>
42-
<url>https://repository.apache.org/content/repositories/snapshots</url>
43-
<releases>
44-
<enabled>false</enabled>
45-
</releases>
46-
<snapshots>
47-
<enabled>true</enabled>
48-
</snapshots>
49-
</repository>
50-
<repository>
51-
<id>sonatype-public</id>
52-
<name>Sonatype Public</name>
53-
<url>https://repository.sonatype.org/content/groups/public</url>
54-
</repository>
55-
<repository>
56-
<id>sonatype-flex</id>
57-
<name>Sonatype Flex</name>
58-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
59-
</repository>
60-
<!-- <repository>
61-
<id>atlassian-public</id>
62-
<name>atlassian</name>
63-
<url>https://packages.atlassian.com/maven/repository/public</url>
64-
<snapshots>
65-
<enabled>true</enabled>
66-
<updatePolicy>never</updatePolicy>
67-
<checksumPolicy>warn</checksumPolicy>
68-
</snapshots>
69-
<releases>
70-
<enabled>true</enabled>
71-
<checksumPolicy>warn</checksumPolicy>
72-
</releases>
73-
</repository> -->
74-
75-
76-
</repositories>
77-
<pluginRepositories>
78-
<pluginRepository>
79-
<id>central</id>
80-
<name>MavenCentral Repository</name>
81-
<url>https://repo1.maven.org/maven2/</url>
82-
</pluginRepository>
83-
</pluginRepositories>
84-
85-
<!-- dependencies -->
8617
<dependencies>
87-
<dependency>
88-
<groupId>com.att.aro</groupId>
89-
<artifactId>vo-core</artifactId>
90-
<version>${vo.version}</version>
91-
</dependency>
92-
<dependency>
93-
<groupId>com.orientechnologies</groupId>
94-
<artifactId>orientdb-core</artifactId>
95-
<version>2.2.32</version>
96-
</dependency>
97-
<dependency>
98-
<groupId>com.orientechnologies</groupId>
99-
<artifactId>orientdb-object</artifactId>
100-
<version>2.2.32</version>
101-
</dependency>
102-
<dependency>
103-
<groupId>com.orientechnologies</groupId>
104-
<artifactId>orientdb-server</artifactId>
105-
<version>2.2.32</version>
106-
</dependency>
107-
<dependency>
108-
<groupId>org.javassist</groupId>
109-
<artifactId>javassist</artifactId>
110-
</dependency>
111-
<dependency>
112-
<groupId>org.springframework</groupId>
113-
<artifactId>spring-test</artifactId>
114-
<version>4.0.3.RELEASE</version>
115-
<scope>test</scope>
116-
</dependency>
117-
<dependency>
118-
<groupId>com.proxy</groupId>
119-
<artifactId>proxy-vole</artifactId>
120-
<version>1.0</version>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.codehaus.mojo</groupId>
124-
<artifactId>findbugs-maven-plugin</artifactId>
125-
<version>3.0.4</version>
126-
</dependency>
18+
<dependency>
19+
<groupId>com.att.aro</groupId>
20+
<artifactId>vo-core</artifactId>
21+
<version>${vo.version}</version>
22+
</dependency>
12723
</dependencies>
12824

129-
130-
<!-- build -->
13125
<build>
13226
<plugins>
133-
134-
<!-- maven-jar-plugin -->
13527
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137-
<artifactId>maven-jar-plugin</artifactId>
138-
<version>2.4</version>
28+
<groupId>com.github.spotbugs</groupId>
29+
<artifactId>spotbugs-maven-plugin</artifactId>
30+
<version>4.7.1.1</version>
13931
<configuration>
140-
<outputDirectory>${basedir}/libs</outputDirectory>
141-
<archive>
142-
<manifest>
143-
<addClasspath>true</addClasspath>
144-
<mainClass>${main.class}</mainClass>
145-
</manifest>
146-
</archive>
32+
<excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
33+
<effort>Max</effort>
34+
<threshold>Max</threshold>
35+
<maxRank>15</maxRank>
36+
<xmlOutput>true</xmlOutput>
37+
<xmlOutputDirectory>${project.build.directory}/spotBugs</xmlOutputDirectory>
14738
</configuration>
148-
</plugin>
149-
<plugin>
150-
<artifactId>maven-dependency-plugin</artifactId>
151-
<executions>
152-
<execution>
153-
<phase>install</phase>
154-
<goals>
155-
<goal>copy-dependencies</goal>
156-
</goals>
157-
<configuration>
158-
<outputDirectory>${basedir}/libs</outputDirectory>
159-
</configuration>
160-
</execution>
161-
</executions>
162-
</plugin>
163-
<plugin>
164-
<groupId>org.codehaus.mojo</groupId>
165-
<artifactId>findbugs-maven-plugin</artifactId>
166-
<version>3.0.4</version>
167-
<configuration>
168-
<excludeFilterFile>findbugs_exclude.xml</excludeFilterFile>
169-
<effort>Max</effort>
170-
<threshold>Max</threshold>
171-
<xmlOutput>true</xmlOutput>
172-
<findbugsXmlOutputDirectory>${project.build.directory}/findbugs</findbugsXmlOutputDirectory>
173-
</configuration>
174-
<executions>
175-
<execution>
176-
<id>analyze-compile</id>
177-
<!-- <phase>compile</phase> -->
178-
<goals>
179-
<goal>check</goal>
180-
</goals>
181-
</execution>
182-
</executions>
183-
</plugin>
39+
<executions>
40+
<execution>
41+
<id>analyze-compile</id>
42+
<goals>
43+
<goal>check</goal>
44+
</goals>
45+
</execution>
46+
</executions>
47+
</plugin>
18448
</plugins>
185-
18649
<pluginManagement>
18750
<plugins>
18851
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
@@ -219,4 +82,4 @@
21982
</plugins>
22083
</pluginManagement>
22184
</build>
222-
</project>
85+
</project>

ARO.Analytics/findbugs_exclude.xml renamed to ARO.Analytics/spotbugs-exclude.xml

File renamed without changes.

‎ARO.Analytics/src/main/java/com/att/aro/analytics/GAUrlBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.nio.charset.StandardCharsets;
2323
import java.util.Random;
2424

25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626

2727
import com.att.aro.core.SpringContextUtil;
2828
import com.att.aro.core.pojo.VersionInfo;

‎ARO.Analytics/src/main/java/com/att/aro/analytics/GoogleAnalyticsImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.apache.log4j.LogManager;
1919
import org.apache.log4j.Logger;
2020

21-
import org.apache.commons.lang.StringUtils;
21+
import org.apache.commons.lang3.StringUtils;
2222

2323
import com.att.aro.core.ApplicationConfig;
2424
import com.att.aro.core.analytics.IGoogleAnalytics;

‎ARO.Analytics/src/main/java/com/att/aro/analytics/GoogleAnalyticsTracker.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public GoogleAnalyticsTracker(String appName, String appVersion, String googleAn
5454
HTTPGetMethod.setApplicationName(appName);
5555
this.maxDBRecords = maxDBRecords;
5656
this.gaTracker = this;
57-
inetChecker();
57+
// TODO: Temporary fix to get around Java limitations.
58+
// inetChecker();
5859
aroDAO = AROObjectDao.getInstance();
5960
}
6061

@@ -117,15 +118,16 @@ public void pushToCloud(GAEntry focusPoint, boolean appCloseEvent){
117118
}
118119
}
119120

120-
} else { //Since No internet save the record to DB and check again for internet
121-
if(this.aroDAO.recordCount(focusPoint) < maxDBRecords){ // add not to save more than Max number of records
122-
//focusPoint.setEventLabel("offline");
123-
focusPoint.setValue("1");
124-
focusPoint.resetSession();
125-
this.aroDAO.put(focusPoint);
126-
}
127-
inetChecker(); //Check for internet connection since no internet.
128-
}
121+
} else { // Since No internet save the record to DB and check again for internet
122+
if (this.aroDAO.recordCount(focusPoint) < maxDBRecords) { // add not to save more than Max number of records
123+
// focusPoint.setEventLabel("offline");
124+
focusPoint.setValue("1");
125+
focusPoint.resetSession();
126+
this.aroDAO.put(focusPoint);
127+
}
128+
// TODO: Temporary fix to get around Java limitations.
129+
// inetChecker(); //Check for internet connection since no internet.
130+
}
129131
}
130132

131133
/**

0 commit comments

Comments
 (0)