Merge branch 'master' of github.com:trifork/sdm4-parent

clean-importermodules.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+mvn clean
+for dir in $(find . -mindepth 1 -maxdepth 1 -type d -name 'sdm4-*'); do
+	pushd $dir
+    mvn clean
+    popd
+done

environment/modules/jboss7as/files/standalone.xml

@@ -26,9 +26,6 @@
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
     </extensions>
-    <system-properties>
-        <property name="dk.sdsd.nsp.slalog.config.dir" value="/pack/jboss/domain/slalog-conf"/>
-    </system-properties>
     <management>
         <security-realms>
             <security-realm name="ManagementRealm">

environment/modules/jboss7as/manifests/importerdirectories.pp

@@ -9,11 +9,6 @@
     	ensure => directory,
     }
 
-	# For NSP-Util SLA log config
-    file { ["/pack/jboss/domain/slalog-conf"]:
-    	ensure => directory,
-    }
-
     # For the sample data dir
 	file {"/pack/jboss/domain/data/sdm4":
 		ensure => directory,

environment/modules/jboss7as/manifests/importermodule.pp

@@ -7,40 +7,43 @@
         $modulename = $importername
       }
 
+	$module_main_dir="/pack/jboss/modules/sdm4/config/${modulename}/main"
+
 	File {
 		ensure => present,
     	owner => "jboss",
 		group => "jboss",
 	}
 
 	# NSP-Util Slalog configuration
-	file {"/pack/jboss/domain/slalog-conf/nspslalog-${modulename}.properties":
+	file {"${module_main_dir}/nspslalog-${modulename}.properties":
 		content => template("jboss7as/nspslalog-importer.properties"),
 	}
 
-	file {"/pack/jboss/domain/slalog-conf/log4j-nspslalog-${modulename}.properties":
+	file {"${module_main_dir}/log4j-nspslalog.properties":
 		content => template("jboss7as/log4j-nspslalog-importer.properties"),
 	}
 
-    file {"/pack/jboss/modules/sdm4/config/${modulename}/main/rowset.jar":
+	# support for Spring use of com.sun.rowset.CachedRowsetImpl, only needed because the tests run on OpenJDK which does not include this class
+    file {"${module_main_dir}/rowset.jar":
         ensure => present,
         source => "puppet:///modules/jboss7as/rowset.jar",
-        require => File["/pack/jboss/modules/sdm4/config/${modulename}/main"]
+        require => File["${module_main_dir}"]
     }
 
 	# JBoss module
-   	file {["/pack/jboss/modules/sdm4/config/${modulename}", "/pack/jboss/modules/sdm4/config/${modulename}/main"]:
+   	file {["${module_main_dir}/..", "${module_main_dir}"]:
         ensure => directory,
         require => File["/pack/jboss"],
     }
 
-	file {"/pack/jboss/modules/sdm4/config/${modulename}/main/log4j.properties":
+	file {"${module_main_dir}/log4j.properties":
 		content => template("jboss7as/log4j-importer.properties"),
-		require => File["/pack/jboss/modules/sdm4/config/${modulename}/main"],
+		require => File["${module_main_dir}"],
 	}
 
-	file {"/pack/jboss/modules/sdm4/config/${modulename}/main/module.xml":
+	file {"${module_main_dir}/module.xml":
 		content => template("jboss7as/sdm-importer-module.xml"),
-		require => File["/pack/jboss/modules/sdm4/config/${modulename}/main"],
+		require => File["${module_main_dir}"],
 	}
 }

environment/modules/jboss7as/templates/nspslalog-importer.properties

@@ -1,2 +1 @@
 nspslalog.log4j.configure=true
-dk.sdsd.nsp.slalog.log4j.configuration.url=file:///pack/jboss/domain/slalog-conf/log4j-nspslalog-<%=modulename%>.properties

gitpull-importermodules.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+git pull
 for dir in $(find . -mindepth 1 -maxdepth 1 -type d -name 'sdm4-*'); do
 	pushd $dir
     git pull

gitpush-importermodules.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+git push
 for dir in $(find . -mindepth 1 -maxdepth 1 -type d -name 'sdm4-*'); do
 	pushd $dir
     git push