Merge pull request #29 from charithag/master

Excluded jaggery.conf provided by uuf-base app and removed oltu patch

modules/distribution/src/assembly/bin.xml

@@ -365,16 +365,6 @@
                 <include>dynamic-client-web.war</include>
             </includes>
         </fileSet>
-        <!--copy jaxrs web app for OAuth feature-->
-
-
-        <!-- Copying mdm app extensions -->
-        <fileSet>
-            <directory>../apps/jaggery/mdm/src/mdm/</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/mdm
-            </outputDirectory>
-        </fileSet>
 
         <!-- Copying mdm app from devicemgt app-->
         <fileSet>
@@ -384,6 +374,9 @@
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
             </outputDirectory>
+            <excludes>
+                <exclude>jaggery.conf</exclude>
+            </excludes>
         </fileSet>
 
         <fileSet>
@@ -1181,14 +1174,14 @@
             <fileMode>644</fileMode>
         </file>
 
-        <file>
-            <source>
-                src/repository/patches/oltu-1.0.0.wso2v2.jar
-            </source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/components/patches/patch1000
-            </outputDirectory>
-        </file>
+        <!--<file>-->
+            <!--<source>-->
+                <!--src/repository/patches/oltu-1.0.0.wso2v2.jar-->
+            <!--</source>-->
+            <!--<outputDirectory>-->
+                <!--${pom.artifactId}-${pom.version}/repository/components/patches/patch1000-->
+            <!--</outputDirectory>-->
+        <!--</file>-->
 
     </files>
 </assembly>