From b8e4cdcd40cdb1402b26fed910349e65c5fdcf96 Mon Sep 17 00:00:00 2001
From: JP <jp@here>
Date: Wed, 21 Mar 2012 11:16:52 +0100
Subject: [PATCH] Moved source around a bit to suite Maven; added Maven target
 (assembly:single) to create runnable jar file

---
 .classpath                                    | 14 +--
 .settings/org.eclipse.jdt.core.prefs          | 24 ++---
 pom.xml                                       | 87 ++++++++++++-------
 src/main/assembly/dep.xml                     | 30 +++++++
 .../java}/org/vanbest/xmltv/Channel.java      |  0
 .../java}/org/vanbest/xmltv/Config.java       |  0
 .../java}/org/vanbest/xmltv/Main.java         |  0
 .../java}/org/vanbest/xmltv/Programme.java    |  0
 .../org/vanbest/xmltv/ProgrammeCache.java     |  0
 .../org/vanbest/xmltv/ProgrammeDetails.java   |  0
 .../java}/org/vanbest/xmltv/TvGids.java       |  0
 .../java}/org/vanbest/xmltv/XmlTvWriter.java  |  0
 12 files changed, 107 insertions(+), 48 deletions(-)
 create mode 100644 src/main/assembly/dep.xml
 rename src/{ => main/java}/org/vanbest/xmltv/Channel.java (100%)
 rename src/{ => main/java}/org/vanbest/xmltv/Config.java (100%)
 rename src/{ => main/java}/org/vanbest/xmltv/Main.java (100%)
 rename src/{ => main/java}/org/vanbest/xmltv/Programme.java (100%)
 rename src/{ => main/java}/org/vanbest/xmltv/ProgrammeCache.java (100%)
 rename src/{ => main/java}/org/vanbest/xmltv/ProgrammeDetails.java (100%)
 rename src/{ => main/java}/org/vanbest/xmltv/TvGids.java (100%)
 rename src/{ => main/java}/org/vanbest/xmltv/XmlTvWriter.java (100%)

diff --git a/.classpath b/.classpath
index 6c7804f..5910b55 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index f4217b0..6249222 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/pom.xml b/pom.xml
index 869a2c3..098f7ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,29 +1,58 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.vanbest.xmltv.tv_grab_nl_java</groupId>
-  <artifactId>tv_grab_nl_java</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <dependencies>
-  	<dependency>
-  		<groupId>net.sf.json-lib</groupId>
-  		<artifactId>json-lib</artifactId>
-  		<version>2.4</version>
-  		<classifier>jdk15</classifier>
-  	</dependency>
-  	<dependency>
-  		<groupId>commons-cli</groupId>
-  		<artifactId>commons-cli</artifactId>
-  		<version>1.2</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>commons-io</groupId>
-  		<artifactId>commons-io</artifactId>
-  		<version>2.1</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>commons-lang</groupId>
-  		<artifactId>commons-lang</artifactId>
-  		<version>2.6</version>
-  	</dependency>
-  </dependencies>
-</project>
\ No newline at end of file
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.vanbest.xmltv.tv_grab_nl_java</groupId>
+	<artifactId>tv_grab_nl_java</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<dependencies>
+		<dependency>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib</artifactId>
+			<version>2.4</version>
+			<classifier>jdk15</classifier>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<descriptor>src/main/assembly/dep.xml</descriptor>
+					<archive>
+						<manifest>
+							<mainClass>org.vanbest.xmltv.Main</mainClass>
+						</manifest>
+					</archive>
+
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</build>
+
+</project>
diff --git a/src/main/assembly/dep.xml b/src/main/assembly/dep.xml
new file mode 100644
index 0000000..33cc6f4
--- /dev/null
+++ b/src/main/assembly/dep.xml
@@ -0,0 +1,30 @@
+<assembly>
+  <!-- TODO: a jarjar format would be better -->
+  <id>dep</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>target/classes</include>
+      </includes>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+      <excludes>
+        <exclude>junit:junit</exclude>
+        <exclude>jsch:jsch</exclude>
+        <exclude>org.apache.maven.wagon:wagon-ssh</exclude>
+        <!-- TODO: can probably be removed now -->
+        <exclude>plexus:plexus-container-default</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/src/org/vanbest/xmltv/Channel.java b/src/main/java/org/vanbest/xmltv/Channel.java
similarity index 100%
rename from src/org/vanbest/xmltv/Channel.java
rename to src/main/java/org/vanbest/xmltv/Channel.java
diff --git a/src/org/vanbest/xmltv/Config.java b/src/main/java/org/vanbest/xmltv/Config.java
similarity index 100%
rename from src/org/vanbest/xmltv/Config.java
rename to src/main/java/org/vanbest/xmltv/Config.java
diff --git a/src/org/vanbest/xmltv/Main.java b/src/main/java/org/vanbest/xmltv/Main.java
similarity index 100%
rename from src/org/vanbest/xmltv/Main.java
rename to src/main/java/org/vanbest/xmltv/Main.java
diff --git a/src/org/vanbest/xmltv/Programme.java b/src/main/java/org/vanbest/xmltv/Programme.java
similarity index 100%
rename from src/org/vanbest/xmltv/Programme.java
rename to src/main/java/org/vanbest/xmltv/Programme.java
diff --git a/src/org/vanbest/xmltv/ProgrammeCache.java b/src/main/java/org/vanbest/xmltv/ProgrammeCache.java
similarity index 100%
rename from src/org/vanbest/xmltv/ProgrammeCache.java
rename to src/main/java/org/vanbest/xmltv/ProgrammeCache.java
diff --git a/src/org/vanbest/xmltv/ProgrammeDetails.java b/src/main/java/org/vanbest/xmltv/ProgrammeDetails.java
similarity index 100%
rename from src/org/vanbest/xmltv/ProgrammeDetails.java
rename to src/main/java/org/vanbest/xmltv/ProgrammeDetails.java
diff --git a/src/org/vanbest/xmltv/TvGids.java b/src/main/java/org/vanbest/xmltv/TvGids.java
similarity index 100%
rename from src/org/vanbest/xmltv/TvGids.java
rename to src/main/java/org/vanbest/xmltv/TvGids.java
diff --git a/src/org/vanbest/xmltv/XmlTvWriter.java b/src/main/java/org/vanbest/xmltv/XmlTvWriter.java
similarity index 100%
rename from src/org/vanbest/xmltv/XmlTvWriter.java
rename to src/main/java/org/vanbest/xmltv/XmlTvWriter.java
-- 
2.39.5