From d8bd94b7ad62c872b556aefc23f5414f3e7ba202 Mon Sep 17 00:00:00 2001
From: Andrew DeMaria <lostonamountain@gmail.com>
Date: Fri, 16 Jun 2017 09:55:45 -0600
Subject: [PATCH] Rename subsonic api module

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
---
 libresonic-main/pom.xml                                       | 2 +-
 .../java/org/libresonic/player/controller/JAXBWriter.java     | 2 +-
 pom.xml                                                       | 2 +-
 {libresonic-rest-api => subsonic-rest-api}/pom.xml            | 4 ++--
 .../src/main/resources/org/subsonic}/restapi/jaxb.properties  | 0
 .../src/main/resources/subsonic-rest-api.xsd                  | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename {libresonic-rest-api => subsonic-rest-api}/pom.xml (91%)
 rename {libresonic-rest-api/src/main/resources/org/libresonic => subsonic-rest-api/src/main/resources/org/subsonic}/restapi/jaxb.properties (100%)
 rename libresonic-rest-api/src/main/resources/libresonic-rest-api.xsd => subsonic-rest-api/src/main/resources/subsonic-rest-api.xsd (100%)

diff --git a/libresonic-main/pom.xml b/libresonic-main/pom.xml
index 93d4dfea..ddc292fc 100644
--- a/libresonic-main/pom.xml
+++ b/libresonic-main/pom.xml
@@ -21,7 +21,7 @@
 
         <dependency>
             <groupId>org.libresonic.player</groupId>
-            <artifactId>libresonic-rest-api</artifactId>
+            <artifactId>subsonic-rest-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java b/libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java
index 692c7cd6..bfbcf6c0 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java
@@ -99,7 +99,7 @@ public class JAXBWriter {
     private String getRESTProtocolVersion() throws Exception {
         InputStream in = null;
         try {
-            in = StringUtil.class.getResourceAsStream("/libresonic-rest-api.xsd");
+            in = StringUtil.class.getResourceAsStream("/subsonic-rest-api.xsd");
             Document document = new SAXBuilder().build(in);
             Attribute version = document.getRootElement().getAttribute("version");
             return version.getValue();
diff --git a/pom.xml b/pom.xml
index 717fdca8..7f2f5f45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
     </developers>
 
     <modules>
-        <module>libresonic-rest-api</module>
+        <module>subsonic-rest-api</module>
         <module>libresonic-sonos-api</module>
         <module>libresonic-main</module>
     </modules>
diff --git a/libresonic-rest-api/pom.xml b/subsonic-rest-api/pom.xml
similarity index 91%
rename from libresonic-rest-api/pom.xml
rename to subsonic-rest-api/pom.xml
index 39075fc9..799a355a 100644
--- a/libresonic-rest-api/pom.xml
+++ b/subsonic-rest-api/pom.xml
@@ -2,8 +2,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>libresonic-rest-api</artifactId>
-    <name>Libresonic REST API</name>
+    <artifactId>subsonic-rest-api</artifactId>
+    <name>Subsonic REST API</name>
 
     <parent>
         <groupId>org.libresonic.player</groupId>
diff --git a/libresonic-rest-api/src/main/resources/org/libresonic/restapi/jaxb.properties b/subsonic-rest-api/src/main/resources/org/subsonic/restapi/jaxb.properties
similarity index 100%
rename from libresonic-rest-api/src/main/resources/org/libresonic/restapi/jaxb.properties
rename to subsonic-rest-api/src/main/resources/org/subsonic/restapi/jaxb.properties
diff --git a/libresonic-rest-api/src/main/resources/libresonic-rest-api.xsd b/subsonic-rest-api/src/main/resources/subsonic-rest-api.xsd
similarity index 100%
rename from libresonic-rest-api/src/main/resources/libresonic-rest-api.xsd
rename to subsonic-rest-api/src/main/resources/subsonic-rest-api.xsd