[jjson] r65 committed - moved struts-plugin.xml from main to test resources to avoid naming co...

[jj...@googlecode.com]

Revision: 65
Author: grobmeier
Date: Thu Jul 14 05:44:38 2011
Log: moved struts-plugin.xml from main to test resources to avoid
naming conflicts
http://code.google.com/p/jjson/source/detail?r=65

Added:
/trunk/jjson-struts2/src/test/resources/struts-plugin.xml
Deleted:
/trunk/jjson-struts2/src/main/resources/struts-plugin.xml

=======================================
--- /dev/null
+++ /trunk/jjson-struts2/src/test/resources/struts-plugin.xml Thu Jul 14
05:44:38 2011
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+/*
+ * Copyright 2007 Christian Grobmeier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+ -->
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+ "http://struts.apache.org/dtds/struts-2.1.7.dtd">
+
+<struts>
+ <package name="json-default" extends="struts-default">
+ <result-types>
+ <result-type name="json"
class="de.grobmeier.json.plugins.struts2.JsonResult"/>
+ </result-types>
+ </package>
+</struts>
=======================================
--- /trunk/jjson-struts2/src/main/resources/struts-plugin.xml Fri Jul 1
03:37:44 2011
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-/*
- * Copyright 2007 Christian Grobmeier
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
- -->
-<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
- "http://struts.apache.org/dtds/struts-2.1.7.dtd">
-
-<struts>
- <package name="json-default" extends="struts-default">
- <result-types>
- <result-type name="json"
class="de.grobmeier.json.plugins.struts2.JsonResult"/>
- </result-types>
- </package>
-</struts>