From 4738428c2c205f42200386ae09b44b9ec07b9144 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 27 Jul 2013 14:33:25 -0700
Subject: Move subsonic-android to root

---
 subsonic-assembly/pom.xml                          | 63 ----------------------
 subsonic-assembly/src/main/assembly/src.xml        | 38 -------------
 subsonic-assembly/src/main/assembly/standalone.xml | 43 ---------------
 subsonic-assembly/src/main/assembly/war.xml        | 27 ----------
 4 files changed, 171 deletions(-)
 delete mode 100644 subsonic-assembly/pom.xml
 delete mode 100644 subsonic-assembly/src/main/assembly/src.xml
 delete mode 100644 subsonic-assembly/src/main/assembly/standalone.xml
 delete mode 100644 subsonic-assembly/src/main/assembly/war.xml

(limited to 'subsonic-assembly')

diff --git a/subsonic-assembly/pom.xml b/subsonic-assembly/pom.xml
deleted file mode 100644
index 74448d92..00000000
--- a/subsonic-assembly/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<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>net.sourceforge.subsonic</groupId>
-    <artifactId>subsonic-assembly</artifactId>
-    <packaging>pom</packaging>
-    <name>Subsonic Assembly</name>
-
-    <parent>
-        <groupId>net.sourceforge.subsonic</groupId>
-        <artifactId>subsonic</artifactId>
-        <version>4.7.beta2</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>net.sourceforge.subsonic</groupId>
-            <artifactId>subsonic-main</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>subsonic-${project.version}</finalName>
-        <plugins>
-
-            <!-- Configuration of assembly plugin for creating the distributions. -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/war.xml</descriptor>
-                        <descriptor>src/main/assembly/standalone.xml</descriptor>
-                        <descriptor>src/main/assembly/src.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-
-            <!-- Work-around since the target directory is not created automatically. -->
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <configuration>
-                            <target>
-                                <mkdir dir="target"/>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/subsonic-assembly/src/main/assembly/src.xml b/subsonic-assembly/src/main/assembly/src.xml
deleted file mode 100644
index e1bbc75e..00000000
--- a/subsonic-assembly/src/main/assembly/src.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- Defines the set of files that should be included in the source distribution. -->
-
-<assembly>
-    <id>src</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-
-        <fileSet>
-            <directory>..</directory>
-            <includes>
-                <include>pom.xml</include>
-            </includes>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../repo</directory>
-            <outputDirectory>repo</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../subsonic-main</directory>
-            <includes>
-                <include>src/**</include>
-                <include>pom.xml</include>
-                <include>target/classes/build_number.txt</include>
-                <include>LICENSE.TXT</include>
-                <include>README.TXT</include>
-                <include>Getting Started.html</include>
-            </includes>
-            <outputDirectory>subsonic-main</outputDirectory>
-        </fileSet>
-
-    </fileSets>
-</assembly>
diff --git a/subsonic-assembly/src/main/assembly/standalone.xml b/subsonic-assembly/src/main/assembly/standalone.xml
deleted file mode 100644
index 41e19918..00000000
--- a/subsonic-assembly/src/main/assembly/standalone.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- Defines the set of files that should be included in the standalone distribution. -->
-
-<assembly>
-    <id>standalone</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>../subsonic-main</directory>
-            <outputDirectory/>
-            <includes>
-                <include>README.TXT</include>
-                <include>LICENSE.TXT</include>
-                <include>Getting Started.html</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../subsonic-main/target</directory>
-            <outputDirectory/>
-            <includes>
-                <include>*.war</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../subsonic-booter/target</directory>
-            <outputDirectory/>
-            <includes>
-                <include>subsonic-booter-jar-with-dependencies.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../subsonic-booter/src/main/script</directory>
-            <outputDirectory/>
-            <includes>
-                <include>subsonic.sh</include>
-                <include>subsonic.bat</include>
-            </includes>
-            <fileMode>0777</fileMode>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/subsonic-assembly/src/main/assembly/war.xml b/subsonic-assembly/src/main/assembly/war.xml
deleted file mode 100644
index 8aa4d188..00000000
--- a/subsonic-assembly/src/main/assembly/war.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Defines the set of files that should be included in the binary distribution. -->
-
-<assembly>
-    <id>war</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>../subsonic-main</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>README.TXT</include>
-                <include>LICENSE.TXT</include>
-                <include>Getting Started.html</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../subsonic-main/target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.war</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
-- 
cgit v1.2.3