You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/01/04 16:47:53 UTC
svn commit: r608894 [4/10] - in /incubator/cxf/trunk: ./
buildtools/src/main/resources/
common/schemas/src/main/resources/schemas/wsdl/ etc/eclipse/
maven-plugins/corba/ parent/ rt/bindings/corba/
rt/bindings/corba/src/main/java/org/apache/yoko/binding...
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParams.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParams.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParams.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParams.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturn.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturn.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturn.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturn.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturnResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturnResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturnResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturnResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParams.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParams.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParams.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParams.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturn.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturn.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturn.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturn.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturnResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturnResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturnResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturnResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturn.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturn.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturn.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturn.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturnResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturnResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturnResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturnResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParam.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParam.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParam.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParam.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturn.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturn.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturn.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturn.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturnResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturnResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturnResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturnResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParam.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParam.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParam.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParam.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturn.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturn.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturn.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturn.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturnResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturnResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturnResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturnResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParam.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParam.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParam.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParam.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturn.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturn.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturn.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturn.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturnResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturnResponse.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturnResponse.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturnResponse.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/package-info.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/package-info.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/package-info.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/package-info.java Fri Jan 4 07:47:28 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.apache.org/yoko/idl/ParamModes")
package org.apache.schemas.yoko.idl.parammodes;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/AbstractIdlToWsdlTypeTestClient.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/AbstractIdlToWsdlTypeTestClient.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/AbstractIdlToWsdlTypeTestClient.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/AbstractIdlToWsdlTypeTestClient.java Fri Jan 4 07:47:28 2008
@@ -26,17 +26,21 @@
import junit.framework.TestCase;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTest;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestBuildingAddress6T;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestBuildingT;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestEnum1;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestEnumSet;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestOctetTwo;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestRecursiveStruct;
-import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTest1RecursiveStruct;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestAnon1RecursiveStruct;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestRecursiveUnion;
-import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTest1RecursiveUnion;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestAnon1RecursiveUnion;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestSeqLong;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStringSet;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStruct1;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStruct2;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStructSet;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStructWithSeq;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestUnion1;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestUnion2;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestUnionSet;
@@ -50,14 +54,14 @@
AbstractIdlToWsdlTypeTestClient(String name) {
super(name);
}
-
+
public void testGreetMe() {
String name = new String("Partner");
String ret = client.greetMe(name);
String expected = "Hallo there " + name;
assertTrue(ret.equals(expected));
}
-
+
////
// base_type
public void testAlias() throws Exception {
@@ -944,31 +948,31 @@
// Recursive struct with no children
IdltowsdlTypeTestRecursiveStruct rStructNoChild1 = new IdltowsdlTypeTestRecursiveStruct();
rStructNoChild1.setName("RecursiveStruct1");
- rStructNoChild1.setChildren(new IdltowsdlTypeTest1RecursiveStruct());
+ rStructNoChild1.setChildren(new IdltowsdlTypeTestAnon1RecursiveStruct());
// Recursive struct with no children
IdltowsdlTypeTestRecursiveStruct rStructNoChild2 = new IdltowsdlTypeTestRecursiveStruct();
rStructNoChild2.setName("RecursiveStruct2");
- rStructNoChild2.setChildren(new IdltowsdlTypeTest1RecursiveStruct());
+ rStructNoChild2.setChildren(new IdltowsdlTypeTestAnon1RecursiveStruct());
// Recursive struct with no children
IdltowsdlTypeTestRecursiveStruct rStructNoChild3 = new IdltowsdlTypeTestRecursiveStruct();
rStructNoChild3.setName("RecursiveStruct3");
- rStructNoChild3.setChildren(new IdltowsdlTypeTest1RecursiveStruct());
+ rStructNoChild3.setChildren(new IdltowsdlTypeTestAnon1RecursiveStruct());
// Recursive struct with a single recursive child
IdltowsdlTypeTestRecursiveStruct rStructSingleChild = new IdltowsdlTypeTestRecursiveStruct();
rStructSingleChild.setName("RecursiveStructSingleChild");
- IdltowsdlTypeTest1RecursiveStruct rStructSingleChildChildren =
- new IdltowsdlTypeTest1RecursiveStruct();
+ IdltowsdlTypeTestAnon1RecursiveStruct rStructSingleChildChildren =
+ new IdltowsdlTypeTestAnon1RecursiveStruct();
rStructSingleChildChildren.getItem().add(rStructNoChild1);
rStructSingleChild.setChildren(rStructSingleChildChildren);
// Recursive struct with two recursive children
IdltowsdlTypeTestRecursiveStruct rStructDoubleChild = new IdltowsdlTypeTestRecursiveStruct();
rStructDoubleChild.setName("RecursiveStructDoubleChild");
- IdltowsdlTypeTest1RecursiveStruct rStructDoubleChildChildren =
- new IdltowsdlTypeTest1RecursiveStruct();
+ IdltowsdlTypeTestAnon1RecursiveStruct rStructDoubleChildChildren =
+ new IdltowsdlTypeTestAnon1RecursiveStruct();
rStructDoubleChildChildren.getItem().add(rStructNoChild2);
rStructDoubleChildChildren.getItem().add(rStructNoChild3);
rStructDoubleChild.setChildren(rStructDoubleChildChildren);
@@ -976,8 +980,8 @@
// Recursive struct with a child which contains a reference to a recursive child
IdltowsdlTypeTestRecursiveStruct rStructNestedChildren = new IdltowsdlTypeTestRecursiveStruct();
rStructNestedChildren.setName("RecursiveStructNestedChildren");
- IdltowsdlTypeTest1RecursiveStruct rStructNestedChildrenChildren =
- new IdltowsdlTypeTest1RecursiveStruct();
+ IdltowsdlTypeTestAnon1RecursiveStruct rStructNestedChildrenChildren =
+ new IdltowsdlTypeTestAnon1RecursiveStruct();
rStructNestedChildrenChildren.getItem().add(rStructSingleChild);
rStructNestedChildren.setChildren(rStructNestedChildrenChildren);
@@ -1040,14 +1044,14 @@
// Union, two recursive children, case 2 set
IdltowsdlTypeTestRecursiveUnion rUnion3 = new IdltowsdlTypeTestRecursiveUnion();
- IdltowsdlTypeTest1RecursiveUnion ru3Children = new IdltowsdlTypeTest1RecursiveUnion();
+ IdltowsdlTypeTestAnon1RecursiveUnion ru3Children = new IdltowsdlTypeTestAnon1RecursiveUnion();
ru3Children.getItem().add(rUnion1);
ru3Children.getItem().add(rUnion2);
rUnion3.setCase2(ru3Children);
// Union, one recursive child with two nested recursive children, case 2 set
IdltowsdlTypeTestRecursiveUnion rUnion4 = new IdltowsdlTypeTestRecursiveUnion();
- IdltowsdlTypeTest1RecursiveUnion ru4Children = new IdltowsdlTypeTest1RecursiveUnion();
+ IdltowsdlTypeTestAnon1RecursiveUnion ru4Children = new IdltowsdlTypeTestAnon1RecursiveUnion();
ru4Children.getItem().add(rUnion3);
rUnion4.setCase2(ru4Children);
@@ -1076,5 +1080,133 @@
assertTrue("testRecursiveUnion(): Incorrect return value",
compareRecursiveUnions(in, ret));
}
+ }
+
+
+ public void testStructWithArray() throws Exception {
+ IdltowsdlTypeTestBuildingT in = new IdltowsdlTypeTestBuildingT();
+
+ // octet array
+ IdltowsdlTypeTestOctetTwo contents = new IdltowsdlTypeTestOctetTwo();
+ contents.getItem().add(Short.valueOf(Integer.toString(3)));
+ contents.getItem().add(Short.valueOf(Integer.toString(3)));
+ in.setContents(contents);
+
+ // bounded octed seq
+ byte[] bytes = new byte[5];
+ for (int i=0; i<5; i++) {
+ bytes[i] = Byte.valueOf(Integer.toString(i));
+ }
+ in.setBoundedOctetSeq(bytes);
+
+ // array of strings
+ in.setBldAddr(new IdltowsdlTypeTestBuildingAddress6T());
+ for (int i=0; i<6; i++) {
+ in.getBldAddr().getItem().add(String.valueOf(i));
+ }
+
+ IdltowsdlTypeTestBuildingT inOutOrig = new IdltowsdlTypeTestBuildingT();
+ inOutOrig.setBoundedOctetSeq(bytes);
+ inOutOrig.setContents(contents);
+ inOutOrig.setBldAddr(new IdltowsdlTypeTestBuildingAddress6T());
+ for (int i=6; i<12; i++) {
+ inOutOrig.getBldAddr().getItem().add(String.valueOf(i));
+ }
+
+ Holder<IdltowsdlTypeTestBuildingT> inout =
+ new Holder<IdltowsdlTypeTestBuildingT>(inOutOrig);
+ Holder<IdltowsdlTypeTestBuildingT> out =
+ new Holder<IdltowsdlTypeTestBuildingT>();
+ IdltowsdlTypeTestBuildingT ret = client.testStructWithArray(in, inout, out);
+
+ assertTrue("testRecursiveUnion(): Incorrect value for out param",
+ inOutOrig.getBldAddr().getItem().get(2).equals(
+ out.value.getBldAddr().getItem().get(2)));
+ assertTrue("testRecursiveUnion(): Incorrect value for inout param",
+ in.getBldAddr().getItem().get(2).equals(
+ inout.value.getBldAddr().getItem().get(2)));
+ assertTrue("testRecursiveUnion(): Incorrect return value",
+ in.getBldAddr().getItem().get(2).equals(
+ ret.getBldAddr().getItem().get(2)));
+
+ }
+
+ public void testStructWithSeq() throws Exception {
+ IdltowsdlTypeTestStructWithSeq in = new IdltowsdlTypeTestStructWithSeq();
+ IdltowsdlTypeTestStringSet value = new IdltowsdlTypeTestStringSet();
+ in.setStrings(value); // empty sequence
+ Holder<IdltowsdlTypeTestStructWithSeq> inout =
+ new Holder<IdltowsdlTypeTestStructWithSeq>(in);
+ Holder<IdltowsdlTypeTestStructWithSeq> out =
+ new Holder<IdltowsdlTypeTestStructWithSeq>();
+ IdltowsdlTypeTestStructWithSeq ret = client.testStructWithSeq(in, inout, out);
+ assert(ret.getStrings().getItem().isEmpty());
+ }
+
+ private boolean areEqual(byte[] left, byte[] right) {
+ boolean result = true;
+ if (left.length != right.length) {
+ result = false;
+ } else {
+ int i = 0;
+ while (result == true && i < left.length) {
+ //System.out.println("Comparing " + left[i] + " with " + right[i]);
+ if (left[i] != right[i]) {
+ result = false;
+ }
+ i++;
+ }
+ }
+ return result;
+ }
+
+ public void testBoundedOctetSequence() throws Exception {
+ byte[] valueSets[][] = {
+ {{}, {}},
+ {{0}, {1}},
+ {{0, 2}, {1, 3}},
+ {{0, 2, 4}, {1, 3, 5}},
+ {{0, 2, 4, 6}, {1, 3, 5, 7}},
+ {{0, 2, 4, 6, 8}, {1, 3, 5, 7, 9}}
+ };
+
+ for (int i = 0; i < valueSets.length; i++) {
+
+ byte[] in = valueSets[i][0];
+ Holder<byte[]> inoutOrig = new Holder<byte[]>(valueSets[i][1]);
+ Holder<byte[]> inout = new Holder<byte[]>(valueSets[i][1]);
+ Holder<byte[]> out = new Holder<byte[]>();
+
+ byte[] ret = client.testBoundedOctetSequence(in, inout, out);
+
+ assertTrue("testBoundedOctetSequence(): Incorrect value for out param", areEqual(inoutOrig.value, out.value));
+ assertTrue("testBoundedOctetSequence(): Incorrect value for inout param", areEqual(in, inout.value));
+ assertTrue("testBoundedOctetSequence(): Incorrect return value", areEqual(in, ret));
+ }
+
+ // TODO:following block should be commented out after proper exception
+ // is thrown when attempting to send out of bounds byte[]
+ /*
+ {
+ byte[] a = new byte[]{1, 3, 5, 7, 9, 11, 13};
+ byte[] b = new byte[]{0, 2, 4, 6, 8, 10, 12};
+
+ byte[] in = a;
+ Holder<byte[]> inoutOrig = new Holder<byte[]>(b);
+ Holder<byte[]> inout = new Holder<byte[]>(b);
+ Holder<byte[]> out = new Holder<byte[]>();
+ try {
+ byte[] ret = client.testBoundedOctetSequence(in, inout, out);
+ assertTrue("testBoundedOctetSequence(): Incorrect value for out param", areEqual(inoutOrig.value, out.value));
+ assertTrue("testBoundedOctetSequence(): Incorrect value for inout param", areEqual(in, inout.value));
+ assertTrue("testBoundedOctetSequence(): Incorrect return value", areEqual(in, ret));
+
+ fail("Expected out of bounds exception has not been thrown!");
+ } catch (Exception ex) {
+ // TODO: change exception in catch clause to expected type
+ // ok, caught expected exception
+ }
+ }
+ */
}
}
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -68,7 +68,7 @@
protected void setUp() throws Exception {
super.setUp();
System.setProperty("cxf.config.file", "cxf-extension-corba.xml");
- bus = BusFactory.newInstance().getDefaultBus();
+ bus = BusFactory.getDefaultBus();
BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
factory = (CorbaBindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba");
bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -32,6 +32,7 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointImpl;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
@@ -90,7 +91,7 @@
public void setUp() throws Exception {
control = EasyMock.createNiceControl();
- bus = BusFactory.newInstance().getDefaultBus();
+ bus = BusFactory.getDefaultBus();
java.util.Properties props = System.getProperties();
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
@@ -203,8 +204,7 @@
OperationType opType = control.createMock(OperationType.class);
CorbaTypeMap typeMap = control.createMock(CorbaTypeMap.class);
- Map<TypeCode, RaisesType> exceptions = control.createMock(HashMap.class);
- List<RaisesType> exlist = control.createMock(ArrayList.class);
+ List<RaisesType> exlist = CastUtils.cast(control.createMock(ArrayList.class));
opType.getRaises();
EasyMock.expectLastCall().andReturn(exlist);
int i = 0;
@@ -225,7 +225,7 @@
EasyMock.expectLastCall().andReturn(exchange);
ServiceInfo service = control.createMock(ServiceInfo.class);
EasyMock.expect(exchange.get(ServiceInfo.class)).andReturn(service);
- List<CorbaTypeMap> list = control.createMock(List.class);
+ List<CorbaTypeMap> list = CastUtils.cast(control.createMock(List.class));
CorbaTypeMap typeMap = control.createMock(CorbaTypeMap.class);
EasyMock.expect(service.getExtensors(CorbaTypeMap.class)).andReturn(list);
@@ -323,7 +323,7 @@
message,
opType);
- assertNotNull("ExcepitonList is not null", exList != null);
+ assertNotNull("ExceptionList is not null", exList != null);
assertNotNull("TypeCode is not null", exList.item(0) != null);
assertEquals("ID should be equal", exList.item(0).id(), "IDL:BadRecord:1.0");
assertEquals("ID should be equal", exList.item(0).name(), "BadRecord");
@@ -334,7 +334,6 @@
public void testInvoke() throws Exception {
CorbaConduit conduit = setupCorbaConduit(false);
- Message msg = new MessageImpl();
//CorbaMessage message = new CorbaMessage(msg);
CorbaMessage message= control.createMock(CorbaMessage.class);
/*String opName = "GreetMe";
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaExceptionTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaExceptionTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaExceptionTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -147,7 +147,21 @@
return;
}
}
- assertTrue(false);
+ fail("Expected BadRecord Exception not found");
+ }
+
+ public void testPingMeFault() throws Exception {
+ try {
+ client.pingMe();
+ } catch (org.apache.schemas.idl.except.PingMeFault ex) {
+ return;
+ } catch (Exception ex) {
+ Throwable t = ex.getCause();
+ if ((t != null) && (t instanceof org.apache.schemas.idl.except.BadRecord)) {
+ return;
+ }
+ }
+ fail("Expected PingMeFault Exception not found");
}
// A small test server for the test case to interact with
@@ -187,6 +201,14 @@
rec.setReason("testReason");
rec.setCode((short)10);
throw new org.apache.schemas.idl.except.BadRecord("test", rec);
+ }
+
+ public void pingMe() throws org.apache.schemas.idl.except.PingMeFault {
+ org.apache.schemas.idltypes.except.FaultDetail detail =
+ new org.apache.schemas.idltypes.except.FaultDetail();
+ detail.setMinor((short) 1);
+ detail.setMajor((short) 2);
+ throw new org.apache.schemas.idl.except.PingMeFault("test", detail);
}
}
}
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -32,6 +32,7 @@
import javax.xml.ws.Service;
import org.apache.cxf.jaxb.JAXBUtils;
+import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
import org.apache.cxf.wsdl.WSDLManager;
@@ -43,6 +44,7 @@
import org.apache.schemas.yoko.idl.nestedobjref.FooFactoryCORBAService;
import org.apache.schemas.yoko.idl.nestedobjref.FooRefStruct;
import org.apache.schemas.yoko.idl.nestedobjref.FooRefUnion;
+import org.apache.yoko.bindings.corba.CorbaObjectReferenceTest.TestObjectImpl;
import junit.framework.TestCase;
@@ -178,6 +180,25 @@
String portName = EndpointReferenceUtils.getPortName(epr);
assertTrue(portName.equals(OBJECT_PORT_NAME.getLocalPart()));
}
+
+ public void testInferredObjectReturn() {
+
+ EndpointReferenceType ref = client.testInferredObjectReturn();
+
+ assertNotNull(ref.getAddress().getValue());
+
+ QName interfaceName = EndpointReferenceUtils.getInterfaceName(ref);
+ assertNotNull(interfaceName);
+
+ String wsdlLocation = EndpointReferenceUtils.getWSDLLocation(ref);
+ assertNotNull(wsdlLocation);
+
+ QName serviceName = EndpointReferenceUtils.getServiceName(ref);
+ assertNotNull(serviceName);
+
+ String portName = EndpointReferenceUtils.getPortName(ref);
+ assertNotNull(portName);
+ }
// Helper methods that can be used throughout the test
public EndpointReferenceType createEndpointReferenceType(String name, boolean serverSide) {
@@ -203,11 +224,20 @@
OBJECT_SERVICE_NAME,
OBJECT_PORT_NAME.getLocalPart());
EndpointReferenceUtils.setInterfaceName(ref, OBJECT_PORT_TYPE);
+
EndpointReferenceUtils.setAddress(ref, corbaAddress);
return ref;
+ }
+
+
+ private String resolveAddressFromEndpoint(String corbaAddress, Endpoint ep) {
+ String addr = corbaAddress;
+ EndpointImpl epImpl = (EndpointImpl)ep;
+ addr = epImpl.getServer().getDestination().getAddress().getAddress().getValue();
+ return addr;
}
-
+
public Foo createObjectFromEndpointReferenceType(EndpointReferenceType epr) throws Exception {
WSDLManager manager = null;
manager = new WSDLManagerImpl();
@@ -289,6 +319,16 @@
ref.setU12(epr);
return ref;
}
+
+ public EndpointReferenceType createFoo() {
+ return createEndpointReferenceType("FooRef", true);
+
+ }
+
+
+ public EndpointReferenceType testInferredObjectReturn() {
+ return createEndpointReferenceType("InferredObjectReturn", true);
+ }
}
// A minimal Foo implementation to test object references
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -101,7 +101,7 @@
// Wait for the server to start if it hasn't already
while (waitCount < MAX_WAIT_COUNT && !server.isReady()) {
try {
- Thread.sleep(1000);
+ Thread.sleep(4000);
waitCount++;
} catch (Exception ex) {
// Consume
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaOperationNameManglingTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaOperationNameManglingTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaOperationNameManglingTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaOperationNameManglingTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Added: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java?rev=608894&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java (added)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java Fri Jan 4 07:47:28 2008
@@ -0,0 +1,384 @@
+/**
+ * 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.yoko.bindings.corba;
+
+import java.io.File;
+import java.util.HashMap;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.jws.WebService;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.Holder;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.jaxb.JAXBUtils;
+import org.apache.cxf.jaxws.EndpointImpl;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl11.WSDLManagerImpl;
+
+import org.apache.schemas.yoko.idl.polynestedobjref.Foo;
+import org.apache.schemas.yoko.idl.polynestedobjref.FooCORBAService;
+import org.apache.schemas.yoko.idl.polynestedobjref.FooFactory;
+import org.apache.schemas.yoko.idl.polynestedobjref.FooFactoryCORBAService;
+import org.apache.schemas.yoko.idl.polynestedobjref.FooRefStruct;
+import org.apache.schemas.yoko.idl.polynestedobjref.FooRefUnion;
+import org.apache.type_test.types1.EmptyStruct;
+import org.apache.yoko.bindings.corba.CorbaObjectReferenceTest.TestObjectImpl;
+
+import junit.framework.TestCase;
+
+public class CorbaPolyNestedObjReferenceTest extends TestCase {
+
+ private final QName OBJECT_PORT_NAME =
+ new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef", "FooCORBAPort");
+
+ private final QName OBJECT_PORT_TYPE =
+ new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef", "Foo");
+
+ private final QName OBJECT_SERVICE_NAME =
+ new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef", "FooCORBAService");
+
+ private final QName INTERFACE_PORT_NAME =
+ new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef", "FooFactoryCORBAPort");
+
+ private final QName INTERFACE_SERVICE_NAME =
+ new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef", "FooFactoryCORBAService");
+
+ private final static String WSDL_LOCATION = "/wsdl/PolyNestedObjRef.wsdl";
+ private final static int MAX_WAIT_COUNT = 15;
+
+ private static TestServer server;
+ private static boolean testServerReady;
+ private FooFactory client;
+ private URL wsdlUrl;
+
+ public CorbaPolyNestedObjReferenceTest(String arg0) {
+ super(arg0);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(CorbaPolyNestedObjReferenceTest.class);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ if (server == null) {
+ server = new TestServer();
+ server.start();
+ }
+
+ int waitCount = 0;
+ // Wait for the server to start if it hasn't already
+ while (waitCount < MAX_WAIT_COUNT && !server.isReady()) {
+ try {
+ Thread.sleep(1000);
+ waitCount++;
+ } catch (Exception ex) {
+ // Consume
+ }
+ }
+
+ if (!server.isReady()) {
+ throw new Exception("Server failed to start in a timely fashion");
+ }
+
+ // Now initialize the client-side
+ if (client == null) {
+ try {
+ wsdlUrl = FooFactory.class.getResource(WSDL_LOCATION);
+ } catch (Exception ex) {
+ throw new Exception("Unable to resolve WSDL location");
+ }
+
+ FooFactoryCORBAService service =
+ new FooFactoryCORBAService(wsdlUrl, INTERFACE_SERVICE_NAME);
+ client = service.getPort(INTERFACE_PORT_NAME, FooFactory.class);
+ }
+
+ if (client == null) {
+ throw new Exception("Unable to create client");
+ }
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+
+ server.interrupt();
+
+ try {
+ // Sleep for 3 seconds waiting for the server to shut down
+ Thread.sleep(3000);
+ } catch (Exception ex) {
+ // Move on to check if the server is down
+ }
+
+ if (server.isAlive()) {
+ throw new Exception("Did not terminate test server!");
+ }
+ }
+
+ public void testCreateFooRefInStruct() {
+ FooRefStruct ref = client.createFooRefInStruct("FooRefInStruct");
+ //EndpointReferenceType epr = createObjectFromEndpointReferenceType(ref.getRef());
+ EndpointReferenceType epr = ref.getRef();
+
+ assertNotNull(epr.getAddress().getValue());
+
+ QName interfaceName = EndpointReferenceUtils.getInterfaceName(epr);
+ assertTrue(interfaceName.equals(OBJECT_PORT_TYPE));
+
+ String wsdlLocation = EndpointReferenceUtils.getWSDLLocation(epr);
+ assertTrue(wsdlLocation.equals(wsdlUrl.toString()));
+
+ QName serviceName = EndpointReferenceUtils.getServiceName(epr);
+ assertTrue(serviceName.equals(OBJECT_SERVICE_NAME));
+
+ String portName = EndpointReferenceUtils.getPortName(epr);
+ assertTrue(portName.equals(OBJECT_PORT_NAME.getLocalPart()));
+
+ //Test for null for EPR.
+ ref = client.createFooRefInStruct("");
+ assertNull("Null EPR expected", ref.getRef());
+ }
+
+ public void testCreateFooRefInUnion() {
+ FooRefUnion ref = client.createFooRefInUnion();
+ EndpointReferenceType epr = ref.getU12();
+ assertNotNull(epr.getAddress().getValue());
+
+ QName interfaceName = EndpointReferenceUtils.getInterfaceName(epr);
+ assertTrue(interfaceName.equals(OBJECT_PORT_TYPE));
+
+ String wsdlLocation = EndpointReferenceUtils.getWSDLLocation(epr);
+ assertTrue(wsdlLocation.equals(wsdlUrl.toString()));
+
+ QName serviceName = EndpointReferenceUtils.getServiceName(epr);
+ assertTrue(serviceName.equals(OBJECT_SERVICE_NAME));
+
+ String portName = EndpointReferenceUtils.getPortName(epr);
+ assertTrue(portName.equals(OBJECT_PORT_NAME.getLocalPart()));
+ }
+
+ public void testInferredObjectReturn() {
+
+ EndpointReferenceType ref = client.testInferredObjectReturn();
+
+ assertNotNull(ref.getAddress().getValue());
+
+ QName interfaceName = EndpointReferenceUtils.getInterfaceName(ref);
+ assertNotNull(interfaceName);
+
+ String wsdlLocation = EndpointReferenceUtils.getWSDLLocation(ref);
+ assertNotNull(wsdlLocation);
+
+ QName serviceName = EndpointReferenceUtils.getServiceName(ref);
+ assertNotNull(serviceName);
+
+ String portName = EndpointReferenceUtils.getPortName(ref);
+ assertNotNull(portName);
+ }
+
+ public void testNestedInferredObjectParam() {
+ FooRefStruct ref = client.createFooRefInStruct("FooRefInStruct");
+ FooRefStruct ref2 = client.createFooRefInStruct("FooRefInStruct");
+
+ Holder<FooRefStruct> ref3 = new Holder<FooRefStruct>(ref2);
+ Holder<FooRefStruct> ref4 = new Holder<FooRefStruct>();
+
+ FooRefStruct refReturn = client.testNestedInferredObjectParam(ref, ref3, ref4);
+ EndpointReferenceType epr = refReturn.getRef();
+
+ assertNotNull(epr.getAddress().getValue());
+
+ QName interfaceName = EndpointReferenceUtils.getInterfaceName(epr);
+ assertTrue(interfaceName.equals(OBJECT_PORT_TYPE));
+
+ String wsdlLocation = EndpointReferenceUtils.getWSDLLocation(epr);
+ assertTrue(wsdlLocation.equals(wsdlUrl.toString()));
+
+ QName serviceName = EndpointReferenceUtils.getServiceName(epr);
+ assertTrue(serviceName.equals(OBJECT_SERVICE_NAME));
+
+ String portName = EndpointReferenceUtils.getPortName(epr);
+ assertTrue(portName.equals(OBJECT_PORT_NAME.getLocalPart()));
+ }
+
+ // Helper methods that can be used throughout the test
+ public EndpointReferenceType createEndpointReferenceType(String name, boolean serverSide) {
+ String corbaAddress = null;
+ // The server and client bindings need to be on two different ORBs since they can't
+ // share. So we need to make sure that the port numbers are different.
+ if (serverSide) {
+ corbaAddress = "corbaloc::localhost:50000/Server" + name;
+ } else {
+ corbaAddress = "corbaloc::localhost:51000/Client" + name;
+ }
+
+ Object testObj = new FooImpl();
+ Endpoint ep = Endpoint.create("http://schemas.apache.org/yoko/bindings/corba", testObj);
+ String wsdlLocation = getClass().getResource("/wsdl/PolyNestedObjRef.wsdl").toString();
+ Map<String, Object> props = new HashMap<String, Object>();
+ props.put("javax.xml.ws.wsdl.description", wsdlLocation);
+ ep.setProperties(props);
+ ep.publish(corbaAddress);
+
+ EndpointReferenceType ref =
+ EndpointReferenceUtils.getEndpointReference(wsdlUrl,
+ OBJECT_SERVICE_NAME,
+ OBJECT_PORT_NAME.getLocalPart());
+ EndpointReferenceUtils.setInterfaceName(ref, OBJECT_PORT_TYPE);
+
+ // edell.
+ //get the real IOR rather than the corbaloc address information
+ corbaAddress = resolveAddressFromEndpoint(corbaAddress, ep);
+ EndpointReferenceUtils.setAddress(ref, corbaAddress);
+
+ return ref;
+ }
+
+
+ private String resolveAddressFromEndpoint(String corbaAddress, Endpoint ep) {
+ String addr = corbaAddress;
+ EndpointImpl epImpl = (EndpointImpl)ep;
+ addr = epImpl.getServer().getDestination().getAddress().getAddress().getValue();
+ return addr;
+ }
+
+ public Foo createObjectFromEndpointReferenceType(EndpointReferenceType epr) throws Exception {
+ WSDLManager manager = null;
+ manager = new WSDLManagerImpl();
+
+ QName interfaceName = EndpointReferenceUtils.getInterfaceName(epr);
+ String wsdlLocation = EndpointReferenceUtils.getWSDLLocation(epr);
+ QName serviceName = EndpointReferenceUtils.getServiceName(epr);
+ String portName = EndpointReferenceUtils.getPortName(epr);
+
+ QName port = new QName(serviceName.getNamespaceURI(), portName);
+
+ StringBuffer seiName = new StringBuffer();
+ seiName.append("org.apache.schemas.yoko.idl.polynestedobjref.");
+ seiName.append(JAXBUtils.nameToIdentifier(interfaceName.getLocalPart(),
+ JAXBUtils.IdentifierType.INTERFACE));
+
+ Class<?> sei = null;
+ sei = Class.forName(seiName.toString(), true, manager.getClass().getClassLoader());
+
+ Service service = Service.create(wsdlUrl, serviceName);
+ Foo testObj = (Foo)service.getPort(port, sei);
+
+ Map<String, Object> requestContext = ((BindingProvider)testObj).getRequestContext();
+ requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, epr.getAddress().getValue());
+
+ return testObj;
+ }
+
+
+ // A small test server for the test case to interact with
+ public class TestServer extends Thread {
+ private boolean serverReady;
+
+ public TestServer() {
+ serverReady = false;
+ }
+
+ public void run() {
+ Object implementor = new FooFactoryImpl();
+ String address = "corbaloc::localhost:50000/PolyNestedObjRefTest";
+ Endpoint ep = Endpoint.create("http://schemas.apache.org/yoko/bindings/corba", implementor);
+ String wsdlLocation = getClass().getResource("/wsdl/PolyNestedObjRef.wsdl").toString();
+ Map<String, Object> props = new HashMap<String, Object>();
+ props.put("javax.xml.ws.wsdl.description", wsdlLocation);
+ ep.setProperties(props);
+ ep.publish(address);
+
+ serverReady = true;
+ }
+
+ public boolean isReady() {
+ return serverReady;
+ }
+ }
+
+ // A minimal FooFactory implementation to test object references
+ @WebService(portName = "FooFactoryCORBAPort",
+ serviceName = "FooFactoryCORBAService",
+ targetNamespace = "http://schemas.apache.org/yoko/idl/PolyNestedObjRef",
+ endpointInterface = "org.apache.schemas.yoko.idl.polynestedobjref.FooFactory")
+ public class FooFactoryImpl implements FooFactory {
+
+ // TODO: Provide methods
+ public FooRefStruct createFooRefInStruct(String request) {
+ FooRefStruct ref = new FooRefStruct();
+ if (!request.equals("")) {
+ ref.setName(request);
+ EndpointReferenceType epr = createEndpointReferenceType("StructRef", true);
+ ref.setRef(epr);
+ } else {
+ ref.setName("error!!!");
+ }
+ return ref;
+ }
+
+ public FooRefUnion createFooRefInUnion() {
+ FooRefUnion ref = new FooRefUnion();
+ EndpointReferenceType epr = createEndpointReferenceType("UnionRef", true);
+ ref.setU12(epr);
+ return ref;
+ }
+
+ public EndpointReferenceType createFoo() {
+ return createEndpointReferenceType("FooRef", true);
+
+ }
+
+
+ public EndpointReferenceType testInferredObjectReturn() {
+ return createEndpointReferenceType("InferredObjectReturn", true);
+ }
+
+ public FooRefStruct testNestedInferredObjectParam(FooRefStruct strt,
+ javax.xml.ws.Holder<FooRefStruct> strt2,
+ javax.xml.ws.Holder<FooRefStruct> strt3) {
+ //strt3.value = strt2.value;
+ //strt2.value = strt;
+ strt3.value = strt;
+ strt2.value = strt;
+ return strt;
+ }
+ }
+
+ // A minimal Foo implementation to test object references
+ @javax.jws.WebService(portName = "FooCORBAPort",
+ serviceName = "FooCORBAService",
+ targetNamespace = "http://schemas.apache.org/yoko/idl/PolyNestedObjRef",
+ endpointInterface = "org.apache.schemas.yoko.idl.polynestedobjref.Foo")
+ public class FooImpl implements Foo {
+
+ public void doBar() {
+ }
+ }
+}
Propchange: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -73,7 +73,7 @@
public void setUp() throws Exception {
control = EasyMock.createNiceControl();
- bus = BusFactory.newInstance().getDefaultBus();
+ bus = BusFactory.getDefaultBus();
java.util.Properties props = System.getProperties();
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTestImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTestImpl.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTestImpl.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTestImpl.java Fri Jan 4 07:47:28 2008
@@ -20,14 +20,19 @@
package org.apache.yoko.bindings.corba;
import javax.jws.WebService;
+import javax.xml.ws.Holder;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTest;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestBuildingAddress6T;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestBuildingT;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestEnum1;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestRecursiveStruct;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestRecursiveUnion;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestSeqLong;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStringSet;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStruct1;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStructSet;
+import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStructWithSeq;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestUnion1;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestUnion2;
import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestUnionSet;
@@ -271,4 +276,30 @@
inoutUnion.value = inUnion;
return inUnion;
}
+
+ public IdltowsdlTypeTestBuildingT testStructWithArray(IdltowsdlTypeTestBuildingT inBuild,
+ javax.xml.ws.Holder<IdltowsdlTypeTestBuildingT> inoutBuild,
+ javax.xml.ws.Holder<IdltowsdlTypeTestBuildingT> outBuild) {
+ outBuild.value = inoutBuild.value;
+ inoutBuild.value = inBuild;
+ return inBuild;
+ }
+
+ public IdltowsdlTypeTestStructWithSeq testStructWithSeq(IdltowsdlTypeTestStructWithSeq inStructWithSeq,
+ Holder<IdltowsdlTypeTestStructWithSeq> inoutStructWithSeq,
+ Holder<IdltowsdlTypeTestStructWithSeq> outStructWithSeq) {
+ outStructWithSeq.value = inoutStructWithSeq.value;
+ inoutStructWithSeq.value = inStructWithSeq;
+ return inStructWithSeq;
+ }
+
+ public byte[] testBoundedOctetSequence(
+ byte[] inBoundedOctetSeq,
+ javax.xml.ws.Holder<byte[]> inoutBoundedOctetSeq,
+ javax.xml.ws.Holder<byte[]> outBoundedOctetSeq) {
+ outBoundedOctetSeq.value = inoutBoundedOctetSeq.value;
+ inoutBoundedOctetSeq.value = inBoundedOctetSeq;
+ return inBoundedOctetSeq;
+ }
+
}
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/ServerLauncher.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/ServerLauncher.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/ServerLauncher.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/ServerLauncher.java Fri Jan 4 07:47:28 2008
@@ -33,6 +33,8 @@
import java.util.Map;
import java.util.logging.Logger;
+import org.apache.cxf.common.logging.LogUtils;
+
public class ServerLauncher {
public static final int DEFAULT_TIMEOUT = 3 * 60 * 1000;
@@ -40,7 +42,7 @@
protected static final String SERVER_FAILED =
"server startup failed (not a log message)";
- private static final Logger LOG = Logger.getLogger(ServerLauncher.class.getName());
+ private static final Logger LOG = LogUtils.getL7dLogger(ServerLauncher.class);
boolean serverPassed;
final String className;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -36,7 +36,7 @@
protected EndpointInfo endpointInfo;
public TestUtils() {
- bus = BusFactory.newInstance().getDefaultBus();
+ bus = BusFactory.getDefaultBus();
BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
try {
factory = (CorbaBindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba");
@@ -51,9 +51,7 @@
WSDLServiceFactory factory = new WSDLServiceFactory(bus, wsdlUrl, new QName(ns, serviceName));
Service service = factory.create();
- EndpointInfo endpointInfo = service.getEndpointInfo(new QName(ns, portName));
- return endpointInfo;
-
+ return service.getEndpointInfo(new QName(ns, portName));
}
public CorbaDestination getSimpleTypesTestDestination() throws Exception {