From ea580c050b66e776dfcc045b329f210c3bf3603d Mon Sep 17 00:00:00 2001
From: Aaron Zeckoski <azeckoski@vt.edu>
Date: Tue, 10 Sep 2013 17:31:43 +0000
Subject: [PATCH] SAK-23907 removing assembly and POM cleanup

git-svn-id: https://source.sakaiproject.org/svn/site/trunk@129558 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
 site/pom.xml                                  | 110 ++++++++----------
 site/site-assembly/pom.xml                    |  75 ------------
 .../src/main/assembly/deploy.xml              |  38 ------
 3 files changed, 47 insertions(+), 176 deletions(-)
 delete mode 100644 site/site-assembly/pom.xml
 delete mode 100644 site/site-assembly/src/main/assembly/deploy.xml

diff --git a/site/pom.xml b/site/pom.xml
index d47a03567459..bdf4277b2088 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -1,68 +1,52 @@
 <?xml version="1.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>
-    
-    <parent>
-        <groupId>org.sakaiproject</groupId>
-        <artifactId>master</artifactId>
-        <version>2.10-SNAPSHOT</version>
-		<relativePath>../master/pom.xml</relativePath>
-    </parent>
-    
-    <name>sakai-site base pom</name>
-    <groupId>org.sakaiproject.site</groupId>
-    <artifactId>site</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.sakaiproject</groupId>
+    <artifactId>master</artifactId>
     <version>2.10-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    
-    <profiles>
-        <profile>
-            <id>framework</id>
-            <modules>
-                <module>site-help</module>
-                <module>site-tool/tool</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>full</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>site-assembly</module>
-                <module>site-help</module>
-                <module>site-tool/tool</module>
-                <module>mergedlist-util/util</module>
-            </modules>
-        </profile>
-    </profiles>
-    
-    <scm>
-        <connection>scm:svn:https://source.sakaiproject.org/svn/site/trunk</connection>
-        <developerConnection>scm:svn:https://source.sakaiproject.org/svn/site/trunk</developerConnection>
-        <url>https://source.sakaiproject.org/svn/site/trunk</url>
-    </scm>
-    
-    <distributionManagement>
-        <site>
-            <id>sakai-site</id>
-            <name>Sakai release Site</name>
-            <url>scp://source.sakaiproject.org/var/www/html/release/site/${project.version}</url>
-        </site>
-    </distributionManagement>
-    
-    <repositories> 
-		<repository> 
-			<id>sonatype-nexus-snapshots</id> 
-			<name>Sonatype Nexus Snapshots</name> 
-			<url> https://oss.sonatype.org/content/repositories/snapshots </url> 
-			<releases> 
-				<enabled>false</enabled> 
-			</releases> 
-			<snapshots> 
-				<enabled>true</enabled> 
-			</snapshots> 
-		</repository> 
-	</repositories>
+    <relativePath>../master/pom.xml</relativePath>
+  </parent>
+
+  <name>sakai-site base pom</name>
+  <groupId>org.sakaiproject.site</groupId>
+  <artifactId>site</artifactId>
+  <version>2.10-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <profiles>
+    <profile>
+      <id>full</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>site-help</module>
+        <module>site-tool/tool</module>
+        <module>mergedlist-util/util</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>framework</id>
+      <modules>
+        <module>site-help</module>
+        <module>site-tool/tool</module>
+      </modules>
+    </profile>
+  </profiles>
+
+  <scm>
+    <connection>scm:svn:https://source.sakaiproject.org/svn/site/trunk</connection>
+    <developerConnection>scm:svn:https://source.sakaiproject.org/svn/site/trunk</developerConnection>
+    <url>https://source.sakaiproject.org/svn/site/trunk</url>
+  </scm>
+
+  <distributionManagement>
+    <site>
+      <id>sakai-site</id>
+      <name>Sakai release Site</name>
+      <url>scp://source.sakaiproject.org/var/www/html/release/site/${project.version}</url>
+    </site>
+  </distributionManagement>
 
 </project>
diff --git a/site/site-assembly/pom.xml b/site/site-assembly/pom.xml
deleted file mode 100644
index 9c1c40d16d73..000000000000
--- a/site/site-assembly/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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.sakaiproject.site</groupId>
-        <artifactId>site</artifactId>
-        <version>2.10-SNAPSHOT</version>
-    </parent>
-
-    <name>sakai-site-assembly</name>
-    <groupId>org.sakaiproject.site</groupId>
-    <artifactId>sakai-site-assembly</artifactId>
-    <organization>
-        <name>Sakai Project</name>
-        <url>http://sakaiproject.org/</url>
-    </organization>
-    <inceptionYear>2011</inceptionYear>
-    <packaging>pom</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sakai-site-tool</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sakai-site-help</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin
-                </artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/deploy.xml
-                        </descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                        <phase>package</phase> <!-- append to the packaging phase. -->
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/site/site-assembly/src/main/assembly/deploy.xml b/site/site-assembly/src/main/assembly/deploy.xml
deleted file mode 100644
index 84131e3188c4..000000000000
--- a/site/site-assembly/src/main/assembly/deploy.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<assembly>
-    <id>tomcat-overlay</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>shared/lib/</outputDirectory>
-            <useTransitiveDependencies>false
-            </useTransitiveDependencies>
-            <includes>
-                <include>org.sakaiproject.site:sakai-site-help:jar:*</include>
-            </includes>
-            <unpack>false</unpack>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>webapps/</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}.war</outputFileNameMapping>
-            <!-- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> -->
-            <!-- <outputFileNameMapping>imsblti.war</outputFileNameMapping> -->
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-            <includes>
-                 <include>org.sakaiproject.site:sakai-site-tool:war:*</include>
-            </includes>
-            <unpack>false</unpack>
-        </dependencySet>
-    </dependencySets>
-    <fileSets>
-        <fileSet>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>${project.basedir}/README*</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file