usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [12/23] incubator-usergrid git commit: Simple REST tests now working again with Tomcat embedded.
Date Wed, 25 Feb 2015 23:17:09 GMT
Simple REST tests now working again with Tomcat embedded.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d1880e6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d1880e6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d1880e6e

Branch: refs/heads/USERGRID-409
Commit: d1880e6ecfe7e2a3198dec5834e815df810fb7b1
Parents: fe5ea33
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Wed Feb 25 10:38:57 2015 -0500
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Wed Feb 25 10:38:57 2015 -0500

----------------------------------------------------------------------
 stack/pom.xml                                   |  1 +
 stack/rest/pom.xml                              |  1 -
 .../resources/usergrid-rest-deploy-context.xml  | 26 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1880e6e/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 8545e88..828ea45 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -89,6 +89,7 @@
       <ug.heapmin>2048m</ug.heapmin>
   	  <ug.argline>-Djava.awt.headless=true</ug.argline>
 
+      <usergrid-custom-spring-properties>classpath:/usergrid-deployment.properties</usergrid-custom-spring-properties>
       <usergrid-custom-spring-test-properties>classpath:/usergrid-custom-test.properties</usergrid-custom-spring-test-properties>
 
       <!-- =================================================================== -->

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1880e6e/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 3a6c0de..927b7f2 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -37,7 +37,6 @@
         <catalina.jmx.port>8089</catalina.jmx.port>
     </properties>
 
-
     <!-- profile that arquillian uses when it builds/starts tomcat -->
     <profiles>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d1880e6e/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml b/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml
new file mode 100644
index 0000000..06d5de4
--- /dev/null
+++ b/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:context="http://www.springframework.org/schema/context" xmlns:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
+	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+
+    <import resource="classpath:/usergrid-test-context.xml" />
+
+</beans>


Mime
View raw message