Projects >> prettyfaces >>771ead106e189111ecaf37f966283f6b119e3825

Chunk
Conflicting content 
               .addClass(PrettyNavigationHandler.class)
               .addClass(AmbiguousBean.class)
               .addResource("basic/ambiguousViewId.xhtml", "index.xhtml")
<<<<<<< HEAD
               .addWebResource("basic/ambiguous-pretty-config.xml", "pretty-config.xml");

      System.out.println(deployment.toString(true));

      return deployment;
=======
               .addWebResource("basic/ambiguous-pretty-config.xml", "pretty-config.xml")
               .addWebResource("faces-config.xml")
               .addLibrary(MavenArtifactResolver.resolve(

                        "com.ocpsoft:prettyfaces-jsf2:3.3.1-SNAPSHOT"))
               .setWebXML("jsf-web.xml");
>>>>>>> 833c3e00011456c3de3ac4ccf6fa0a72cacab890
   }
   @Test
Solution content 
               .addClass(PrettyNavigationHandler.class)
               .addClass(AmbiguousBean.class)
               .addResource("basic/ambiguousViewId.xhtml", "index.xhtml")
               .addWebResource("basic/ambiguous-pretty-config.xml", "pretty-config.xml");

      return deployment;
   }

   @Test
File
AmbiguousViewidTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
   {
      return PrettyFacesTestBase.createDeployment()
               .addResource("basic/index.xhtml", "index.xhtml")
<<<<<<< HEAD
               .addWebResource("pretty-config.xml");
=======
               .addWebResource("faces-config.xml")
               .addWebResource("pretty-config.xml")
               .addLibrary(MavenArtifactResolver.resolve(
                        "com.ocpsoft:prettyfaces-jsf2:3.3.1-SNAPSHOT"))
               .setWebXML("jsf-web.xml");
>>>>>>> 833c3e00011456c3de3ac4ccf6fa0a72cacab890
   }

   @Test
Solution content 
   {
      return PrettyFacesTestBase.createDeployment()
               .addResource("basic/index.xhtml", "index.xhtml")
               .addWebResource("pretty-config.xml");
   }

   @Test
File
PathParametersTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
   {
      return PrettyFacesTestBase.createDeployment()
               .addResource("basic/index.xhtml", "index.xhtml")
<<<<<<< HEAD
               .addWebResource("pretty-config.xml");
=======
               .addWebResource("faces-config.xml")
               .addWebResource("pretty-config.xml")
               .addLibrary(MavenArtifactResolver.resolve(
                        "com.ocpsoft:prettyfaces-jsf2:3.3.1-SNAPSHOT"))
               .setWebXML("jsf-web.xml");
>>>>>>> 833c3e00011456c3de3ac4ccf6fa0a72cacab890
   }

   @Test
Solution content 
   {
      return PrettyFacesTestBase.createDeployment()
               .addResource("basic/index.xhtml", "index.xhtml")
               .addWebResource("pretty-config.xml");
   }

   @Test
File
PrettyContextTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
               .addClass(EncodingBean.class)
               .addResource("encoding/encoding.xhtml", "encoding.xhtml")
               .addWebResource("encoding/encoding-pretty-config.xml", "pretty-config.xml")
<<<<<<< HEAD
               .addWebResource("faces-config.xml");
=======
               .addWebResource("faces-config.xml")
               .addLibrary(MavenArtifactResolver.resolve(
                        "com.ocpsoft:prettyfaces-jsf2:3.3.1-SNAPSHOT"))
               .setWebXML("jsf-web.xml");
>>>>>>> 833c3e00011456c3de3ac4ccf6fa0a72cacab890
   }

   /**
Solution content 
               .addClass(EncodingBean.class)
               .addResource("encoding/encoding.xhtml", "encoding.xhtml")
               .addWebResource("encoding/encoding-pretty-config.xml", "pretty-config.xml")
               .addWebResource("faces-config.xml");
   }

   /**
File
URLEncodingTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
   {
      return PrettyFacesTestBase.createDeployment()
               .addResource("loop/loop.xhtml", "loop.xhtml")
<<<<<<< HEAD
               .addWebResource("loop/loop-pretty-config.xml", "pretty-config.xml");
=======
               .addWebResource("loop/loop-pretty-config.xml", "pretty-config.xml")
               .addLibrary(MavenArtifactResolver.resolve(
                        "com.ocpsoft:prettyfaces-jsf2:3.3.1-SNAPSHOT"))
               .setWebXML("jsf-web.xml");
>>>>>>> 833c3e00011456c3de3ac4ccf6fa0a72cacab890
   }

   @Test
Solution content 
   {
      return PrettyFacesTestBase.createDeployment()
               .addResource("loop/loop.xhtml", "loop.xhtml")
               .addWebResource("loop/loop-pretty-config.xml", "pretty-config.xml");
   }

   @Test
File
InfiniteLoopTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
      return PrettyFacesTestBase.createDeployment()
               .addClass(RedirectBean.class)
               .addResource("redirect/redirect.xhtml", "redirect.xhtml")
<<<<<<< HEAD
               .addWebResource("redirect/redirect-pretty-config.xml", "pretty-config.xml");
=======
               .addWebResource("redirect/redirect-pretty-config.xml", "pretty-config.xml")
               .addWebResource("faces-config.xml")
               .addLibrary(MavenArtifactResolver.resolve(
                        "com.ocpsoft:prettyfaces-jsf2:3.3.1-SNAPSHOT"))
               .setWebXML("jsf-web.xml");
>>>>>>> 833c3e00011456c3de3ac4ccf6fa0a72cacab890
   }

   @Test
Solution content 
      return PrettyFacesTestBase.createDeployment()
               .addClass(RedirectBean.class)
               .addResource("redirect/redirect.xhtml", "redirect.xhtml")
               .addWebResource("redirect/redirect-pretty-config.xml", "pretty-config.xml");
   }

   @Test
File
URLRedirectTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation