Merge pull request #22 from ekc/fix.libertyRoot.not.honored

Fix.libertyRoot.not.honored

Author: jdmcclur

daytrader-ee7-ejb/build.gradle

@@ -13,6 +13,8 @@ dependencies {
     compile group:'javax.jms', name:'javax.jms-api', version:'2.0'
     compile group:'javax.validation', name:'validation-api', version:'1.1.0.Final'
     compile 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1+'
+    compile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
+
 }
 
 sourceCompatibility = 1.7

daytrader-ee7-wlpcfg/build.gradle

@@ -1,6 +1,8 @@
-task clean << {
-    ant.delete(includeemptydirs: 'true') {
-        fileset(dir: 'servers', includes: '**/logs/**, **/apps/*, **/workarea/**')
-        fileset(dir: 'shared/resources', includes: '**/data/**, **/Daytrader7SampleDerbyLibs/*')
+task clean {
+    doLast {
+        ant.delete(includeemptydirs: 'true') {
+            fileset(dir: 'servers', includes: '**/logs/**, **/apps/*, **/workarea/**')
+            fileset(dir: 'shared/resources', includes: '**/data/**, **/Daytrader7SampleDerbyLibs/*')
+        }
     }
-}
+}

daytrader-ee7/build.gradle

@@ -94,7 +94,7 @@ String getHttpPort() {
 libertyStart.mustRunAfter publishEar
 
 liberty {
-    installDir = owner.hasProperty('libertyRoot') ? "${libertyRoot}" : null
+    installDir = project.hasProperty('libertyRoot') ? "${libertyRoot}" : null
     serverName = 'daytrader7Sample'
     userDir = '../daytrader-ee7-wlpcfg'
     clean = true