Merge 9abdf39 into ebf16fc

oskopek · Jan 1, 2014 · 6ba3ceb · 6ba3ceb
2 parents ebf16fc + 9abdf39
commit 6ba3ceb
Show file tree

Hide file tree

Showing 88 changed files with 163 additions and 129 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ target/
 deployments/
 .idea/
 *.iml
-html/
+html/
+*.orig
diff --git a/.travis.yml b/.travis.yml
@@ -1,36 +1,40 @@
 language: java
 
 jdk:
-    - openjdk7
-    - oraclejdk7
-    - oraclejdk8
+  - openjdk7
+  - oraclejdk7
+  - oraclejdk8
 
 env:
-    global:
-        - WILDFLY="8.0.0.Beta1"
-        - JBOSS_HOME=$HOME/wildfly-$WILDFLY
+  global:
+    - WILDFLY="8.0.0.Beta1"
+    - JBOSS_HOME=$HOME/wildfly-$WILDFLY
+    - secure: WrQYhD3HBLqpKj83AxUH+Gf1EL1vlAX/kcfTAMPSJdjyIcYR/U1b0BYl9ne8Glro8UopZrH8X+3I0oP6GXXG7ihnb8L2sawCutC9EyccQOvFcfuMttSMhTpJpnLSLqEw5Gdp3qb4WDHOFALfo0G4hd/Yr2iIxSp/x6DQAuIz76M=
 
 cache:
-    directories:
-        - $HOME/.m2
+  directories:
+    - $HOME/.m2
 
 before_script:
-    - export ROOT_DIR=`pwd`
-    - cd $HOME
-    - wget http://download.jboss.org/wildfly/$WILDFLY/wildfly-$WILDFLY.tar.gz
-    - tar xfz wildfly-$WILDFLY.tar.gz
-    - cd $ROOT_DIR
-    - cp carcv-webapp/src/test/resources/jboss_configuration_standalone/standalone.xml $JBOSS_HOME/standalone/configuration/standalone.xml
+  - export ROOT_DIR=`pwd`
+  - cd $HOME
+  - wget http://download.jboss.org/wildfly/$WILDFLY/wildfly-$WILDFLY.tar.gz
+  - tar xfz wildfly-$WILDFLY.tar.gz
+  - cd $ROOT_DIR
+  - cp carcv-webapp/src/test/resources/jboss_configuration_standalone/standalone.xml $JBOSS_HOME/standalone/configuration/standalone.xml
 
 script: "mvn clean verify -Pwildfly-it-travis"
 
 install: /bin/true
 
+after_success:
+  - mvn clean cobertura:cobertura coveralls:cobertura -Pwildfly-it-travis
+
 notifications:
   irc:
     channels:
       - "irc.freenode.org#carcv"
     on_success: change
     on_failure: always
     template:
-      - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"
+      - '%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})'
diff --git a/NOTICE.adoc b/NOTICE.adoc
@@ -1,7 +1,7 @@
 = CarCV - Licensing NOTICE
 :numbered:
 
-Copyright (C) 2012-2013, CarCV Development Team.
+Copyright (C) 2012-2014, CarCV Development Team.
 All rights reserved.
 
 All Authors and Contributors are named in the link:AUTHORS.html[AUTHORS] file.
@@ -30,7 +30,7 @@ limitations under the License.
 ==== OpenCV
 
 ----
-Copyright (c) 2013, OpenCV Developers Team
+Copyright (c) 2013-2014, OpenCV Developers Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/carcv-core/pom.xml b/carcv-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.carcv</groupId>
         <artifactId>carcv</artifactId>
-	<version>1.0.1.Final</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.carcv.core</groupId>
@@ -91,4 +91,4 @@
             <scope>provided</scope> <!-- TODO 3 may cause problems in .jar package -->
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/carcv-core/src/main/java/org/carcv/core/detect/CarSorter.java b/carcv-core/src/main/java/org/carcv/core/detect/CarSorter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/detect/Detector.java b/carcv-core/src/main/java/org/carcv/core/detect/Detector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/detect/NumberPlateDetector.java b/carcv-core/src/main/java/org/carcv/core/detect/NumberPlateDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/detect/SpeedDetector.java b/carcv-core/src/main/java/org/carcv/core/detect/SpeedDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/io/DirectoryLoader.java b/carcv-core/src/main/java/org/carcv/core/io/DirectoryLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/io/DirectoryWatcher.java b/carcv-core/src/main/java/org/carcv/core/io/DirectoryWatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/io/Loader.java b/carcv-core/src/main/java/org/carcv/core/io/Loader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/io/Saver.java b/carcv-core/src/main/java/org/carcv/core/io/Saver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/io/VideoHandler.java b/carcv-core/src/main/java/org/carcv/core/io/VideoHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/AbstractCarImage.java b/carcv-core/src/main/java/org/carcv/core/model/AbstractCarImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/AbstractEmbeddable.java b/carcv-core/src/main/java/org/carcv/core/model/AbstractEmbeddable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/AbstractEntry.java b/carcv-core/src/main/java/org/carcv/core/model/AbstractEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/AbstractModel.java b/carcv-core/src/main/java/org/carcv/core/model/AbstractModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/Address.java b/carcv-core/src/main/java/org/carcv/core/model/Address.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/CarData.java b/carcv-core/src/main/java/org/carcv/core/model/CarData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/NumberPlate.java b/carcv-core/src/main/java/org/carcv/core/model/NumberPlate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/Speed.java b/carcv-core/src/main/java/org/carcv/core/model/Speed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/SpeedUnit.java b/carcv-core/src/main/java/org/carcv/core/model/SpeedUnit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/file/FileCarImage.java b/carcv-core/src/main/java/org/carcv/core/model/file/FileCarImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/file/FileEntry.java b/carcv-core/src/main/java/org/carcv/core/model/file/FileEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/model/file/PersistablePath.java b/carcv-core/src/main/java/org/carcv/core/model/file/PersistablePath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/core/recognize/CarRecognizer.java b/carcv-core/src/main/java/org/carcv/core/recognize/CarRecognizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/impl/core/detect/CarSorterImpl.java b/carcv-core/src/main/java/org/carcv/impl/core/detect/CarSorterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/impl/core/detect/NumberPlateDetectorImpl.java b/carcv-core/src/main/java/org/carcv/impl/core/detect/NumberPlateDetectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/impl/core/detect/SpeedDetectorImpl.java b/carcv-core/src/main/java/org/carcv/impl/core/detect/SpeedDetectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/impl/core/io/FFMPEGVideoHandler.java b/carcv-core/src/main/java/org/carcv/impl/core/io/FFMPEGVideoHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/impl/core/io/FileSaver.java b/carcv-core/src/main/java/org/carcv/impl/core/io/FileSaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/impl/core/model/FileEntryTool.java b/carcv-core/src/main/java/org/carcv/impl/core/model/FileEntryTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/impl/core/recognize/FileCarRecognizer.java b/carcv-core/src/main/java/org/carcv/impl/core/recognize/FileCarRecognizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/main/java/org/carcv/impl/core/run/Main.java b/carcv-core/src/main/java/org/carcv/impl/core/run/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/core/io/DirectoryWatcherTest.java b/carcv-core/src/test/java/org/carcv/core/io/DirectoryWatcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/core/model/SpeedTest.java b/carcv-core/src/test/java/org/carcv/core/model/SpeedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/core/model/file/FileCarImageTest.java b/carcv-core/src/test/java/org/carcv/core/model/file/FileCarImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/impl/core/detect/CarSorterImplTest.java b/carcv-core/src/test/java/org/carcv/impl/core/detect/CarSorterImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/impl/core/detect/NumberPlateDetectorImplTest.java b/carcv-core/src/test/java/org/carcv/impl/core/detect/NumberPlateDetectorImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/impl/core/detect/SpeedDetectorImplTest.java b/carcv-core/src/test/java/org/carcv/impl/core/detect/SpeedDetectorImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/impl/core/io/FFMPEGVideoHandlerTest.java b/carcv-core/src/test/java/org/carcv/impl/core/io/FFMPEGVideoHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/impl/core/io/FileSaverTest.java b/carcv-core/src/test/java/org/carcv/impl/core/io/FileSaverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/impl/core/model/FileEntryToolTest.java b/carcv-core/src/test/java/org/carcv/impl/core/model/FileEntryToolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 CarCV Development Team
+ * Copyright 2013-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-core/src/test/java/org/carcv/impl/core/recognize/FileCarRecognizerTest.java b/carcv-core/src/test/java/org/carcv/impl/core/recognize/FileCarRecognizerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-cpp/cpp_ocr_alpr/ocr_recognizer.cpp b/carcv-cpp/cpp_ocr_alpr/ocr_recognizer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/carcv-cpp/cpp_ocr_alpr/ocr_recognizer.hpp b/carcv-cpp/cpp_ocr_alpr/ocr_recognizer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 CarCV Development Team
+ * Copyright 2012-2014 CarCV Development Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.