Ensure that all paths are relative

pmuir · Nov 9, 2012 · 21b68c0 · 21b68c0
1 parent 65cba5d
commit 21b68c0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 30 deletions.
diff --git a/demo/patches/admin_layer_functional_1.0.patch b/demo/patches/admin_layer_functional_1.0.patch
@@ -4,12 +4,12 @@ index 689cc8c..f9aa6c1 100644
 +++ src/main/java/org/jboss/jdf/examples/view/PerformanceBean.java
 @@ -25,6 +25,8 @@ import javax.persistence.criteria.Predicate;
  import javax.persistence.criteria.Root;
- 
+
  import org.jboss.jdf.example.ticketmonster.model.Performance;
 +import org.jboss.jdf.example.ticketmonster.model.Section;
 +import org.jboss.jdf.example.ticketmonster.model.SectionAllocation;
  import org.jboss.jdf.example.ticketmonster.model.Show;
- 
+
  /**
 @@ -122,8 +124,13 @@ public class PerformanceBean implements Serializable
        {
@@ -27,10 +27,10 @@ index 689cc8c..f9aa6c1 100644
           }
           else
           {
-diff --git ../demo/src/main/webapp/WEB-INF/web.xml ../demo/src/main/webapp/WEB-INF/web.xml
+diff --git src/main/webapp/WEB-INF/web.xml src/main/webapp/WEB-INF/web.xml
 index d1afd7b..e62b752 100644
---- ../demo/src/main/webapp/WEB-INF/web.xml
-+++ ../demo/src/main/webapp/WEB-INF/web.xml
+--- src/main/webapp/WEB-INF/web.xml
++++ src/main/webapp/WEB-INF/web.xml
 @@ -32,7 +32,4 @@
    <session-config>
      <session-timeout>30</session-timeout>
@@ -39,17 +39,17 @@ index d1afd7b..e62b752 100644
 -    <welcome-file>faces/index.xhtml</welcome-file>
 -  </welcome-file-list>
  </web-app>
-diff --git ../demo/src/main/webapp/admin/event/view.xhtml ../demo/src/main/webapp/admin/event/view.xhtml
+diff --git src/main/webapp/admin/event/view.xhtml src/main/webapp/admin/event/view.xhtml
 index 451479f..2d0b264 100644
---- ../demo/src/main/webapp/admin/event/view.xhtml
-+++ ../demo/src/main/webapp/admin/event/view.xhtml
+--- src/main/webapp/admin/event/view.xhtml
++++ src/main/webapp/admin/event/view.xhtml
 @@ -4,6 +4,7 @@
  	xmlns:h="http://java.sun.com/jsf/html"
  	xmlns:f="http://java.sun.com/jsf/core"
  	xmlns:ui="http://java.sun.com/jsf/facelets"
 +	xmlns:tm="http://java.sun.com/jsf/composite/tm"
  	template="/resources/scaffold/pageTemplate.xhtml">
- 
+
  	<f:metadata>
 @@ -30,7 +31,8 @@
  			<h:outputText/>
@@ -61,10 +61,10 @@ index 451479f..2d0b264 100644
  			</h:link>
  			<h:outputText/>
  			<h:outputLabel for="eventBeanEventCategory" value="Category:"/>
-diff --git ../demo/src/main/webapp/admin/index.html ../demo/src/main/webapp/admin/index.html
+diff --git src/main/webapp/admin/index.html src/main/webapp/admin/index.html
 index 902113f..4036f32 100644
---- ../demo/src/main/webapp/admin/index.html
-+++ ../demo/src/main/webapp/admin/index.html
+--- src/main/webapp/admin/index.html
++++ src/main/webapp/admin/index.html
 @@ -1,68 +1 @@
 -<!DOCTYPE html>
 -<html>
@@ -137,18 +137,18 @@ index 902113f..4036f32 100644
 \ No newline at end of file
 +<meta http-equiv="refresh" content="0;url=../faces/admin/index.xhtml" />
 \ No newline at end of file
-diff --git ../demo/src/main/webapp/admin/venue/view.xhtml ../demo/src/main/webapp/admin/venue/view.xhtml
+diff --git src/main/webapp/admin/venue/view.xhtml src/main/webapp/admin/venue/view.xhtml
 index 06edc33..1b70606 100644
---- ../demo/src/main/webapp/admin/venue/view.xhtml
-+++ ../demo/src/main/webapp/admin/venue/view.xhtml
+--- src/main/webapp/admin/venue/view.xhtml
++++ src/main/webapp/admin/venue/view.xhtml
 @@ -4,6 +4,7 @@
  	xmlns:h="http://java.sun.com/jsf/html"
  	xmlns:f="http://java.sun.com/jsf/core"
  	xmlns:ui="http://java.sun.com/jsf/facelets"
 +	xmlns:tm="http://java.sun.com/jsf/composite/tm"
  	xmlns:forgeview="http://jboss.org/forge/view"
  	template="/resources/scaffold/pageTemplate.xhtml">
- 
+
 @@ -44,7 +45,8 @@
  			<h:outputText/>
  			<h:outputLabel for="venueBeanVenueMediaItem" value="Media Item:"/>
@@ -159,12 +159,12 @@ index 06edc33..1b70606 100644
  			</h:link>
  			<h:outputText/>
  			<h:outputLabel for="venueBeanVenueDescription" value="Description:"/>
-diff --git ../demo/src/main/webapp/index.html ../demo/src/main/webapp/index.html
+diff --git src/main/webapp/index.html src/main/webapp/index.html
 index b1c9bee..834133c 100644
---- ../demo/src/main/webapp/index.html
-+++ ../demo/src/main/webapp/index.html
+--- src/main/webapp/index.html
++++ src/main/webapp/index.html
 @@ -1 +1,36 @@
--<meta http-equiv="refresh" content="0;url=./faces/index.xhtml" /> 
+-<meta http-equiv="refresh" content="0;url=./faces/index.xhtml" />
 \ No newline at end of file
 +<!DOCTYPE html>
 +<html>
@@ -203,11 +203,11 @@ index b1c9bee..834133c 100644
 +</body>
 +</html>
 \ No newline at end of file
-diff --git ../demo/src/main/webapp/resources/tm/image.xhtml ../demo/src/main/webapp/resources/tm/image.xhtml
+diff --git src/main/webapp/resources/tm/image.xhtml src/main/webapp/resources/tm/image.xhtml
 new file mode 100644
 index 0000000..d4b24ae
 --- /dev/null
-+++ ../demo/src/main/webapp/resources/tm/image.xhtml
++++ src/main/webapp/resources/tm/image.xhtml
 @@ -0,0 +1,25 @@
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 +                "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

diff --git a/demo/patches/admin_layer_graphics.patch b/demo/patches/admin_layer_graphics.patch
@@ -1,7 +1,3 @@
-:000000 100644 0000000... a1659e2... A	demo/src/main/webapp/resources/css/bootstrap-nav.css
-:000000 100644 0000000... 50294bc... A	demo/src/main/webapp/resources/css/custom-forge.css
-:100644 100644 0ceecaa... 13106f7... M	demo/src/main/webapp/resources/scaffold/pageTemplate.xhtml
-
 diff --git src/main/webapp/resources/css/bootstrap-nav.css src/main/webapp/resources/css/bootstrap-nav.css
 new file mode 100644
 index 0000000..a1659e2

diff --git a/demo/patches/admin_layer_graphics_1.0.patch b/demo/patches/admin_layer_graphics_1.0.patch
@@ -1,7 +1,3 @@
-:000000 100644 0000000... a1659e2... A	demo/src/main/webapp/resources/css/bootstrap-nav.css
-:000000 100644 0000000... 50294bc... A	demo/src/main/webapp/resources/css/custom-forge.css
-:100644 100644 0ceecaa... 13106f7... M	demo/src/main/webapp/resources/scaffold/pageTemplate.xhtml
-
 diff --git src/main/webapp/resources/css/bootstrap-nav.css src/main/webapp/resources/css/bootstrap-nav.css
 new file mode 100644
 index 0000000..a1659e2