svn commit: r1466998 - in /axis/axis2/java/core/trunk/modules/json: test-conf/ test-repository/gson/ test-repository/gson/services/ test-repository/gson/services/JSONPOJOService.aar/ test-repository/json/ test-repository/json/services/ test-repository/...

[veithen]

Author: veithen
Date: Thu Apr 11 17:44:08 2013
New Revision: 1466998

URL: http://svn.apache.org/r1466998
Log:
AXIS2-5417:
* Use two different test repositories (because they use two mutually 
incompatible Axis2 configurations).
* Also move the axis2.xml files into the repositories to make it easier to 
understand which configuration belongs to which repository.

Added:
    axis/axis2/java/core/trunk/modules/json/test-repository/gson/
    axis/axis2/java/core/trunk/modules/json/test-repository/gson/axis2.xml
      - copied unchanged from r1466965, 
axis/axis2/java/core/trunk/modules/json/test-conf/axis2_json.xml
    axis/axis2/java/core/trunk/modules/json/test-repository/gson/services/
    
axis/axis2/java/core/trunk/modules/json/test-repository/gson/services/JSONPOJOService.aar/
      - copied from r1466965, 
axis/axis2/java/core/trunk/modules/json/test-repository/services/JSONPOJOService.aar/
    axis/axis2/java/core/trunk/modules/json/test-repository/json/
    axis/axis2/java/core/trunk/modules/json/test-repository/json/axis2.xml
      - copied unchanged from r1466965, 
axis/axis2/java/core/trunk/modules/json/test-resources/axis2.xml
    axis/axis2/java/core/trunk/modules/json/test-repository/json/services/
    
axis/axis2/java/core/trunk/modules/json/test-repository/json/services/POJOService.aar/
      - copied from r1466965, 
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/
Removed:
    axis/axis2/java/core/trunk/modules/json/test-conf/
    axis/axis2/java/core/trunk/modules/json/test-repository/services/
    axis/axis2/java/core/trunk/modules/json/test-resources/axis2.xml
Modified:
    
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
    
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java
    
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/rpc/JSONRPCIntegrationTest.java

Modified: 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java?rev=1466998&r1=1466997&r2=1466998&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
 Thu Apr 11 17:44:08 2013
@@ -70,9 +70,9 @@ public class JSONIntegrationTest impleme
         pojoUri = "http://127.0.0.1:"; + testingPort + 
"/axis2/services/POJOService";
 
         File configFile =
-                new File(System.getProperty("basedir", ".") + 
"/test-resources/axis2.xml");
+                new File(System.getProperty("basedir", ".") + 
"/test-repository/json/axis2.xml");
         configurationContext = 
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
-                System.getProperty("basedir", ".") + "/test-repository",
+                System.getProperty("basedir", ".") + "/test-repository/json",
                 configFile.getAbsolutePath());
         server = new SimpleHTTPServer(configurationContext, testingPort);
         try {

Modified: 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java?rev=1466998&r1=1466997&r2=1466998&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/JSONXMLStreamAPITest.java
 Thu Apr 11 17:44:08 2013
@@ -36,9 +36,7 @@ public class JSONXMLStreamAPITest {
 
     @Before
     public void setUp()throws Exception {
-        String baseDir = System.getProperty("basedir" , ".").toString();
-//        UtilServer.start((baseDir + "target/repo"), (baseDir + 
"test-resources/json/conf/axis2_json.xml"));
-        UtilServer.start("target/repo", "test-conf/axis2_json.xml");
+        UtilServer.start("target/repo", "test-repository/gson/axis2.xml");
 
     }
 

Modified: 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/rpc/JSONRPCIntegrationTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/rpc/JSONRPCIntegrationTest.java?rev=1466998&r1=1466997&r2=1466998&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/rpc/JSONRPCIntegrationTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/rpc/JSONRPCIntegrationTest.java
 Thu Apr 11 17:44:08 2013
@@ -32,7 +32,7 @@ public class JSONRPCIntegrationTest {
 
     @BeforeClass
     public static void startTestServer() throws Exception {
-        UtilServer.start("test-repository", "test-conf/axis2_json.xml");
+        UtilServer.start("test-repository/gson", 
"test-repository/gson/axis2.xml");
     }
 
     @AfterClass