Added: incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml?rev=597511&view=auto ============================================================================== --- incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml (added) +++ incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml Thu Nov 22 15:23:08 2007 @@ -0,0 +1,45 @@ +<?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:jaxws="http://cxf.apache.org/jaxws"; + xsi:schemaLocation=" + http://cxf.apache.org/jaxws + http://cxf.apache.org/schemas/jaxws.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";> + + <import resource="classpath:META-INF/cxf/cxf.xml" /> + <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> + <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> + <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /> + + <jaxws:endpoint id="dlw-service-endpoint" + implementor="org.apache.cxf.javascript.fortest.SimpleDocLitWrappedImpl" + address="http://localhost:8808/SimpleDocLitWrapped"; > + </jaxws:endpoint> + + <bean id="dlw-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" > + <property name="serviceClass" value="org.apache.cxf.javascript.fortest.SimpleDocLitWrapped"/> + <property name="address" value="http://localhost:8808/SimpleDocLitWrapped"/> + </bean> + + + </beans> \ No newline at end of file
Added: incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml?rev=597511&view=auto ============================================================================== --- incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml (added) +++ incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml Thu Nov 22 15:23:08 2007 @@ -0,0 +1,46 @@ +<?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:jaxws="http://cxf.apache.org/jaxws"; + xsi:schemaLocation=" + http://cxf.apache.org/jaxws + http://cxf.apache.org/schemas/jaxws.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";> + + <import resource="classpath:META-INF/cxf/cxf.xml" /> + <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> + <import resource="classpath:META-INF/cxf/cxf-extension-xml.xml" /> + <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> + <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /> + + <jaxws:endpoint id="greeter-service-endpoint" + implementor="org.apache.hello_world_xml_http.wrapped.GreeterImpl" + address="http://localhost:8808/Greeter"; > + </jaxws:endpoint> + + <bean id="greeter-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" > + <property name="serviceClass" value="org.apache.hello_world_xml_http.wrapped.GreeterImpl"/> + <property name="address" value="http://localhost:8808/Greeter"/> + </bean> + + + </beans> \ No newline at end of file Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties?rev=597511&r1=597510&r2=597511&view=diff ============================================================================== --- incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties (original) +++ incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties Thu Nov 22 15:23:08 2007 @@ -21,7 +21,7 @@ # logging for the javascript tests handlers= java.util.logging.ConsoleHandler .level= WARNING -java.util.logging.ConsoleHandler.level = INFO +java.util.logging.ConsoleHandler.level = FINE java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter org.apache.cxf.javascript.level=FINE -org.apache.cxf.test.AbstractCXFSpringTest.level=FINE +org.apache.cxf.javascript.service.ServiceJavascriptBuilder.level=FINE Added: incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js?rev=597511&view=auto ============================================================================== --- incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js (added) +++ incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js Thu Nov 22 15:23:08 2007 @@ -0,0 +1,56 @@ +/** + * 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. + */ + +function assertionFailed(explanation) +{ + var assert = new Assert(explanation); // this will throw out in Java. +} + +var globalNotifier = null; +var globalErrorStatus = null; +var globalErrorStatusText = null; +var globalResponseObject = null; + +function test1ErrorCallback(httpStatus, httpStatusText) +{ + globalErrorStatus = httpStatus; + globalStatusText = httpStatusText; + globalNotifier.notify(); +} + +// Because there is an explicit response wrapper declared, we have a JavaScript +// object here that wraps up the simple 'string'. It is easier to validate it +// from Java, I think. +function test1SuccessCallback(responseObject) +{ + globalResponseObject = responseObject; + globalNotifier.notify(); +} + +function test1(url, doubleArg, floatArg, intArg, longArg, stringArg) +{ + globalNotifier = new org_apache_cxf_notifier(); + + var intf = new org_apache_cxf_javascript_fortest_SimpleDocLitWrapped(); + intf.url = url; + intf.basicTypeFunctionReturnString(test1SuccessCallback, test1ErrorCallback, + doubleArg, floatArg, intArg, longArg, stringArg); + // Return the notifier as a convenience to the Java code. + return globalNotifier; +} Added: incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/GreeterTests.js URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/GreeterTests.js?rev=597511&view=auto ============================================================================== --- incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/GreeterTests.js (added) +++ incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/GreeterTests.js Thu Nov 22 15:23:08 2007 @@ -0,0 +1,23 @@ +/** + * 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. + */ + +function assertionFailed(explanation) +{ + var assert = new Assert(explanation); // this will throw out in Java. +} Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/serializationTestBeans.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/serializationTestBeans.xml?rev=597511&r1=597510&r2=597511&view=diff ============================================================================== --- incubator/cxf/trunk/rt/javascript/src/test/resources/serializationTestBeans.xml (original) +++ incubator/cxf/trunk/rt/javascript/src/test/resources/serializationTestBeans.xml Thu Nov 22 15:23:08 2007 @@ -31,8 +31,8 @@ <import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" /> <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" /> - <!-- We use a client for the service for basic tests. We don't need a server at all. --> - <bean id="simple-dlwu-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" > +<!-- We use a client for the service for basic tests. We don't need a server at all. --> + <bean id="simple-dlwu-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" > <property name="serviceClass" value="org.apache.cxf.javascript.fortest.SimpleDocLitWrapped"/> <property name="address" value="local://SimpleDocLitWrappedUnqualified"/> </bean> Modified: incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java?rev=597511&r1=597510&r2=597511&view=diff ============================================================================== --- incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java (original) +++ incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java Thu Nov 22 15:23:08 2007 @@ -326,14 +326,16 @@ MessageInfo messageInfo = null; operationInfo = ii.addOperation(RMConstants.getCreateSequenceOperationName()); - messageInfo = operationInfo.createMessage(RMConstants.getCreateSequenceOperationName()); + messageInfo = operationInfo.createMessage(RMConstants.getCreateSequenceOperationName(), + MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); partInfo = messageInfo.addMessagePart(CREATE_PART_NAME); partInfo.setElementQName(RMConstants.getCreateSequenceOperationName()); partInfo.setElement(true); partInfo.setTypeClass(CreateSequenceType.class); - messageInfo = operationInfo.createMessage(RMConstants.getCreateSequenceResponseOperationName()); + messageInfo = operationInfo.createMessage(RMConstants.getCreateSequenceResponseOperationName(), + MessageInfo.Type.OUTPUT); operationInfo.setOutput(messageInfo.getName().getLocalPart(), messageInfo); partInfo = messageInfo.addMessagePart(CREATE_RESPONSE_PART_NAME); partInfo.setElementQName(RMConstants.getCreateSequenceResponseOperationName()); @@ -342,7 +344,8 @@ partInfo.setIndex(0); operationInfo = ii.addOperation(RMConstants.getCreateSequenceOnewayOperationName()); - messageInfo = operationInfo.createMessage(RMConstants.getCreateSequenceOperationName()); + messageInfo = operationInfo.createMessage(RMConstants.getCreateSequenceOperationName(), + MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); partInfo = messageInfo.addMessagePart(CREATE_PART_NAME); partInfo.setElementQName(RMConstants.getCreateSequenceOperationName()); @@ -350,7 +353,8 @@ partInfo.setTypeClass(CreateSequenceType.class); operationInfo = ii.addOperation(RMConstants.getCreateSequenceResponseOnewayOperationName()); - messageInfo = operationInfo.createMessage(RMConstants.getCreateSequenceResponseOperationName()); + messageInfo = operationInfo.createMessage(RMConstants.getCreateSequenceResponseOperationName(), + MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); partInfo = messageInfo.addMessagePart(CREATE_RESPONSE_PART_NAME); partInfo.setElementQName(RMConstants.getCreateSequenceResponseOperationName()); @@ -365,7 +369,8 @@ MessageInfo messageInfo = null; operationInfo = ii.addOperation(RMConstants.getTerminateSequenceOperationName()); - messageInfo = operationInfo.createMessage(RMConstants.getTerminateSequenceOperationName()); + messageInfo = operationInfo.createMessage(RMConstants.getTerminateSequenceOperationName(), + MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); partInfo = messageInfo.addMessagePart(TERMINATE_PART_NAME); partInfo.setElementQName(RMConstants.getTerminateSequenceOperationName()); @@ -379,7 +384,8 @@ MessageInfo messageInfo = null; operationInfo = ii.addOperation(RMConstants.getSequenceAckOperationName()); - messageInfo = operationInfo.createMessage(RMConstants.getSequenceAckOperationName()); + messageInfo = operationInfo.createMessage(RMConstants.getSequenceAckOperationName(), + MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); } @@ -389,7 +395,8 @@ MessageInfo messageInfo = null; operationInfo = ii.addOperation(RMConstants.getLastMessageOperationName()); - messageInfo = operationInfo.createMessage(RMConstants.getLastMessageOperationName()); + messageInfo = operationInfo.createMessage(RMConstants.getLastMessageOperationName(), + MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); } @@ -399,7 +406,8 @@ MessageInfo messageInfo = null; operationInfo = ii.addOperation(RMConstants.getAckRequestedOperationName()); - messageInfo = operationInfo.createMessage(RMConstants.getAckRequestedOperationName()); + messageInfo = operationInfo.createMessage(RMConstants.getAckRequestedOperationName(), + MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); } Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java?rev=597511&r1=597510&r2=597511&view=diff ============================================================================== --- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java (original) +++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java Thu Nov 22 15:23:08 2007 @@ -53,7 +53,8 @@ public void testMapOneWayOperation() throws Exception { OperationInfo operation = getOperation(); - MessageInfo inputMessage = operation.createMessage(new QName("urn:test:ns", "testInputMessage")); + MessageInfo inputMessage = operation.createMessage(new QName("urn:test:ns", "testInputMessage"), + MessageInfo.Type.INPUT); operation.setInput("input", inputMessage); JavaMethod method = new MethodMapper().map(operation);
