You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by mm...@apache.org on 2006/11/14 13:15:59 UTC
svn commit: r474758 - in /incubator/cxf/trunk: rt/frontend/jaxws/ systests/
systests/src/test/java/org/apache/cxf/systest/js/
systests/src/test/java/org/apache/cxf/systest/js/resources/
Author: mmao
Date: Tue Nov 14 04:15:58 2006
New Revision: 474758
URL: http://svn.apache.org/viewvc?view=rev&rev=474758
Log:
CXF-182
Port js front end system tests from celtix/pre_apache.
* exclude the js/rhino from jaxws frontend which introduced by the httpunit test,
the httpunit test will use rhino 1.5 which will fail the js system tests which use the 1.6
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/
- copied from r474704, incubator/cxf/tags/celtix/pre_apache/systests/src/test/java/org/objectweb/celtix/systest/js/
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
incubator/cxf/trunk/systests/pom.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.js
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx
Modified: incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/pom.xml?view=diff&rev=474758&r1=474757&r2=474758
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Tue Nov 14 04:15:58 2006
@@ -46,6 +46,12 @@
<artifactId>httpunit</artifactId>
<version>1.6.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jtidy</groupId>
Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?view=diff&rev=474758&r1=474757&r2=474758
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Tue Nov 14 04:15:58 2006
@@ -98,6 +98,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-js</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${project.version}</version>
</dependency>
@@ -185,6 +190,19 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>1.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java?view=diff&rev=474758&r1=474704&r2=474758
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java Tue Nov 14 04:15:58 2006
@@ -1,23 +1,44 @@
-package org.objectweb.celtix.systest.js;
+/**
+ * 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.
+ */
+
+package org.apache.cxf.systest.js;
import java.lang.reflect.UndeclaredThrowableException;
import java.net.URL;
+
import javax.xml.namespace.QName;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.objectweb.celtix.systest.common.ClientServerSetupBase;
-import org.objectweb.celtix.systest.common.ClientServerTestBase;
+import org.apache.cxf.systest.common.ClientServerSetupBase;
+import org.apache.cxf.systest.common.ClientServerTestBase;
+import org.apache.hello_world_soap_http.Greeter;
+import org.apache.hello_world_soap_http.SOAPService;
+import org.apache.hello_world_soap_http.SOAPServiceTest1;
-import org.objectweb.hello_world_soap_http.Greeter;
-import org.objectweb.hello_world_soap_http.SOAPService;
-import org.objectweb.hello_world_soap_http.SOAPServiceTest1;
-public class JSClientServerTest extends ClientServerTestBase {
- private static final String NS = "http://objectweb.org/hello_world_soap_http";
+public class JSClientServerTest extends ClientServerTestBase {
+ private static final String NS = "http://apache.org/hello_world_soap_http";
+
public static Test suite() throws Exception {
TestSuite suite = new TestSuite(JSClientServerTest.class);
return new ClientServerSetupBase(suite) {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java?view=diff&rev=474758&r1=474704&r2=474758
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java Tue Nov 14 04:15:58 2006
@@ -1,16 +1,35 @@
-package org.objectweb.celtix.systest.js;
+/**
+ * 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.
+ */
-import java.io.File;
+package org.apache.cxf.systest.js;
-import org.objectweb.celtix.js.rhino.ProviderFactory;
+import java.io.File;
-import org.objectweb.celtix.systest.common.TestServerBase;
+import org.apache.cxf.js.rhino.ProviderFactory;
+import org.apache.cxf.systest.common.TestServerBase;
public class Server extends TestServerBase {
protected void run() {
- try {
- ProviderFactory pf = new ProviderFactory();
+
+ try {
+ ProviderFactory pf = new ProviderFactory();
String f = getClass().getResource("resources/hello_world.js").getFile();
pf.createAndPublish(new File(f), "http://localhost:9000/SoapContext/SoapPort", false);
f = getClass().getResource("resources/hello_world.jsx").getFile();
@@ -22,6 +41,7 @@
public static void main(String[] args) {
try {
+ System.err.println("Server main");
Server s = new Server();
s.start();
} catch (Exception ex) {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.js
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.js?view=diff&rev=474758&r1=474704&r2=474758
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.js (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.js Tue Nov 14 04:15:58 2006
@@ -1,13 +1,32 @@
+/**
+ * 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.
+ */
+
var WebServiceProvider = {
'wsdlLocation': 'file:../testutils/target/classes/wsdl/hello_world.wsdl',
'serviceName': 'SOAPService',
'portName': 'SoapPort',
- 'targetNamespace': 'http://objectweb.org/hello_world_soap_http',
+ 'targetNamespace': 'http://apache.org/hello_world_soap_http',
'ServiceMode': 'MESSAGE',
};
var SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
-var ns4 = "http://objectweb.org/hello_world_soap_http/types";
+var ns4 = "http://apache.org/hello_world_soap_http/types";
WebServiceProvider.invoke = function(req) {
var resp = req.getImplementation().createDocument(SOAP_ENV, "SOAP-ENV:Envelope", null);
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx?view=diff&rev=474758&r1=474704&r2=474758
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/resources/hello_world.jsx Tue Nov 14 04:15:58 2006
@@ -1,11 +1,30 @@
+/**
+ * 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.
+ */
+
var WebServiceProvider = {
'wsdlLocation': 'file:../testutils/target/classes/wsdl/hello_world.wsdl',
'serviceName': 'SOAPServiceTest1',
'portName': 'SoapPort_Test1',
- 'targetNamespace': 'http://objectweb.org/hello_world_soap_http',
+ 'targetNamespace': 'http://apache.org/hello_world_soap_http',
};
-var ns = new Namespace('ns', "http://objectweb.org/hello_world_soap_http/types");
+var ns = new Namespace('ns', "http://apache.org/hello_world_soap_http/types");
WebServiceProvider.invoke = function(req) {
default xml namespace = ns;