Fix no-org-delete and test.

stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
 import org.apache.amber.oauth2.common.exception.OAuthSystemException;
 import org.apache.commons.lang.NullArgumentException;
+import org.apache.usergrid.exception.NotImplementedException;
 import org.apache.usergrid.management.ActivationState;
 import org.apache.usergrid.management.OrganizationConfig;
 import org.apache.usergrid.management.OrganizationInfo;
@@ -420,4 +421,12 @@ public ApiResponse putConfig( @Context UriInfo ui, Map<String, Object> json,
         return response;
     }
 
+
+    /** Delete organization is not yet supported */
+    //@RequireSystemAccess
+    @DELETE
+    public ApiResponse deleteOrganization() throws Exception {
+        throw new NotImplementedException();
+    }
+
 }

stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java

@@ -31,6 +31,7 @@
 import org.apache.usergrid.rest.test.resource.RestClient;
 
 import javax.ws.rs.ClientErrorException;
+import javax.ws.rs.ServerErrorException;
 import javax.ws.rs.core.Form;
 import javax.ws.rs.core.Response;
 
@@ -291,18 +292,17 @@ public void testOrgPOSTForm() throws IOException {
 
     /**
      * Returns error from unimplemented delete method by trying to call the delete organization endpoint
-     * @throws IOException
      */
-    @Ignore("It should return a 501, so when this is fixed the test can be run")
     @Test
     public void noOrgDelete() throws IOException {
 
         try {
-            //Delete default organization
+            // attempt to delete default organization
             clientSetup.getRestClient().management().orgs().org( clientSetup.getOrganizationName() ).delete();
             fail( "Delete is not implemented yet" );
-        }catch(ClientErrorException uie){
-            assertEquals( Response.Status.NOT_IMPLEMENTED ,uie.getResponse().getStatus());
+
+        } catch( ServerErrorException see ){
+            assertEquals( Response.Status.NOT_IMPLEMENTED.getStatusCode(), see.getResponse().getStatus());
         }
     }