From 90d84d2a79e980842820db8c872df4333e6ac8d8 Mon Sep 17 00:00:00 2001
From: Vhati <tvtronix@yahoo.com>
Date: Sat, 7 Sep 2013 01:58:23 -0400
Subject: [PATCH] Updated the wrapper during strict mod validation to declare
 namespaces for the advanced modding tags

---
 src/main/java/net/vhati/modmanager/core/ModUtilities.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/vhati/modmanager/core/ModUtilities.java b/src/main/java/net/vhati/modmanager/core/ModUtilities.java
index 4f73c2c..c1bb6f2 100644
--- a/src/main/java/net/vhati/modmanager/core/ModUtilities.java
+++ b/src/main/java/net/vhati/modmanager/core/ModUtilities.java
@@ -571,13 +571,15 @@ public class ModUtilities {
 		Matcher m;
 
 		// Wrap everything in a root tag, while mindful of the xml declaration.
-		Pattern xmlDeclPtn = Pattern.compile( "<[?]xml version=\"1.0\" encoding=\"[^\"]+?\"[?]>" );
+		String wrapperSTag = "<wrapper xmlns:mod='mod' xmlns:mod-append='mod-append' xmlns:mod-overwrite='mod-overwrite'>";
+
+		Pattern xmlDeclPtn = Pattern.compile( "<[?]xml [^>]*?[?]>\n*" );
 		m = xmlDeclPtn.matcher( srcBuf );
 		boolean foundTopDecl = false;
 		while ( m.find() ) {
 			if ( m.start() == 0 ) {
 				foundTopDecl = true;
-				m.appendReplacement( dstBuf, "$0\n<wrapper>\n" );
+				m.appendReplacement( dstBuf, "$0\n"+ Matcher.quoteReplacement( wrapperSTag ) );
 			}
 			else {
 				messages.add( new ReportMessage(
@@ -591,7 +593,7 @@ public class ModUtilities {
 		dstBuf.append( "\n</wrapper>" );
 
 		if ( !foundTopDecl )
-			dstBuf.insert( 0, "<wrapper>\n" );
+			dstBuf.insert( 0, Matcher.quoteReplacement( wrapperSTag ) );
 
 		tmpBuf = srcBuf; srcBuf = dstBuf; dstBuf = tmpBuf; dstBuf.setLength(0);