From eac95add9829a5ae610c7bb3bc41fd43f1d7a462 Mon Sep 17 00:00:00 2001
From: "Roger G. Coram" <roger.coram@bl.uk>
Date: Fri, 23 Jan 2015 10:44:26 +0000
Subject: [PATCH 1/3] Moved SWFReplayRenderer to external file.

---
 src/site/xdoc/release_notes.xml               |  1 +
 .../main/webapp/WEB-INF/ArchivalUrlReplay.xml | 18 +++-------------
 .../main/webapp/WEB-INF/SWFReplayRenderer.xml | 21 +++++++++++++++++++
 3 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 wayback-webapp/src/main/webapp/WEB-INF/SWFReplayRenderer.xml

diff --git a/src/site/xdoc/release_notes.xml b/src/site/xdoc/release_notes.xml
index beb317a36c..f1a7dbf01c 100644
--- a/src/site/xdoc/release_notes.xml
+++ b/src/site/xdoc/release_notes.xml
@@ -27,6 +27,7 @@
           <li>Fixed building with JDK 8. <a href="https://github.com/iipc/openwayback/pull/141">#141</a></li>
           <li>Removed direct references to Unix spesific TMP paths /tmp and /var/tmp. <a href="https://github.com/iipc/openwayback/issues/172">#172</a></li>
           <li>Initial thread-safety fix for Memento from Luda. <a href="https://github.com/iipc/openwayback/issues/180">#180</a></li>
+          <li>Moved 'SWFReplayRenderer' to external file; imported to maintain functionality. <a href="https://github.com/iipc/openwayback/issues/176">#176</a></li>
         </ul>
       </subsection>
     </section>
diff --git a/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml b/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml
index 7f139cee07..c44c9594f4 100644
--- a/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml
+++ b/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml
@@ -150,21 +150,9 @@
           </property>
           <property name="renderer" ref="archivalsaxreplayrenderer"/>
         </bean>
-        
-        <!-- SWF Rewriting, highly experimental -->
-        <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">
-          <property name="mimeContains">
-            <list>
-              <value>application/x-shockwave-flash</value>
-            </list>
-          </property>
-          <property name="renderer">
-            <bean class="org.archive.wayback.replay.swf.SWFReplayRenderer">
- 	          <constructor-arg><ref bean="archivalurlhttpheaderprocessor"/></constructor-arg>
-            </bean>
-          </property>
-        </bean>
 
+        <import resource="SWFReplayRenderer.xml"/>
+        
         <!-- CSS REPLAY -->
         <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">
           <property name="mimeContains">
@@ -257,4 +245,4 @@
   </bean>
   
   
-</beans>
\ No newline at end of file
+</beans>
diff --git a/wayback-webapp/src/main/webapp/WEB-INF/SWFReplayRenderer.xml b/wayback-webapp/src/main/webapp/WEB-INF/SWFReplayRenderer.xml
new file mode 100644
index 0000000000..dc6d9338d5
--- /dev/null
+++ b/wayback-webapp/src/main/webapp/WEB-INF/SWFReplayRenderer.xml
@@ -0,0 +1,21 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+        default-init-method="init">
+
+    <!-- SWF Rewriting, highly experimental -->
+    <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">
+      <property name="mimeContains">
+        <list>
+          <value>application/x-shockwave-flash</value>
+        </list>
+      </property>
+      <property name="renderer">
+        <bean class="org.archive.wayback.replay.swf.SWFReplayRenderer">
+          <constructor-arg><ref bean="archivalurlhttpheaderprocessor"/></constructor-arg>
+        </bean>
+      </property>
+    </bean>
+</beans>
+

From 33f4bc44506ee5f160fd30c399baa02d1a79ba83 Mon Sep 17 00:00:00 2001
From: "Roger G. Coram" <roger.coram@bl.uk>
Date: Tue, 21 Apr 2015 11:07:33 +0100
Subject: [PATCH 2/3] Fixed import issue.

---
 .../src/main/webapp/WEB-INF/ArchivalUrlReplay.xml           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml b/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml
index c44c9594f4..bbc1d737a6 100644
--- a/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml
+++ b/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml
@@ -96,6 +96,9 @@
     <property name="delegator" ref="fastArchivalSAXDelegator"/>
   </bean>
 
+  <!-- SWF Rewriting, highly experimental -->
+  <import resource="SWFReplayRenderer.xml"/>
+
 <!-- 
 	The main Archival URL replay dispatcher. It uses a list of Selectors to
 	determine which ReplayRenderer should be used for each document.
@@ -151,7 +154,8 @@
           <property name="renderer" ref="archivalsaxreplayrenderer"/>
         </bean>
 
-        <import resource="SWFReplayRenderer.xml"/>
+        <!-- SWF Rewriting, highly experimental -->
+        <ref bean="swfreplay" />
         
         <!-- CSS REPLAY -->
         <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">

From a20a5ef740e80638a9fe729649cf58ce7483ee73 Mon Sep 17 00:00:00 2001
From: "Roger G. Coram" <roger.coram@bl.uk>
Date: Tue, 21 Apr 2015 12:19:35 +0100
Subject: [PATCH 3/3] Added 'id'.

---
 wayback-webapp/src/main/webapp/WEB-INF/SWFReplayRenderer.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wayback-webapp/src/main/webapp/WEB-INF/SWFReplayRenderer.xml b/wayback-webapp/src/main/webapp/WEB-INF/SWFReplayRenderer.xml
index dc6d9338d5..d7c7588655 100644
--- a/wayback-webapp/src/main/webapp/WEB-INF/SWFReplayRenderer.xml
+++ b/wayback-webapp/src/main/webapp/WEB-INF/SWFReplayRenderer.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -5,7 +6,7 @@
         default-init-method="init">
 
     <!-- SWF Rewriting, highly experimental -->
-    <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">
+    <bean id="swfreplay" class="org.archive.wayback.replay.selector.MimeTypeSelector">
       <property name="mimeContains">
         <list>
           <value>application/x-shockwave-flash</value>