Upgrade security plugin

ozoneplatform · Nov 16, 2015 · 4912973 · 4912973
1 parent 1abc433
commit 4912973
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/application.properties b/application.properties
@@ -13,7 +13,7 @@ mp.samples.org=omp
 mp.samples.rev=1.0
 mp.security.module=ozone-security
 mp.security.org=org.ozoneplatform
-mp.security.rev=3.27
+mp.security.rev=3.28
 tomcat.custom.module=ozone-custom-tomcat
 tomcat.custom.org=org.ozoneplatform
 tomcat.custom.rev=1.2.1
diff --git a/build.xml b/build.xml
@@ -254,18 +254,24 @@
     </target>
 
     <target name="stage-security">
+        <mkdir dir="${staging.dir}/${mp.security.module}" />
+
         <!-- Unzip sample Spring configuration files -->
         <unzip src="${staging.dir}/${mp.security.module}-project-${mp.security.rev}.zip"
                 dest="${staging.dir}/${mp.security.module}">
             <patternset>
-                <include name="owf-security-${mp.security.rev}/src/main/resources/spring/**" />
+                <include name="src/main/resources/spring/**" />
             </patternset>
             <filtermapper>
-                <replacestring from="owf-security-${mp.security.rev}/src/main/resources/spring/" to="" />
+                <replacestring from="src/main/resources/spring/" to="" />
             </filtermapper>
         </unzip>
 
-        <delete dir="${staging.dir}/${mp.security.module}/owf-security-${mp.security.rev}" />
+        <!-- this will be an empty directory tree due to the filtermapper above -->
+        <delete dir="${staging.dir}/${mp.security.module}/src" />
+
+        <copy file="${staging.dir}/${mp.security.module}-project-${mp.security.rev}.zip"
+            tofile="${staging.dir}/${mp.security.module}/${mp.security.module}-project.zip" />
 
         <!-- Add default sample Spring configuration to Tomcat CLASSPATH -->
         <copy todir="${tomcat.dir}/lib">

diff --git a/ivysettings.xml b/ivysettings.xml
@@ -9,13 +9,6 @@
             </filesystem>
             <ibiblio name="nexus" m2compatible="true" root="http://repo1.maven.org/maven2"/>
 
-            <url name="ozone-security">
-                <artifact pattern="https://github.com/ozoneplatform/owf-security/archive/[revision].[ext]" />
-            </url>
-<!--             <url name="ozoneplatform">
-                <artifact pattern="https://github.com/ozoneplatform/[module]/archive/[revision].[ext]" />
-            </url> -->
-
             <url name="ozoneplatform">
                 <artifact pattern="https://github.com/ozoneplatform/[organisation]/archive/[module]-[revision].zip" />
             </url>