[PATCH] - maven project structure reorganization - add a exec:java goal to launch...

diff --git a/bindings/java/core/pom.xml b/bindings/java/core/pom.xml
new file mode 100644 (file)
index 0000000..9a4989f
--- /dev/null
+++ b/bindings/java/core/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd ">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.videolan</groupId>
+    <artifactId>jvlc-parent</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>jvlc-core</artifactId>
+  <packaging>jar</packaging>
+  <name>JVLC - Core</name>
+  <description>Java Bindings for VideoLAN - Core</description>
+   <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build> 
+  <dependencies>
+    <dependency>
+      <groupId>com.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>3.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>jvlc</id>
+      <name>JVLC Maven Repository</name>
+      <url>http://jvlc.ihack.it/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+</project>

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/Audio.java b/bindings/java/core/src/main/java/org/videolan/jvlc/Audio.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/Audio.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/Audio.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/JVLC.java b/bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/JVLC.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/MediaDescriptor.java b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/MediaDescriptor.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/MediaInstance.java b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaInstance.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/MediaInstance.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/MediaInstance.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/MediaList.java b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaList.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/MediaList.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/MediaList.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/MediaListPlayer.java b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaListPlayer.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/MediaListPlayer.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/MediaListPlayer.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/Playlist.java b/bindings/java/core/src/main/java/org/videolan/jvlc/Playlist.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/Playlist.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/Playlist.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/VLCException.java b/bindings/java/core/src/main/java/org/videolan/jvlc/VLCException.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/VLCException.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/VLCException.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/Video.java b/bindings/java/core/src/main/java/org/videolan/jvlc/Video.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/Video.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/Video.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java b/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/event/MediaInstanceListener.java b/bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceListener.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/event/MediaInstanceListener.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceListener.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/example/VLCExample.java b/bindings/java/core/src/main/java/org/videolan/jvlc/example/VLCExample.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/example/VLCExample.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/example/VLCExample.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/internal/LibVlc.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/internal/LibVlc.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/internal/LibVlcEventType.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcEventType.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/internal/LibVlcEventType.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcEventType.java

diff --git a/bindings/java/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
similarity index 100%
rename from bindings/java/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
rename to bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java

diff --git a/bindings/java/src/main/resources/.gitignore b/bindings/java/core/src/main/resources/.gitignore
similarity index 100%
rename from bindings/java/src/main/resources/.gitignore
rename to bindings/java/core/src/main/resources/.gitignore

diff --git a/bindings/java/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java
similarity index 100%
rename from bindings/java/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java
rename to bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java

diff --git a/bindings/java/src/test/java/org/videolan/jvlc/internal/MediaListTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java
similarity index 100%
rename from bindings/java/src/test/java/org/videolan/jvlc/internal/MediaListTest.java
rename to bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java

diff --git a/bindings/java/src/test/resources/raffa_voice.ogg b/bindings/java/core/src/test/resources/raffa_voice.ogg
similarity index 100%
rename from bindings/java/src/test/resources/raffa_voice.ogg
rename to bindings/java/core/src/test/resources/raffa_voice.ogg

diff --git a/bindings/java/pom.xml b/bindings/java/pom.xml
index 8b7c394cd046696618ddbf2f0cffa0246a546983..5cc7f0587a39342172a77acecfa44d6cfc274a1e 100644 (file)
--- a/bindings/java/pom.xml
+++ b/bindings/java/pom.xml
@@ -2,48 +2,19 @@
 <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/maven-v4_0_0.xsd ">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.videolan</groupId>
-  <artifactId>jvlc</artifactId>
-  <packaging>jar</packaging>
+  <artifactId>jvlc-parent</artifactId>
+  <packaging>pom</packaging>
   <name>JVLC</name>
   <description>Java Bindings for VideoLAN</description>
   <version>0.9.0-SNAPSHOT</version>
-   <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <licenses>
-       <license>
-               <name>GPLv2</name>
-               <url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
-       </license>
+    <license>
+      <name>GPLv2</name>
+      <url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
+    </license>
   </licenses>
-  <dependencies>
-    <dependency>
-      <groupId>com.jna</groupId>
-      <artifactId>jna</artifactId>
-      <version>3.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.4</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <repositories>
-    <repository>
-      <id>jvlc</id>
-      <name>JVLC Maven Repository</name>
-      <url>http://jvlc.ihack.it/maven2</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories></project>
+  <modules>
+    <module>core</module>
+    <module>samples</module>
+  </modules>
+</project>

diff --git a/bindings/java/samples/client/pom.xml b/bindings/java/samples/client/pom.xml
new file mode 100644 (file)
index 0000000..86f171f
--- /dev/null
+++ b/bindings/java/samples/client/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd ">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.videolan</groupId>
+    <artifactId>jvlc-samples</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.videolan</groupId>
+  <artifactId>jvlc-samples-client</artifactId>
+  <packaging>jar</packaging>
+  <name>JVLC - Client sample</name>
+  <description>Java Bindings for VideoLAN - Client sample</description>
+  <version>0.9.0-SNAPSHOT</version>
+
+   <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>VlcClient</mainClass>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.videolan</groupId>
+      <artifactId>jvlc-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/bindings/java/VlcClient.java b/bindings/java/samples/client/src/main/java/VlcClient.java
similarity index 100%
rename from bindings/java/VlcClient.java
rename to bindings/java/samples/client/src/main/java/VlcClient.java

diff --git a/bindings/java/samples/pom.xml b/bindings/java/samples/pom.xml
new file mode 100644 (file)
index 0000000..bb0b942
--- /dev/null
+++ b/bindings/java/samples/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd ">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.videolan</groupId>
+    <artifactId>jvlc-parent</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>jvlc-samples</artifactId>
+  <packaging>pom</packaging>
+  <name>JVLC - Samples</name>
+  <description>Java Bindings for VideoLAN - Samples</description>
+  <version>0.9.0-SNAPSHOT</version>
+
+  <modules>
+    <module>client</module>
+  </modules>
+
+</project>