svn commit: r1382931 - in /rave/sandbox/content-services/rave-web-hmvc/src: main/java/org/apache/rave/portal/web/mvc/config/ test/java/org/apache/rave/portal/web/mvc/config/ test/java/org/apache/rave/portal/web/mvc/config/file/

[ard]

Author: ard
Date: Mon Sep 10 15:15:16 2012
New Revision: 1382931

URL: http://svn.apache.org/viewvc?rev=1382931&view=rev
Log:
RAVE-695 move jaxb mappings test one package higher

Added:
    
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/JaxbMappingsTest.java
      - copied, changed from r1382926, 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
Removed:
    
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
Modified:
    
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java?rev=1382931&r1=1382930&r2=1382931&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java
 Mon Sep 10 15:15:16 2012
@@ -23,7 +23,6 @@ public class PageRoutesManagerImpl imple
         this.delegatee = delegatee;
     }
 
-
     @Override
     public Routes getRoutes() throws InvalidConfigurationException {
        return delegatee.getRoutes();

Copied: 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/JaxbMappingsTest.java
 (from r1382926, 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java)
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/JaxbMappingsTest.java?p2=rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/JaxbMappingsTest.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java&r1=1382926&r2=1382931&rev=1382931&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/JaxbMappingsTest.java
 Mon Sep 10 15:15:16 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.rave.portal.web.mvc.config.file;
+package org.apache.rave.portal.web.mvc.config;
 
 import java.io.InputStream;
 
@@ -25,10 +25,7 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.rave.portal.web.mvc.config.InvalidConfigurationException;
-import org.apache.rave.portal.web.mvc.config.PageDefinitions;
-import org.apache.rave.portal.web.mvc.config.PageDefinition;
-import org.apache.rave.portal.web.mvc.config.PageFragment;
+import org.apache.rave.portal.web.mvc.config.file.FilePageDefinitions;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;