Skip to content

Commit 12b4b42

Browse files
committed
Updated license and naming
1 parent 13d1ac1 commit 12b4b42

22 files changed

+61
-61
lines changed

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ modification, are permitted provided that the following conditions are met:
88
* Redistributions in binary form must reproduce the above copyright
99
notice, this list of conditions and the following disclaimer in the
1010
documentation and/or other materials provided with the distribution.
11-
* Neither the name of the <organization> nor the
11+
* Neither the name of the copyright holder nor the
1212
names of its contributors may be used to endorse or promote products
1313
derived from this software without specific prior written permission.
1414

1515
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1616
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
1717
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18-
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
18+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
1919
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2020
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2121
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Piwik Java Tracking API
1+
Piwik Java Tracker
22
================
33

44
Java implementation of the [Piwik Tracking HTTP API](http://developer.piwik.org/api-reference/tracking-api).

build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project name="piwik-java-tracking-api" default="default" basedir=".">
3-
<description>Builds, tests, and runs the project Piwik Java Tracking API.</description>
2+
<project name="piwik-java-tracker" default="default" basedir=".">
3+
<description>Builds, tests, and runs the project Piwik Java Tracker.</description>
44
<import file="nbproject/build-impl.xml"/>
55

66
<target depends="-javadoc-build" name="-post-jar">
@@ -11,8 +11,8 @@
1111
<!-- Define the Analyze target -->
1212
<target depends="init" name="analyze" description="Analyzes the project with SonarQube.">
1313
<property name="sonar.projectKey" value="org.piwik.java" />
14-
<property name="sonar.projectName" value="Piwik Java Tracking API" />
15-
<property name="sonar.projectVersion" value="1.1" />
14+
<property name="sonar.projectName" value="Piwik Java Tracker" />
15+
<property name="sonar.projectVersion" value="1.0.0" />
1616
<property name="sonar.language" value="java" />
1717
<property name="sonar.sources" value="${src.dir}" />
1818
<taskdef name="sonar" classname="org.sonar.ant.SonarTask">

nbproject/build-impl.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ is divided into following sections:
1919
- cleanup
2020
2121
-->
22-
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="piwik-java-tracking-api-impl">
22+
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="piwik-java-tracker-impl">
2323
<fail message="Please build using Ant 1.8.0 or higher.">
2424
<condition>
2525
<not>
@@ -468,7 +468,7 @@ is divided into following sections:
468468
</fileset>
469469
</union>
470470
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
471-
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="piwik-java-tracking-api" testname="TestNG tests" workingDir="${work.dir}">
471+
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="piwik-java-tracker" testname="TestNG tests" workingDir="${work.dir}">
472472
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
473473
<propertyset>
474474
<propertyref prefix="test-sys-prop."/>
@@ -619,7 +619,7 @@ is divided into following sections:
619619
<condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
620620
<isset property="test.method"/>
621621
</condition>
622-
<condition else="-suitename piwik-java-tracking-api -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
622+
<condition else="-suitename piwik-java-tracker -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
623623
<matches pattern=".*\.xml" string="@{testClass}"/>
624624
</condition>
625625
<delete dir="${build.test.results.dir}" quiet="true"/>
@@ -911,7 +911,7 @@ is divided into following sections:
911911
<delete file="${built-jar.properties}" quiet="true"/>
912912
</target>
913913
<target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
914-
<echo level="warn" message="Cycle detected: piwik-java-tracking-api was already built"/>
914+
<echo level="warn" message="Cycle detected: piwik-java-tracker was already built"/>
915915
</target>
916916
<target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
917917
<mkdir dir="${build.dir}"/>
@@ -1396,7 +1396,7 @@ is divided into following sections:
13961396
<delete file="${built-clean.properties}" quiet="true"/>
13971397
</target>
13981398
<target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
1399-
<echo level="warn" message="Cycle detected: piwik-java-tracking-api was already built"/>
1399+
<echo level="warn" message="Cycle detected: piwik-java-tracker was already built"/>
14001400
</target>
14011401
<target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
14021402
<mkdir dir="${build.dir}"/>

nbproject/genfiles.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ build.xml.script.CRC32=f7de3f6a
33
build.xml.stylesheet.CRC32=8064a381@1.75.2.48
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=314d817a
7-
nbproject/build-impl.xml.script.CRC32=e0a52415
6+
nbproject/build-impl.xml.data.CRC32=39b9f427
7+
nbproject/build-impl.xml.script.CRC32=4b056949
88
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

nbproject/licenseheader.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<#if licenseFirst??>
22
${licenseFirst}
33
</#if>
4-
${licensePrefix}Piwik Java Tracking API
4+
${licensePrefix}Piwik Java Tracker
55
${licensePrefix}
6-
${licensePrefix}@link https://github.com/piwik/piwik-java-tracking-api
7-
${licensePrefix}@license https://github.com/piwik/piwik-java-tracking-api/blob/master/LICENSE BSD-3 Clause
6+
${licensePrefix}@link https://github.com/piwik/piwik-java-tracker
7+
${licensePrefix}@license https://github.com/piwik/piwik-java-tracker/blob/master/LICENSE BSD-3 Clause
88
<#if licenseLast??>
99
${licenseLast}
1010
</#if>

nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ meta.inf.dir=${src.dir}/META-INF
9494
mkdist.disabled=true
9595
platform.active=default_platform
9696
project.licensePath=./nbproject/licenseheader.txt
97-
project.version=1.1.0
97+
project.version=1.0.0
9898
run.classpath=\
9999
${javac.classpath}:\
100100
${build.classes.dir}

nbproject/project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<type>org.netbeans.modules.java.j2seproject</type>
44
<configuration>
55
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
6-
<name>piwik-java-tracking-api</name>
6+
<name>piwik-java-tracker</name>
77
<source-roots>
88
<root id="src.dir"/>
99
</source-roots>

src/org/piwik/java/EcommerceItem.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
2-
* Piwik Java Tracking API
2+
* Piwik Java Tracker
33
*
4-
* @link https://github.com/piwik/piwik-java-tracking-api
5-
* @license https://github.com/piwik/piwik-java-tracking-api/blob/master/LICENSE BSD 3-Clause
4+
* @link https://github.com/piwik/piwik-java-tracker
5+
* @license https://github.com/piwik/piwik-java-tracker/blob/master/LICENSE BSD-3 Clause
66
*/
77
package org.piwik.java;
88

src/org/piwik/java/PiwikDate.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
2-
* Piwik Java Tracking API
2+
* Piwik Java Tracker
33
*
4-
* @link https://github.com/piwik/piwik-java-tracking-api
5-
* @license https://github.com/piwik/piwik-java-tracking-api/blob/master/LICENSE BSD 3-Clause
4+
* @link https://github.com/piwik/piwik-java-tracker
5+
* @license https://github.com/piwik/piwik-java-tracker/blob/master/LICENSE BSD-3 Clause
66
*/
77
package org.piwik.java;
88

0 commit comments

Comments
 (0)