redhat 5 compatible and support parser = future

biemond · Nov 19, 2013 · d0943a7 · d0943a7
1 parent dd66f10
commit d0943a7
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 30 deletions.
diff --git a/.project b/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
 			<arguments>
@@ -19,5 +24,6 @@
 	<natures>
 		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.pydevproject b/.pydevproject
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+</pydev_project>
diff --git a/manifests/control.pp b/manifests/control.pp
@@ -29,7 +29,6 @@
   $javaCommand = "java -Dweblogic.security.SSL.ignoreHostnameVerification=true weblogic.WLST -skipWLSModuleScanning "
 
   $exec_path    = "${jdk_home_dir}/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:"
-  $JAVA_HOME    = $jdk_home_dir
   $checkCommand = "/bin/ps -ef | grep -v grep | /bin/grep 'weblogic.Name=${server}' | /bin/grep ${domain_name}"
 
   Exec {
@@ -69,7 +68,7 @@
   if $action == 'start' {
     exec { "execwlst ${title}${script} ":
       command     => "${javaCommand} ${download_dir}/${title}${script} ${weblogic_password}",
-      environment => ["CLASSPATH=${weblogic_home_dir}/server/lib/weblogic.jar", "JAVA_HOME=${JAVA_HOME}"],
+      environment => ["CLASSPATH=${weblogic_home_dir}/server/lib/weblogic.jar", "JAVA_HOME=${jdk_home_dir}"],
       unless      => $checkCommand,
       require     => File["${download_dir}/${title}${script}"],
       path        => $exec_path,
@@ -80,7 +79,7 @@
   } elsif $action == 'stop' {
     exec { "execwlst ${title}${script} ":
       command     => "${javaCommand} ${download_dir}/${title}${script} ${weblogic_password}",
-      environment => ["CLASSPATH=${weblogic_home_dir}/server/lib/weblogic.jar", "JAVA_HOME=${JAVA_HOME}"],
+      environment => ["CLASSPATH=${weblogic_home_dir}/server/lib/weblogic.jar", "JAVA_HOME=${jdk_home_dir}"],
       onlyif      => $checkCommand,
       require     => File["${download_dir}/${title}${script}"],
       path        => $exec_path,

diff --git a/manifests/copydomain.pp b/manifests/copydomain.pp
@@ -137,7 +137,7 @@
     }
 
     exec { "domain.py ${domain_name} ${title}":
-      command => "rm -I ${download_dir}/enroll_domain_${domain_name}.py",
+      command => "rm ${download_dir}/enroll_domain_${domain_name}.py",
       path      => $exec_path,
       user      => $os_user,
       group     => $os_group,

diff --git a/manifests/domain.pp b/manifests/domain.pp
@@ -131,7 +131,6 @@
     }
 
     $exec_path        = "${jdk_home_dir}/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin"
-    $JAVA_HOME        = $jdk_home_dir
     $nodeMgrMachine   = "UnixMachine"
 
     Exec {
@@ -230,10 +229,9 @@
       }
     }
 
-
     exec { "execwlst ${domain_name} ${title}":
       command     => "${wlstPath}/wlst.sh ${download_dir}/domain_${domain_name}.py",
-      environment => ["JAVA_HOME=${JAVA_HOME}"],
+      environment => ["JAVA_HOME=${jdk_home_dir}"],
       unless      => "/usr/bin/test -e ${domain_dir}/${domain_name}",
       creates     => "${domain_dir}/${domain_name}",
       require     => [
@@ -257,24 +255,13 @@
 
 
     exec { "domain.py ${domain_name} ${title}":
-      command => "rm -I ${download_dir}/domain_${domain_name}.py",
+      command => "rm ${download_dir}/domain_${domain_name}.py",
       require => Exec["execwlst ${domain_name} ${title}"],
       path    => $exec_path,
       user    => $os_user,
       group   => $os_group,
     }
 
-#    $packCommand = "-domain=${domain_dir}/${domain_name} -template=${download_dir}/domain_${domain_name}.jar -template_name=domain_${domain_name} -log=${download_dir}/domain_${domain_name}.log -log_priority=INFO"
-
-#    exec { "pack domain ${domain_name} ${title}":
-#      command => "${weblogic_home_dir}/common/bin/pack.sh ${packCommand}",
-#      require => Exec["setDebugFlagOnFalse ${domain_name} ${title}"],
-#      creates => "${download_dir}/domain_${domain_name}.jar",
-#      path    => $exec_path,
-#      user    => $os_user,
-#      group   => $os_group,
-#    }
-
     $nodeMgrHome = "${domain_dir}/${domain_name}/nodemanager"
     $listenPort   = $nodemanager_port
 

diff --git a/manifests/nodemanager.pp b/manifests/nodemanager.pp
@@ -34,7 +34,6 @@
 
   $exec_path    = "${jdk_home_dir}/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:"
   $checkCommand = "/bin/ps -ef | grep -v grep | /bin/grep 'weblogic.NodeManager'"
-  $JAVA_HOME    = $jdk_home_dir
   $nativeLib    = "linux/x86_64"
 
   Exec {
@@ -86,7 +85,7 @@
       }
     }
 
-    $javaCommand = "java -client -Xms32m -Xmx200m -XX:PermSize=128m -XX:MaxPermSize=256m -DListenPort=${nodemanager_port} -Dbea.home=${weblogic_home_dir} -Dweblogic.nodemanager.JavaHome=${JAVA_HOME} -Djava.security.policy=${weblogic_home_dir}/server/lib/weblogic.policy -Xverify:none weblogic.NodeManager -v"
+    $javaCommand = "java -client -Xms32m -Xmx200m -XX:PermSize=128m -XX:MaxPermSize=256m -DListenPort=${nodemanager_port} -Dbea.home=${weblogic_home_dir} -Dweblogic.nodemanager.JavaHome=${jdk_home_dir} -Djava.security.policy=${weblogic_home_dir}/server/lib/weblogic.policy -Xverify:none weblogic.NodeManager -v"
 
     file { "nodemanager.properties ux ${title}":
       path    => "${nodeMgrHome}/nodemanager.properties",
@@ -101,7 +100,7 @@
       command     => "/usr/bin/nohup ${javaCommand} &",
       environment => [
         "CLASSPATH=${weblogic_home_dir}/server/lib/weblogic.jar",
-        "JAVA_HOME=${JAVA_HOME}",
+        "JAVA_HOME=${jdk_home_dir}",
         "LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${weblogic_home_dir}/server/native/${nativeLib}"],
       unless      => "${checkCommand}",
       path        => $exec_path,

diff --git a/manifests/wlstexec.pp b/manifests/wlstexec.pp
@@ -82,7 +82,7 @@
 
     # cleanup WLST script
     exec { "rm ${download_dir}/${title}${script}":
-      command   => "rm -I ${download_dir}/${title}${script}",
+      command   => "rm ${download_dir}/${title}${script}",
       path      => $exec_path,
       user      => $os_user,
       group     => $os_group,

diff --git a/templates/domains/domain.py.erb b/templates/domains/domain.py.erb
@@ -12,7 +12,7 @@ ADMIN_SERVER='<%= @adminserver_name %>'
 ADMIN_USER='<%= @weblogic_user %>'
 ADMIN_PASSWORD='<%= @weblogic_password %>'
 
-JAVA_HOME='<%= @JAVA_HOME %>'
+JAVA_HOME='<%= @jdk_home_dir %>'
 
 ADM_JAVA_ARGUMENTS='-XX:PermSize=256m -XX:MaxPermSize=512m -Xms1024m -Xmx1024m -Dweblogic.Stdout=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>.out -Dweblogic.Stderr=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>_err.out'
 

diff --git a/templates/domains/domain_adf.py.erb b/templates/domains/domain_adf.py.erb
@@ -12,7 +12,7 @@ ADMIN_SERVER='<%= @adminserver_name %>'
 ADMIN_USER='<%= @weblogic_user %>'
 ADMIN_PASSWORD='<%= @weblogic_password %>'
 
-JAVA_HOME='<%= @JAVA_HOME %>'
+JAVA_HOME='<%= @jdk_home_dir %>'
 
 ADM_JAVA_ARGUMENTS='-XX:PermSize=256m -XX:MaxPermSize=512m -Xms1024m -Xmx1024m -Dweblogic.Stdout=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>.out -Dweblogic.Stderr=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>_err.out'
 

diff --git a/templates/domains/domain_osb.py.erb b/templates/domains/domain_osb.py.erb
@@ -12,7 +12,7 @@ ADMIN_SERVER='<%= @adminserver_name %>'
 ADMIN_USER='<%= @weblogic_user %>'
 ADMIN_PASSWORD='<%= @weblogic_password %>'
 
-JAVA_HOME='<%= @JAVA_HOME %>'
+JAVA_HOME='<%= @jdk_home_dir %>'
 
 ADM_JAVA_ARGUMENTS='-XX:PermSize=256m -XX:MaxPermSize=512m -Xms1024m -Xmx1024m -Dweblogic.Stdout=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>.out -Dweblogic.Stderr=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>_err.out'
 OSB_JAVA_ARGUMENTS='-XX:PermSize=512m -XX:MaxPermSize=512m -Xms1024m -Xmx1024m -Dweblogic.Stdout=<%= @osb_nodemanager_log_dir %>/osb_server1.out -Dweblogic.Stderr=<%= @osb_nodemanager_log_dir %>/osb_server1_err.out'

diff --git a/templates/domains/domain_osb_soa.py.erb b/templates/domains/domain_osb_soa.py.erb
@@ -12,7 +12,7 @@ ADMIN_SERVER='<%= @adminserver_name %>'
 ADMIN_USER='<%= @weblogic_user %>'
 ADMIN_PASSWORD='<%= @weblogic_password %>'
 
-JAVA_HOME='<%= @JAVA_HOME %>'
+JAVA_HOME='<%= @jdk_home_dir %>'
 
 ADM_JAVA_ARGUMENTS='-XX:PermSize=256m -XX:MaxPermSize=512m -Xms1024m -Xmx1024m -Dweblogic.Stdout=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>.out -Dweblogic.Stderr=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>_err.out'
 OSB_JAVA_ARGUMENTS='-XX:PermSize=512m -XX:MaxPermSize=512m -Xms1024m -Xmx1024m -Dweblogic.Stdout=<%= @osb_nodemanager_log_dir %>/osb_server1.out -Dweblogic.Stderr=<%= @osb_nodemanager_log_dir %>/osb_server1_err.out'

diff --git a/templates/domains/domain_osb_soa_bpm.py.erb b/templates/domains/domain_osb_soa_bpm.py.erb
@@ -11,7 +11,7 @@ ADMIN_SERVER='<%= @adminserver_name %>'
 ADMIN_USER='<%= @weblogic_user %>'
 ADMIN_PASSWORD='<%= @weblogic_password %>'
 
-JAVA_HOME='<%= @JAVA_HOME %>'
+JAVA_HOME='<%= @jdk_home_dir %>'
 
 ADM_JAVA_ARGUMENTS='-XX:PermSize=256m -XX:MaxPermSize=512m -Xms1024m -Xmx1024m -Dweblogic.Stdout=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>.out -Dweblogic.Stderr=<%= @admin_nodemanager_log_dir %>/<%= @adminserver_name %>_err.out'
 OSB_JAVA_ARGUMENTS='-XX:PermSize=512m -XX:MaxPermSize=512m -Xms1024m -Xmx1024m -Dweblogic.Stdout=<%= @osb_nodemanager_log_dir %>/osb_server1.out -Dweblogic.Stderr=<%= @osb_nodemanager_log_dir %>/osb_server1_err.out'

diff --git a/templates/nodemgr/nodemanager.properties.erb b/templates/nodemgr/nodemanager.properties.erb
@@ -1,6 +1,6 @@
 DomainsFile=<%= @weblogic_home_dir %>/common/nodemanager/nodemanager.domains
 NodeManagerHome=<%= @weblogic_home_dir %>/common/nodemanager
-JavaHome=<%= @JAVA_HOME %>
+JavaHome=<%= @jdk_home_dir %>
 ListenPort=<%= @nodemanager_port %>
 LogFile=<%= @nodeMgrLogDir %>
 LogLimit=0

diff --git a/templates/nodemgr/nodemanager.properties_1212.erb b/templates/nodemgr/nodemanager.properties_1212.erb
@@ -4,7 +4,7 @@ LogLimit=0
 PropertiesVersion=12.1.2
 AuthenticationEnabled=true
 NodeManagerHome=<%= @domain_dir %>/<%= @domain_name %>/nodemanager
-JavaHome=<%= @JAVA_HOME %>
+JavaHome=<%= @jdk_home_dir %>
 LogLevel=INFO
 DomainsFileEnabled=true
 StartScriptName=startWebLogic.sh