Author: veithen
Date: Thu Apr 11 18:01:04 2013
New Revision: 1467015
URL: http://svn.apache.org/r1467015
Log:
Deploy the echo service using an exploded AAR instead of programmatically.
Added:
axis/axis2/java/core/trunk/modules/json/test-repository/json/services/EchoXMLService.aar/
axis/axis2/java/core/trunk/modules/json/test-repository/json/services/EchoXMLService.aar/META-INF/
axis/axis2/java/core/trunk/modules/json/test-repository/json/services/EchoXMLService.aar/META-INF/services.xml
(with props)
Modified:
axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
Added:
axis/axis2/java/core/trunk/modules/json/test-repository/json/services/EchoXMLService.aar/META-INF/services.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test-repository/json/services/EchoXMLService.aar/META-INF/services.xml?rev=1467015&view=auto
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/test-repository/json/services/EchoXMLService.aar/META-INF/services.xml
(added)
+++
axis/axis2/java/core/trunk/modules/json/test-repository/json/services/EchoXMLService.aar/META-INF/services.xml
Thu Apr 11 18:01:04 2013
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ ~ 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.
+ -->
+<service scope="application">
+ <description>Echo Service</description>
+ <parameter name="ServiceClass">org.apache.axis2.json.Echo</parameter>
+ <operation name="echoOM">
+ <messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </operation>
+</service>
\ No newline at end of file
Propchange:
axis/axis2/java/core/trunk/modules/json/test-repository/json/services/EchoXMLService.aar/META-INF/services.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=1467015&r1=1467014&r2=1467015&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 18:01:04 2013
@@ -32,10 +32,8 @@ import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.description.AxisService;
import org.apache.axis2.testutils.PortAllocator;
import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.util.Utils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -50,8 +48,6 @@ import java.net.URL;
public class JSONIntegrationTest implements JSONTestConstants {
- private static AxisService service;
-
private String expectedString;
private static SimpleHTTPServer server;
@@ -80,11 +76,6 @@ public class JSONIntegrationTest impleme
} finally {
}
- service = Utils.createSimpleService(serviceName,
-
org.apache.axis2.json.Echo.class.getName(),
- operationName);
- server.getConfigurationContext().getAxisConfiguration().addService(
- service);
}
@AfterClass
