Index: web/modeshape-web-jcr-rest/pom.xml
===================================================================
--- web/modeshape-web-jcr-rest/pom.xml	(revision 2488)
+++ web/modeshape-web-jcr-rest/pom.xml	(working copy)
@@ -18,6 +18,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.modeshape</groupId>
+            <artifactId>modeshape-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
             <version>1.2.1.GA</version>
Index: web/modeshape-web-jcr/pom.xml
===================================================================
--- web/modeshape-web-jcr/pom.xml	(revision 2488)
+++ web/modeshape-web-jcr/pom.xml	(working copy)
@@ -17,11 +17,6 @@
 			<artifactId>modeshape-jcr-api</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.modeshape</groupId>
-			<artifactId>modeshape-graph</artifactId>
-		</dependency>
-
 		<!-- 
       Java Content Repository API 
     -->
@@ -30,6 +25,14 @@
 			<artifactId>jcr</artifactId>
 		</dependency>
 
+	    <!-- 
+	    Java Concurrency in Practice annotations
+	    -->
+	    <dependency>
+	      <groupId>net.jcip</groupId>
+	      <artifactId>jcip-annotations</artifactId>
+	    </dependency>
+
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
Index: web/modeshape-web-jcr/src/main/java/org/modeshape/web/jcr/RepositoryFactory.java
===================================================================
--- web/modeshape-web-jcr/src/main/java/org/modeshape/web/jcr/RepositoryFactory.java	(revision 2488)
+++ web/modeshape-web-jcr/src/main/java/org/modeshape/web/jcr/RepositoryFactory.java	(working copy)
@@ -29,7 +29,6 @@ import javax.jcr.Session;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import net.jcip.annotations.ThreadSafe;
-import org.modeshape.common.util.CheckArg;
 import org.modeshape.web.jcr.spi.RepositoryProvider;
 
 /**
@@ -70,7 +69,10 @@ public class RepositoryFactory {
      * @see RepositoryFactory
      */
     static void initialize( ServletContext context ) {
-        CheckArg.isNotNull(context, "context");
+        if (context == null) {
+            throw new IllegalArgumentException("The \"context\" parameter may not be null");
+        }
+
         String className = context.getInitParameter(PROVIDER_KEY);
 
         try {
Index: web/modeshape-web-jcr/src/main/java/org/modeshape/web/jcr/ServletSecurityContext.java
===================================================================
--- web/modeshape-web-jcr/src/main/java/org/modeshape/web/jcr/ServletSecurityContext.java	(revision 2488)
+++ web/modeshape-web-jcr/src/main/java/org/modeshape/web/jcr/ServletSecurityContext.java	(working copy)
@@ -24,7 +24,6 @@
 package org.modeshape.web.jcr;
 
 import javax.servlet.http.HttpServletRequest;
-import org.modeshape.common.util.CheckArg;
 import org.modeshape.jcr.api.SecurityContext;
 
 /**
@@ -46,7 +45,10 @@ public class ServletSecurityContext implements SecurityContext {
      * @param request the servlet request; may not be null
      */
     public ServletSecurityContext( HttpServletRequest request ) {
-        CheckArg.isNotNull(request, "request");
+        if (request == null) {
+            throw new IllegalArgumentException("The \"request\" parameter may not be null");
+        }
+
         this.request = request;
         this.userName = request.getUserPrincipal() != null ? request.getUserPrincipal().getName() : null;
     }