From 6b09463f8af8ad611ba70692ae3dbfa837c7f3bc Mon Sep 17 00:00:00 2001
From: Jjk422 <j.keughley5886@student.leedsbeckett.ac.uk>
Date: Thu, 21 Jul 2016 11:30:22 +0100
Subject: [PATCH] A few minor changes to comments: secgen_metadata.xml:20 -
 removed comment as not apache installation so not needed.  java.pp:1-3 -
 update step removed here and example I used in #49 followed to allow for
 dependencies code to be used in the future. java_service.xml:7 updated
 comment to reflect that the service is a java language installation

---
 modules/services/unix/languages/java/java.pp             | 5 -----
 modules/services/unix/languages/java/secgen_metadata.xml | 1 -
 scenarios/simple_examples/java_service.xml               | 6 +++++-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/services/unix/languages/java/java.pp b/modules/services/unix/languages/java/java.pp
index 6c3d2e7a7..681440b33 100644
--- a/modules/services/unix/languages/java/java.pp
+++ b/modules/services/unix/languages/java/java.pp
@@ -1,8 +1,3 @@
-exec { 'update':
-  command => "/usr/bin/apt-get update -y",
-}
-
-
 class { 'java':
   distribution => 'jre',
 }
\ No newline at end of file
diff --git a/modules/services/unix/languages/java/secgen_metadata.xml b/modules/services/unix/languages/java/secgen_metadata.xml
index cb9aa17eb..1cacb78bc 100644
--- a/modules/services/unix/languages/java/secgen_metadata.xml
+++ b/modules/services/unix/languages/java/secgen_metadata.xml
@@ -17,7 +17,6 @@
   <software_name>java</software_name>
   <software_license>Apache v2</software_license>
 
-  <!--Cannot co-exist with other apache installations-->
   <conflict>
     <software_name>java</software_name>
   </conflict>
diff --git a/scenarios/simple_examples/java_service.xml b/scenarios/simple_examples/java_service.xml
index 9ee0af99f..5a6102ae7 100644
--- a/scenarios/simple_examples/java_service.xml
+++ b/scenarios/simple_examples/java_service.xml
@@ -4,11 +4,15 @@
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="http://www.github/cliffe/SecGen/scenario">
 
-	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
+	<!-- A secure system running java -->
 	<system>
 		<system_name>system_with_java</system_name>
 		<base platform="linux"/>
 
+		<!-- TODO: Dependency -->
+		<service module_path="modules/services/unix/update/unix_update"></service>
+		<!-- TODO: /Dependency -->
+
 		<service module_path="modules/services/unix/languages/java"></service>
 
 		<network type="private_network" range="dhcp"></network>