Preparing 1.6.0 release

diff --git a/Changelog b/Changelog
index 3941f35e3981e0a19290c31c684e17e0ac650408..e919840baeb7ca44854f409db6db801078c94ff3 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,9 @@
 Changelog for tv_grab_nl_java
 =============================
 
+tv_grab_nl_java-1.6.0 (2014-01-16)
+- Parser for new RTL site. Only provides RTL4, 5, 7 and 8.
+
 tv_grab_nl_java-1.5.2 (2014-01-14)
 - Fix null object exception (thanks to Stephan for the bug report)
 

diff --git a/pom.xml b/pom.xml
index 956f852d72e622924dd891b61a72ea7ff73889fc..c82bf6a7cf6d4aabac25ed24198d8251a41061ae 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,11 +2,11 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.vanbest.xmltv.tv_grab_nl_java</groupId>
        <artifactId>tv_grab_nl_java</artifactId>
-       <version>1.5.3-SNAPSHOT</version>
+       <version>1.6.0</version>
        <scm>
                <connection>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</connection>
-               <developerConnection>scm:git:https://janpascal@github.com/janpascal/tv_grab_nl_java.git</developerConnection>
-               <url>https://github.com/janpascal/tv_grab_nl_java</url>
+               <developerConnection>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</developerConnection>
+               <url>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</url>
        </scm>
        <dependencies>
                <dependency>

diff --git a/src/main/java/org/vanbest/xmltv/Channel.java b/src/main/java/org/vanbest/xmltv/Channel.java
index d824e83fe0ee97792fb57afd71d1e6f8a37bda29..67e30757186c668793f83e4bdac1de4a6dff583a 100644 (file)
--- a/src/main/java/org/vanbest/xmltv/Channel.java
+++ b/src/main/java/org/vanbest/xmltv/Channel.java
@@ -43,19 +43,7 @@ public class Channel {
                c.names.add(name);
                return c;
        }
-/*
-       static Channel getChannel(int source, String id, String name, String extraConfig) {
-                Channel c;
-                if(EPGSourceFactory.getChannelSourceName(source).equals(Horizon.NAME)) {
-                        long horizonId=Long.parseLong(extraConfig);
-                       c = new Horizon.HorizonChannel(source, id, horizonId);
-                } else {
-                       c = new Channel(source, id);
-                }
-               c.names.add(name);
-               return c;
-       }
-*/
+
        public String getXmltvChannelId() {
                return xmltv; // id + "." + getSourceName();
        }

diff --git a/src/main/resources/tv_grab_nl_java.properties b/src/main/resources/tv_grab_nl_java.properties
index 398911e356dacb9bc3166bc1a556fddf704c832f..d5f155c42988a8cb4af64cd8906db25380026a00 100644 (file)
--- a/src/main/resources/tv_grab_nl_java.properties
+++ b/src/main/resources/tv_grab_nl_java.properties
@@ -2,7 +2,3 @@ project.version=${project.version}
 project.name=${project.name}
 project.description=${project.description}
 build.time=${build.time}
-org.vanbest.xmltv.epgsource.impl.1=org.vanbest.xmltv.TvGids
-org.vanbest.xmltv.epgsource.impl.2=org.vanbest.xmltv.RTL
-org.vanbest.xmltv.epgsource.impl.3=org.vanbest.xmltv.Horizon
-org.vanbest.xmltv.epgsource.impl.4=org.vanbest.xmltv.ZiggoGids