Index: web/modeshape-web-jcr-rest-war/pom.xml
===================================================================
--- web/modeshape-web-jcr-rest-war/pom.xml	(revision 1772)
+++ web/modeshape-web-jcr-rest-war/pom.xml	(working copy)
@@ -67,6 +67,7 @@
 						<properties>
 							<cargo.logging>low</cargo.logging>
 							<cargo.servlet.users>dnauser:password:connect,readwrite|unauthorized:password:bogus</cargo.servlet.users>
+                                                        <cargo.servlet.port>8090</cargo.servlet.port>
 						</properties>
 					</configuration>
 					<wait>false</wait>
Index: web/modeshape-web-jcr-rest-war/src/test/java/org/modeshape/web/jcr/rest/JcrResourcesTest.java
===================================================================
--- web/modeshape-web-jcr-rest-war/src/test/java/org/modeshape/web/jcr/rest/JcrResourcesTest.java	(revision 1772)
+++ web/modeshape-web-jcr-rest-war/src/test/java/org/modeshape/web/jcr/rest/JcrResourcesTest.java	(working copy)
@@ -51,7 +51,7 @@ import org.modeshape.common.util.Base64;
 public class JcrResourcesTest {
 
     private static final String SERVER_CONTEXT = "/resources";
-    private static final String SERVER_URL = "http://localhost:8080" + SERVER_CONTEXT;
+    private static final String SERVER_URL = "http://localhost:8090" + SERVER_CONTEXT;
 
     @Before
     public void beforeEach() {
@@ -284,7 +284,7 @@ public class JcrResourcesTest {
             prefixes.add(namespace.getString(i));
         }
 
-        String[] expectedNamespaces = new String[] {"mode", "jcr", "nt", "mix", "sv", "xml", "modeint", "xmlns", "xsi", "xsd"};
+        String[] expectedNamespaces = new String[] {"mode", "jcr", "nt", "mix", "sv", "xml", "modeint", "xmlns", "xsi", "xs"};
         for (int i = 0; i < expectedNamespaces.length; i++) {
             assertTrue(prefixes.contains(expectedNamespaces[i]));
         }
Index: web/modeshape-web-jcr-webdav-war/pom.xml
===================================================================
--- web/modeshape-web-jcr-webdav-war/pom.xml	(revision 1772)
+++ web/modeshape-web-jcr-webdav-war/pom.xml	(working copy)
@@ -61,6 +61,7 @@
 						<properties>
 							<cargo.logging>low</cargo.logging>
 							<cargo.servlet.users>dnauser:password:connect,readwrite|unauthorized:password:bogus</cargo.servlet.users>
+                                                        <cargo.servlet.port>8090</cargo.servlet.port>
 						</properties>
 					</configuration>
 					<wait>false</wait>