From 62055a7968c1590f13b74af6dc06b4f311e87bf7 Mon Sep 17 00:00:00 2001
From: simonbrandhof <simon.brandhof@gmail.com>
Date: Fri, 11 Feb 2011 11:43:14 +0100
Subject: [PATCH] Directory extensions/jdbc-driver/oracle is missing

---
 sonar-application/assembly.xml | 177 +++++++++++++++++----------------
 1 file changed, 92 insertions(+), 85 deletions(-)

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index d51c87576d4..85037745654 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -1,94 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-  <id>distribution</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>distribution</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
       <outputDirectory>lib</outputDirectory>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>org.codehaus.sonar:sonar-server</exclude>
-        <exclude>mysql:mysql-connector-java</exclude>
-        <exclude>org.apache.derby:derbyclient</exclude>
-        <exclude>postgresql:postgresql</exclude>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.codehaus.sonar:sonar-server</exclude>
+        <exclude>mysql:mysql-connector-java</exclude>
+        <exclude>org.apache.derby:derbyclient</exclude>
+        <exclude>postgresql:postgresql</exclude>
         <exclude>net.sourceforge.jtds:jtds</exclude>
         <exclude>org.codehaus.sonar.plugins:*</exclude>
-        <exclude>org.codehaus.sonar.runtime:*</exclude>
-      </excludes>
+        <exclude>org.codehaus.sonar.runtime:*</exclude>
+      </excludes>
     </dependencySet>
-    <dependencySet>
+    <dependencySet>
       <outputDirectory>lib/deprecated-maven-plugin</outputDirectory>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
-      <includes>
-        <include>org.codehaus.sonar.runtime:sonar-core-maven-plugin</include>
-      </includes>
-    </dependencySet>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>org.codehaus.sonar.runtime:sonar-core-maven-plugin</include>
+      </includes>
+    </dependencySet>
 
-    <dependencySet>
+    <dependencySet>
       <outputDirectory>lib/core-plugins</outputDirectory>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
-      <includes>
-        <include>org.codehaus.sonar.plugins:*</include>
-      </includes>
-    </dependencySet>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>org.codehaus.sonar.plugins:*</include>
+      </includes>
+    </dependencySet>
 
-    <dependencySet>
+    <dependencySet>
       <outputDirectory>lib/core-plugins</outputDirectory>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
-      <includes>
-        <include>org.codehaus.sonar.plugins:*</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>war/sonar-server</outputDirectory>
-      <includes>
-        <include>org.codehaus.sonar:sonar-server</include>
-      </includes>
-      <unpack>true</unpack>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>extensions/jdbc-driver/mysql/</outputDirectory>
-      <includes>
-        <include>mysql:mysql-connector-java</include>
-      </includes>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>extensions/jdbc-driver/derby/</outputDirectory>
-      <includes>
-        <include>org.apache.derby:derbyclient</include>
-      </includes>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>extensions/jdbc-driver/postgresql/</outputDirectory>
-      <includes>
-        <include>postgresql:postgresql</include>
-      </includes>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>extensions/jdbc-driver/mssql/</outputDirectory>
-      <includes>
-        <include>net.sourceforge.jtds:jtds</include>
-      </includes>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}/src/main/assembly</directory>
-      <outputDirectory>/</outputDirectory>
-      <fileMode>0755</fileMode>
-      <directoryMode>0755</directoryMode>
-    </fileSet>
-  </fileSets>
-</assembly>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>org.codehaus.sonar.plugins:*</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>war/sonar-server</outputDirectory>
+      <includes>
+        <include>org.codehaus.sonar:sonar-server</include>
+      </includes>
+      <unpack>true</unpack>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>extensions/jdbc-driver/mysql/</outputDirectory>
+      <includes>
+        <include>mysql:mysql-connector-java</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>extensions/jdbc-driver/derby/</outputDirectory>
+      <includes>
+        <include>org.apache.derby:derbyclient</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>extensions/jdbc-driver/postgresql/</outputDirectory>
+      <includes>
+        <include>postgresql:postgresql</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>extensions/jdbc-driver/mssql/</outputDirectory>
+      <includes>
+        <include>net.sourceforge.jtds:jtds</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/assembly</directory>
+      <outputDirectory>/</outputDirectory>
+      <fileMode>0755</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/bin</directory>
+      <outputDirectory>extensions/jdbc-driver/oracle/</outputDirectory>
+      <excludes>
+        <exclude>**/*</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>
-- 
2.39.5