Skip to content

VO 4.6 open source #57

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

Merged
ls661n merged 2 commits into from
Feb 1, 2023
Merged

VO 4.6 open source #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b284627
Video Optimizer 4.6 Release
ls661n Dec 29, 2022
c4b1d37
updated the missing files and change for the new release
ls661n Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 25 additions & 162 deletions ARO.Analytics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.att.aro</groupId>
<artifactId>vo-parent</artifactId>
<version>4.5.0</version>
<version>${vo.version}</version>
<relativePath>../ARO.Parent</relativePath>
</parent>

Expand All @@ -14,175 +14,38 @@
<name>VO Analytics</name>
<description>Google Analytics Library for ARO</description>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<vo.version>4.5.0</vo.version>
</properties>

<repositories>
<repository>
<id>central</id>
<name>MavenCentral Repository</name>
<url>https://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>apache-releases</id>
<name>Apache Releases</name>
<url>https://repository.apache.org/content/repositories/releases</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>apache-snapshots</id>
<name>Apache Snapshots</name>
<url>https://repository.apache.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>sonatype-public</id>
<name>Sonatype Public</name>
<url>https://repository.sonatype.org/content/groups/public</url>
</repository>
<repository>
<id>sonatype-flex</id>
<name>Sonatype Flex</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
<!-- <repository>
<id>atlassian-public</id>
<name>atlassian</name>
<url>https://packages.atlassian.com/maven/repository/public</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</snapshots>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
</releases>
</repository> -->


</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<name>MavenCentral Repository</name>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
</pluginRepositories>

<!-- dependencies -->
<dependencies>
<dependency>
<groupId>com.att.aro</groupId>
<artifactId>vo-core</artifactId>
<version>${vo.version}</version>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId>
<version>2.2.32</version>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-object</artifactId>
<version>2.2.32</version>
</dependency>
<dependency>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-server</artifactId>
<version>2.2.32</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.0.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.proxy</groupId>
<artifactId>proxy-vole</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>com.att.aro</groupId>
<artifactId>vo-core</artifactId>
<version>${vo.version}</version>
</dependency>
</dependencies>


<!-- build -->
<build>
<plugins>

<!-- maven-jar-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.7.1.1</version>
<configuration>
<outputDirectory>${basedir}/libs</outputDirectory>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>${main.class}</mainClass>
</manifest>
</archive>
<excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
<effort>Max</effort>
<threshold>Max</threshold>
<maxRank>15</maxRank>
<xmlOutput>true</xmlOutput>
<xmlOutputDirectory>${project.build.directory}/spotBugs</xmlOutputDirectory>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>install</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/libs</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<configuration>
<excludeFilterFile>findbugs_exclude.xml</excludeFilterFile>
<effort>Max</effort>
<threshold>Max</threshold>
<xmlOutput>true</xmlOutput>
<findbugsXmlOutputDirectory>${project.build.directory}/findbugs</findbugsXmlOutputDirectory>
</configuration>
<executions>
<execution>
<id>analyze-compile</id>
<!-- <phase>compile</phase> -->
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<executions>
<execution>
<id>analyze-compile</id>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
Expand Down Expand Up @@ -219,4 +82,4 @@
</plugins>
</pluginManagement>
</build>
</project>
</project>
0 ARO.Analytics/findbugs_exclude.xml → ARO.Analytics/spotbugs-exclude.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ARO.Analytics/src/main/java/com/att/aro/analytics/GAUrlBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.nio.charset.StandardCharsets;
import java.util.Random;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import com.att.aro.core.SpringContextUtil;
import com.att.aro.core.pojo.VersionInfo;
Expand Down
2 changes: 1 addition & 1 deletion ARO.Analytics/src/main/java/com/att/aro/analytics/GoogleAnalyticsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import com.att.aro.core.ApplicationConfig;
import com.att.aro.core.analytics.IGoogleAnalytics;
Expand Down
22 changes: 12 additions & 10 deletions ARO.Analytics/src/main/java/com/att/aro/analytics/GoogleAnalyticsTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public GoogleAnalyticsTracker(String appName, String appVersion, String googleAn
HTTPGetMethod.setApplicationName(appName);
this.maxDBRecords = maxDBRecords;
this.gaTracker = this;
inetChecker();
// TODO: Temporary fix to get around Java limitations.
// inetChecker();
aroDAO = AROObjectDao.getInstance();
}

Expand Down Expand Up @@ -117,15 +118,16 @@ public void pushToCloud(GAEntry focusPoint, boolean appCloseEvent){
}
}

} else { //Since No internet save the record to DB and check again for internet
if(this.aroDAO.recordCount(focusPoint) < maxDBRecords){ // add not to save more than Max number of records
//focusPoint.setEventLabel("offline");
focusPoint.setValue("1");
focusPoint.resetSession();
this.aroDAO.put(focusPoint);
}
inetChecker(); //Check for internet connection since no internet.
}
} else { // Since No internet save the record to DB and check again for internet
if (this.aroDAO.recordCount(focusPoint) < maxDBRecords) { // add not to save more than Max number of records
// focusPoint.setEventLabel("offline");
focusPoint.setValue("1");
focusPoint.resetSession();
this.aroDAO.put(focusPoint);
}
// TODO: Temporary fix to get around Java limitations.
// inetChecker(); //Check for internet connection since no internet.
}
}

/**
Expand Down
Loading