From c1d715d30d439de9691f28375c6f6fb6dd186773 Mon Sep 17 00:00:00 2001 From: robocoder <anthon.pang@gmail.com> Date: Wed, 28 Jul 2010 00:21:47 +0000 Subject: [PATCH] move PiwikTracker to libs git-svn-id: http://dev.piwik.org/svn/trunk@2735 59fd770c-687e-43c8-a1e3-f5a4ff64c105 --- LEGALNOTICE | 2 +- libs/PiwikTracker/LICENSE.txt | 29 +++++++++++++++++++ .../PiwikTracker}/PiwikTracker.php | 2 ++ misc/phpdoc-config.ini | 2 +- 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 libs/PiwikTracker/LICENSE.txt rename {core/Tracker => libs/PiwikTracker}/PiwikTracker.php (99%) diff --git a/LEGALNOTICE b/LEGALNOTICE index 5d0d61e750..6e4fd905dd 100644 --- a/LEGALNOTICE +++ b/LEGALNOTICE @@ -59,7 +59,7 @@ SEPARATELY LICENSED COMPONENTS AND LIBRARIES - depends on as3corelib (http://code.google.com/p/as3corelib/); New BSD Name: PiwikTracker - Link: http://dev.piwik.org/trac/browser/trunk/core/Tracker/PiwikTracker.php + Link: http://dev.piwik.org/trac/browser/trunk/libs/PiwikTracker/PiwikTracker.php License: New BSD Name: UserAgentParser diff --git a/libs/PiwikTracker/LICENSE.txt b/libs/PiwikTracker/LICENSE.txt new file mode 100644 index 0000000000..4f0e551f78 --- /dev/null +++ b/libs/PiwikTracker/LICENSE.txt @@ -0,0 +1,29 @@ +Copyright 2010 Matthieu Aubry +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +* Neither the name of Matthieu Aubry nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/core/Tracker/PiwikTracker.php b/libs/PiwikTracker/PiwikTracker.php similarity index 99% rename from core/Tracker/PiwikTracker.php rename to libs/PiwikTracker/PiwikTracker.php index 5e4717ab06..dc6c729e35 100644 --- a/core/Tracker/PiwikTracker.php +++ b/libs/PiwikTracker/PiwikTracker.php @@ -11,6 +11,8 @@ * @version $Id$ * @link http://piwik.org/docs/tracking-api/ * + * @category Piwik + * @package PiwikTracker */ class PiwikTracker { diff --git a/misc/phpdoc-config.ini b/misc/phpdoc-config.ini index 26ab1f72e3..ef5043bc41 100644 --- a/misc/phpdoc-config.ini +++ b/misc/phpdoc-config.ini @@ -42,7 +42,7 @@ readmeinstallchangelog = README, INSTALL, FAQ, LICENSE ;; comma-separated list of directories to parse ;; legal values: directory paths separated by commas -directory = core,plugins +directory = core,plugins,libs/PiwikTracker ;; comma-separated list of files, directories or wildcards ? and * (any wildcard) to ignore ;; legal values: any wildcard strings separated by commas -- GitLab