You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/09/22 12:53:50 UTC

svn commit: r999865 - in /myfaces/gsoc/webapptest/impl/src/main: java/org/apache/myfaces/test/webapp/impl/deployment/ java/org/apache/myfaces/test/webapp/impl/resources/ resources/

Author: jakobk
Date: Wed Sep 22 10:53:50 2010
New Revision: 999865

URL: http://svn.apache.org/viewvc?rev=999865&view=rev
Log:
move default config files to resources folder

Added:
    myfaces/gsoc/webapptest/impl/src/main/resources/webapptest-default-faces-config.xml
      - copied unchanged from r999267, myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/resources/default-faces-config.xml
    myfaces/gsoc/webapptest/impl/src/main/resources/webapptest-default-web.xml
      - copied unchanged from r999267, myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/resources/default-web.xml
Removed:
    myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/resources/
Modified:
    myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/deployment/ArchiveManager.java

Modified: myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/deployment/ArchiveManager.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/deployment/ArchiveManager.java?rev=999865&r1=999864&r2=999865&view=diff
==============================================================================
--- myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/deployment/ArchiveManager.java (original)
+++ myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/deployment/ArchiveManager.java Wed Sep 22 10:53:50 2010
@@ -53,10 +53,10 @@ public class ArchiveManager
 {
 
     private static final String DEFAULT_FACES_CONFIG
-            = "/org/apache/myfaces/test/webapp/impl/resources/default-faces-config.xml";
+            = "webapptest-default-faces-config.xml";
 
     private static final String DEFAULT_WEB_XML
-            = "/org/apache/myfaces/test/webapp/impl/resources/default-web.xml";
+            = "webapptest-default-web.xml";
 
     private static final String LOCAL_MAVEN_REPO = MavenConfiguration.getLocalMavenRepo();
 
@@ -159,9 +159,10 @@ public class ArchiveManager
             archive.setWebXML(webXml.value());
         }
         else
-        {
+        {                          
             // set default
-            archive.setWebXML(getClass().getResource(DEFAULT_WEB_XML));
+            archive.setWebXML(Thread.currentThread().getContextClassLoader()
+                    .getResource(DEFAULT_WEB_XML));
         }
 
         // set the faces-config.xml file
@@ -172,8 +173,8 @@ public class ArchiveManager
         }
         else
         {
-            archive.addWebResource(getClass().getResource(DEFAULT_FACES_CONFIG),
-                    "faces-config.xml");
+            archive.addWebResource(Thread.currentThread().getContextClassLoader()
+                    .getResource(DEFAULT_FACES_CONFIG), "faces-config.xml");
         }
 
         // optionally add a beans.xml file to enable CDI