You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2006/09/29 13:49:50 UTC
svn commit: r451290 [1/2] - in /incubator/yoko/trunk:
api/src/main/java/org/apache/yoko/wsdl/
bindings/src/main/java/org/apache/yoko/bindings/corba/
bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/
bindings/src/main/java/org/apache/yok...
Author: bravi
Date: Fri Sep 29 06:49:48 2006
New Revision: 451290
URL: http://svn.apache.org/viewvc?view=rev&rev=451290
Log:
[YOKO-177] - Moved the Corba Constants class to the api module & changed the bindings & tools to use the common class.
Added:
incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaConstants.java (with props)
Removed:
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConstants.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/CORBAConstants.java
Modified:
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingImpl.java
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaAddressExtensionHelper.java
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaBindingExtensionHelper.java
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaOperationExtensionHelper.java
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaTypesExtensionHelper.java
incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplMarshalTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplUnmarshalTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/CorbaPrimitiveMap.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/XmlSchemaPrimitiveMap.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/EnumVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ExceptionVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/StructVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesUtils.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/UnionVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLTypes.java
incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTest.java
Added: incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaConstants.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaConstants.java?view=auto&rev=451290
==============================================================================
--- incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaConstants.java (added)
+++ incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaConstants.java Fri Sep 29 06:49:48 2006
@@ -0,0 +1,106 @@
+/**
+ * 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.wsdl;
+
+import javax.xml.namespace.QName;
+
+public interface CorbaConstants {
+
+ String IDL_VERSION = ":1.0";
+ String REPO_STRING = "IDL:";
+
+ String NS_CORBA_TYPEMAP = "typemap";
+ String NP_WSDL_CORBA = "corba";
+ String NU_WSDL_CORBA = "http://schemas.apache.org/yoko/bindings/corba";
+ String NP_TM_CORBA = "corbatm";
+ String NU_TM_CORBA = "http://schemas.apache.org/yoko/typemap/corba/";
+ String SCHEMA_NS_URI = "http://schemas.apache.org/yoko/idltypes/";
+ String WSDL_NS_URI = "http://schemas.apache.org/yoko/idl/";
+
+ // CORBA Binding Extensibility Elements
+ QName NE_CORBA_ADDRESS = new QName(NU_WSDL_CORBA, "address", NP_WSDL_CORBA);
+ QName NE_CORBA_POLICY = new QName(NU_WSDL_CORBA, "policy", NP_WSDL_CORBA);
+ QName NE_CORBA_BINDING = new QName(NU_WSDL_CORBA, "binding", NP_WSDL_CORBA);
+ QName NE_CORBA_OPERATION = new QName(NU_WSDL_CORBA, "operation", NP_WSDL_CORBA);
+ QName NE_CORBA_PARAM = new QName(NU_WSDL_CORBA, "param", NP_WSDL_CORBA);
+ QName NE_CORBA_RETURN = new QName(NU_WSDL_CORBA, "return", NP_WSDL_CORBA);
+ QName NE_CORBA_RAISES = new QName(NU_WSDL_CORBA, "raises", NP_WSDL_CORBA);
+
+ // CORBA Type Mapping Extensiblity Elements
+ QName NE_CORBA_TYPEMAPPING = new QName(NU_WSDL_CORBA, "typeMapping", NP_WSDL_CORBA);
+ QName NE_CORBA_STRUCT = new QName(NU_WSDL_CORBA, "struct", NP_WSDL_CORBA);
+ QName NE_CORBA_STRUCT_MEM = new QName(NU_WSDL_CORBA, "member", NP_WSDL_CORBA);
+ QName NE_CORBA_UNION = new QName(NU_WSDL_CORBA, "union", NP_WSDL_CORBA);
+ QName NE_CORBA_UNION_BRANCH = new QName(NU_WSDL_CORBA, "unionbranch", NP_WSDL_CORBA);
+ QName NE_CORBA_UNION_CASE = new QName(NU_WSDL_CORBA, "case", NP_WSDL_CORBA);
+ QName NE_CORBA_ALIAS = new QName(NU_WSDL_CORBA, "alias", NP_WSDL_CORBA);
+ QName NE_CORBA_FIXED = new QName(NU_WSDL_CORBA, "fixed", NP_WSDL_CORBA);
+ QName NE_CORBA_ANONFIXED = new QName(NU_WSDL_CORBA, "anonfixed", NP_WSDL_CORBA);
+ QName NE_CORBA_CONST = new QName(NU_WSDL_CORBA, "const", NP_WSDL_CORBA);
+ QName NE_CORBA_ENUM = new QName(NU_WSDL_CORBA, "enum", NP_WSDL_CORBA);
+ QName NE_CORBA_ENUMERATOR = new QName(NU_WSDL_CORBA, "enumerator", NP_WSDL_CORBA);
+ QName NE_CORBA_SEQUENCE = new QName(NU_WSDL_CORBA, "sequence", NP_WSDL_CORBA);
+ QName NE_CORBA_ANONSEQUENCE = new QName(NU_WSDL_CORBA, "anonsequence", NP_WSDL_CORBA);
+ QName NE_CORBA_ARRAY = new QName(NU_WSDL_CORBA, "array", NP_WSDL_CORBA);
+ QName NE_CORBA_ANONARRAY = new QName(NU_WSDL_CORBA, "anonarray", NP_WSDL_CORBA);
+ QName NE_CORBA_ANONSTRING = new QName(NU_WSDL_CORBA, "anonstring", NP_WSDL_CORBA);
+ QName NE_CORBA_ANONWSTRING = new QName(NU_WSDL_CORBA, "anonwstring", NP_WSDL_CORBA);
+ QName NE_CORBA_EXCEPTION = new QName(NU_WSDL_CORBA, "exception", NP_WSDL_CORBA);
+ QName NE_CORBA_INTERFACE = new QName(NU_WSDL_CORBA, "object", NP_WSDL_CORBA);
+
+ // CORBA Primitive Types
+ QName NT_CORBA_LONG = new QName(NU_WSDL_CORBA, "long", NP_WSDL_CORBA);
+ QName NT_CORBA_ULONG = new QName(NU_WSDL_CORBA, "ulong", NP_WSDL_CORBA);
+ QName NT_CORBA_LONGLONG = new QName(NU_WSDL_CORBA, "longlong", NP_WSDL_CORBA);
+ QName NT_CORBA_ULONGLONG = new QName(NU_WSDL_CORBA, "ulonglong", NP_WSDL_CORBA);
+ QName NT_CORBA_SHORT = new QName(NU_WSDL_CORBA, "short", NP_WSDL_CORBA);
+ QName NT_CORBA_USHORT = new QName(NU_WSDL_CORBA, "ushort", NP_WSDL_CORBA);
+ QName NT_CORBA_FLOAT = new QName(NU_WSDL_CORBA, "float", NP_WSDL_CORBA);
+ QName NT_CORBA_DOUBLE = new QName(NU_WSDL_CORBA, "double", NP_WSDL_CORBA);
+ QName NT_CORBA_CHAR = new QName(NU_WSDL_CORBA, "char", NP_WSDL_CORBA);
+ QName NT_CORBA_WCHAR = new QName(NU_WSDL_CORBA, "wchar", NP_WSDL_CORBA);
+ QName NT_CORBA_BOOLEAN = new QName(NU_WSDL_CORBA, "boolean", NP_WSDL_CORBA);
+ QName NT_CORBA_OCTET = new QName(NU_WSDL_CORBA, "octet", NP_WSDL_CORBA);
+ QName NT_CORBA_STRING = new QName(NU_WSDL_CORBA, "string", NP_WSDL_CORBA);
+ QName NT_CORBA_WSTRING = new QName(NU_WSDL_CORBA, "wstring", NP_WSDL_CORBA);
+ QName NT_CORBA_ANY = new QName(NU_WSDL_CORBA, "any", NP_WSDL_CORBA);
+ QName NT_CORBA_DATETIME = new QName(NU_WSDL_CORBA, "dateTime", NP_WSDL_CORBA);
+ QName NT_CORBA_LONGDOUBLE = new QName(NU_WSDL_CORBA, "longdouble", NP_WSDL_CORBA);
+
+ QName NT_CORBA_DATE = new QName(NU_WSDL_CORBA, "date", NP_WSDL_CORBA);
+ QName NT_CORBA_TIME = new QName(NU_WSDL_CORBA, "time", NP_WSDL_CORBA);
+
+ QName NT_CORBA_PINT = new QName(NU_WSDL_CORBA, "positiveInteger", NP_WSDL_CORBA);
+ QName NT_CORBA_NPINT = new QName(NU_WSDL_CORBA, "nonPositiveInteger", NP_WSDL_CORBA);
+ QName NT_CORBA_NINT = new QName(NU_WSDL_CORBA, "negativeInteger", NP_WSDL_CORBA);
+ QName NT_CORBA_NNINT = new QName(NU_WSDL_CORBA, "nonNegativeInteger", NP_WSDL_CORBA);
+
+ // CORBA Binding Attribute Constants
+ String REPO_ID = "repositoryID";
+ String NAME = "name";
+ String IDLTYPE = "idltype";
+ String MODE = "mode";
+ String EXCEPTION = "exception";
+ String SERVICE_ID = "serviceid";
+ String BASES = "bases";
+
+ String getValue(String value);
+
+}
Propchange: incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaConstants.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingImpl.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingImpl.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingImpl.java Fri Sep 29 06:49:48 2006
@@ -79,6 +79,7 @@
import org.apache.yoko.bindings.corba.types.CorbaSequenceHandler;
import org.apache.yoko.bindings.corba.types.CorbaStructHandler;
import org.apache.yoko.bindings.corba.types.CorbaUnionHandler;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
import org.objectweb.celtix.Bus;
@@ -1108,4 +1109,4 @@
Characters charEvt = factory.createCharacters(fixedHandler.getValueData());
writer.add(charEvt);
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaUtils.java Fri Sep 29 06:49:48 2006
@@ -57,6 +57,7 @@
import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
import org.apache.schemas.yoko.bindings.corba.Union;
import org.apache.schemas.yoko.bindings.corba.Unionbranch;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
import org.objectweb.celtix.Bus;
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaAddressExtensionHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaAddressExtensionHelper.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaAddressExtensionHelper.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaAddressExtensionHelper.java Fri Sep 29 06:49:48 2006
@@ -30,7 +30,7 @@
import org.w3c.dom.NamedNodeMap;
import org.apache.schemas.yoko.bindings.corba.AddressType;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class CorbaAddressExtensionHelper implements ExtensionDeserializer {
@@ -61,4 +61,4 @@
return addrType;
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaBindingExtensionHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaBindingExtensionHelper.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaBindingExtensionHelper.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaBindingExtensionHelper.java Fri Sep 29 06:49:48 2006
@@ -29,7 +29,7 @@
import org.w3c.dom.NamedNodeMap;
import org.apache.schemas.yoko.bindings.corba.BindingType;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class CorbaBindingExtensionHelper implements ExtensionDeserializer {
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaOperationExtensionHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaOperationExtensionHelper.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaOperationExtensionHelper.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaOperationExtensionHelper.java Fri Sep 29 06:49:48 2006
@@ -37,7 +37,7 @@
import org.apache.schemas.yoko.bindings.corba.ParamType;
import org.apache.schemas.yoko.bindings.corba.RaisesType;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class CorbaOperationExtensionHelper implements ExtensionDeserializer {
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaTypesExtensionHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaTypesExtensionHelper.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaTypesExtensionHelper.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/extensions/CorbaTypesExtensionHelper.java Fri Sep 29 06:49:48 2006
@@ -49,7 +49,7 @@
import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
import org.apache.schemas.yoko.bindings.corba.Union;
import org.apache.schemas.yoko.bindings.corba.Unionbranch;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class CorbaTypesExtensionHelper implements ExtensionDeserializer {
@@ -516,4 +516,4 @@
}
return anonArrayType;
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java Fri Sep 29 06:49:48 2006
@@ -33,7 +33,7 @@
import org.apache.schemas.yoko.bindings.corba.Struct;
import org.apache.schemas.yoko.bindings.corba.Union;
import org.apache.schemas.yoko.bindings.corba.Unionbranch;
-//import org.apache.yoko.bindings.corba.CorbaConstants;
+
import org.apache.yoko.bindings.corba.CorbaTypeMap;
import org.apache.yoko.bindings.corba.CorbaUtils;
import org.apache.yoko.wsdl.CorbaTypeImpl;
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java Fri Sep 29 06:49:48 2006
@@ -22,6 +22,8 @@
import junit.framework.TestCase;
+import org.apache.yoko.wsdl.CorbaConstants;
+
import org.objectweb.celtix.Bus;
import org.objectweb.celtix.bindings.BindingFactory;
import org.objectweb.celtix.bindings.BindingManager;
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplMarshalTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplMarshalTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplMarshalTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplMarshalTest.java Fri Sep 29 06:49:48 2006
@@ -22,6 +22,8 @@
import junit.framework.TestCase;
+import org.apache.yoko.wsdl.CorbaConstants;
+
import org.objectweb.celtix.Bus;
import org.objectweb.celtix.bindings.BindingManager;
import org.objectweb.celtix.bindings.DataBindingCallback;
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java Fri Sep 29 06:49:48 2006
@@ -52,6 +52,7 @@
import org.apache.yoko.bindings.corba.types.CorbaSequenceHandler;
import org.apache.yoko.bindings.corba.types.CorbaStructHandler;
import org.apache.yoko.bindings.corba.types.CorbaUnionHandler;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
import org.omg.CORBA.ORB;
@@ -673,4 +674,4 @@
Character unionResultValue = (Character)unionResultValueObj;
assertTrue(unionResultValue.charValue() == unionValue.charValue());
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplUnmarshalTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplUnmarshalTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplUnmarshalTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplUnmarshalTest.java Fri Sep 29 06:49:48 2006
@@ -22,6 +22,7 @@
import javax.xml.ws.Holder;
import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.objectweb.celtix.Bus;
import org.objectweb.celtix.bindings.BindingManager;
@@ -520,4 +521,4 @@
Object ret = objContext.getReturn();
assertNotNull(ret);
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java Fri Sep 29 06:49:48 2006
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.omg.CORBA.ORB;
import org.omg.CORBA.TCKind;
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java Fri Sep 29 06:49:48 2006
@@ -47,9 +47,9 @@
import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
import org.apache.yoko.bindings.corba.types.CorbaSequenceHandler;
import org.apache.yoko.bindings.corba.types.CorbaStructHandler;
-//import org.apache.yoko.bindings.corba.types.CorbaUnionHandler;
import org.apache.yoko.orb.CORBA.OutputStream;
import org.apache.yoko.orb.OCI.Buffer;
+import org.apache.yoko.wsdl.CorbaConstants;
public class CorbaObjectReaderTest extends TestCase {
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java Fri Sep 29 06:49:48 2006
@@ -36,15 +36,13 @@
import org.apache.schemas.yoko.bindings.corba.Sequence;
import org.apache.schemas.yoko.bindings.corba.Struct;
import org.apache.yoko.bindings.corba.types.CorbaArrayHandler;
-//import org.apache.yoko.bindings.corba.types.CorbaEnumHandler;
import org.apache.yoko.bindings.corba.types.CorbaExceptionHandler;
-//import org.apache.yoko.bindings.corba.types.CorbaFixedHandler;
import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
import org.apache.yoko.bindings.corba.types.CorbaSequenceHandler;
import org.apache.yoko.bindings.corba.types.CorbaStructHandler;
-//import org.apache.yoko.bindings.corba.types.CorbaUnionHandler;
import org.apache.yoko.orb.CORBA.OutputStream;
import org.apache.yoko.orb.OCI.Buffer;
+import org.apache.yoko.wsdl.CorbaConstants;
public class CorbaObjectWriterTest extends TestCase {
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java Fri Sep 29 06:49:48 2006
@@ -30,6 +30,7 @@
import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
import org.apache.yoko.orb.CORBA.OutputStream;
import org.apache.yoko.orb.OCI.Buffer;
+import org.apache.yoko.wsdl.CorbaConstants;
public class CorbaStreamableTest extends TestCase {
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java Fri Sep 29 06:49:48 2006
@@ -33,6 +33,8 @@
import org.apache.schemas.yoko.bindings.corba.BindingType;
import org.apache.schemas.yoko.bindings.corba.OperationType;
+import org.apache.yoko.wsdl.CorbaConstants;
+
public class CorbaUtilsTest extends TestCase {
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java Fri Sep 29 06:49:48 2006
@@ -2,7 +2,7 @@
import javax.xml.namespace.QName;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.omg.CORBA.Any;
import org.omg.CORBA.ORB;
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java Fri Sep 29 06:49:48 2006
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
import org.apache.schemas.yoko.bindings.corba.Array;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.omg.CORBA.ORB;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java Fri Sep 29 06:49:48 2006
@@ -24,7 +24,7 @@
import org.apache.schemas.yoko.bindings.corba.Enum;
import org.apache.schemas.yoko.bindings.corba.Enumerator;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.omg.CORBA.ORB;
import org.omg.CORBA.TypeCode;
@@ -93,4 +93,4 @@
assertTrue(obj.getIndex() == (long)1);
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java Fri Sep 29 06:49:48 2006
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
import org.apache.schemas.yoko.bindings.corba.Fixed;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.omg.CORBA.ORB;
import org.omg.CORBA.TypeCode;
@@ -84,4 +84,4 @@
assertTrue(fixedType.getDigits() == obj.getDigits());
assertTrue(fixedType.getScale() == obj.getScale());
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java Fri Sep 29 06:49:48 2006
@@ -6,9 +6,9 @@
import org.apache.yoko.bindings.corba.CorbaBindingFactory;
import org.apache.yoko.bindings.corba.CorbaBindingImpl;
-import org.apache.yoko.bindings.corba.CorbaConstants;
import org.apache.yoko.bindings.corba.CorbaTypeMap;
import org.apache.yoko.bindings.corba.TestUtils;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.objectweb.celtix.Bus;
import org.objectweb.celtix.bindings.BindingManager;
@@ -172,4 +172,4 @@
result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMaps);
assertTrue(result instanceof CorbaUnionHandler);
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java Fri Sep 29 06:49:48 2006
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.omg.CORBA.ORB;
import org.omg.CORBA.TCKind;
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java Fri Sep 29 06:49:48 2006
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.omg.CORBA.ORB;
import org.omg.CORBA.TCKind;
@@ -357,4 +357,4 @@
String stringResult = (String)resultObj;
assertTrue(stringResult.equals(val));
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java Fri Sep 29 06:49:48 2006
@@ -23,7 +23,8 @@
import junit.framework.TestCase;
import org.apache.schemas.yoko.bindings.corba.Sequence;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
+
import org.omg.CORBA.ORB;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java Fri Sep 29 06:49:48 2006
@@ -24,7 +24,7 @@
import org.apache.schemas.yoko.bindings.corba.MemberType;
import org.apache.schemas.yoko.bindings.corba.Struct;
-import org.apache.yoko.bindings.corba.CorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.omg.CORBA.ORB;
import org.omg.CORBA.StructMember;
@@ -124,4 +124,4 @@
assertNotNull(member1Result);
assertTrue(member1Result.getName().equals(objMember1.getName()));
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/CorbaPrimitiveMap.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/CorbaPrimitiveMap.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/CorbaPrimitiveMap.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/CorbaPrimitiveMap.java Fri Sep 29 06:49:48 2006
@@ -23,6 +23,7 @@
import javax.xml.namespace.QName;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
public class CorbaPrimitiveMap extends PrimitiveMapBase {
@@ -34,42 +35,42 @@
private void initialiseMap() {
- corbaPrimitiveMap.put("string", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("boolean", CORBAConstants.NT_CORBA_BOOLEAN);
- corbaPrimitiveMap.put("float", CORBAConstants.NT_CORBA_FLOAT);
- corbaPrimitiveMap.put("double", CORBAConstants.NT_CORBA_DOUBLE);
- corbaPrimitiveMap.put("dateTime", CORBAConstants.NT_CORBA_DATETIME);
- corbaPrimitiveMap.put("date", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("time", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("gYearMonth", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("gYear", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("gMonthDay", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("gMonth", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("gDay", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("duration", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("anyURI", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("QName", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("normalizedString", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("token", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("language", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("NMTOKEN", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("Name", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("NCName", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("ID", CORBAConstants.NT_CORBA_STRING);
- corbaPrimitiveMap.put("integer", CORBAConstants.NT_CORBA_LONGLONG);
- corbaPrimitiveMap.put("short", CORBAConstants.NT_CORBA_SHORT);
- corbaPrimitiveMap.put("byte", CORBAConstants.NT_CORBA_CHAR);
- corbaPrimitiveMap.put("int", CORBAConstants.NT_CORBA_LONG);
- corbaPrimitiveMap.put("long", CORBAConstants.NT_CORBA_LONGLONG);
- corbaPrimitiveMap.put("nonPositiveInteger", CORBAConstants.NT_CORBA_LONGLONG);
- corbaPrimitiveMap.put("negativeInteger", CORBAConstants.NT_CORBA_LONGLONG);
- corbaPrimitiveMap.put("nonNegativeInteger", CORBAConstants.NT_CORBA_ULONGLONG);
- corbaPrimitiveMap.put("positiveInteger", CORBAConstants.NT_CORBA_ULONGLONG);
- corbaPrimitiveMap.put("unsignedInt", CORBAConstants.NT_CORBA_ULONG);
- corbaPrimitiveMap.put("unsignedLong", CORBAConstants.NT_CORBA_ULONGLONG);
- corbaPrimitiveMap.put("unsignedShort", CORBAConstants.NT_CORBA_USHORT);
- corbaPrimitiveMap.put("unsignedByte", CORBAConstants.NT_CORBA_OCTET);
- corbaPrimitiveMap.put("anyType", CORBAConstants.NT_CORBA_ANY);
+ corbaPrimitiveMap.put("string", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("boolean", CorbaConstants.NT_CORBA_BOOLEAN);
+ corbaPrimitiveMap.put("float", CorbaConstants.NT_CORBA_FLOAT);
+ corbaPrimitiveMap.put("double", CorbaConstants.NT_CORBA_DOUBLE);
+ corbaPrimitiveMap.put("dateTime", CorbaConstants.NT_CORBA_DATETIME);
+ corbaPrimitiveMap.put("date", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("time", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("gYearMonth", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("gYear", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("gMonthDay", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("gMonth", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("gDay", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("duration", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("anyURI", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("QName", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("normalizedString", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("token", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("language", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("NMTOKEN", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("Name", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("NCName", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("ID", CorbaConstants.NT_CORBA_STRING);
+ corbaPrimitiveMap.put("integer", CorbaConstants.NT_CORBA_LONGLONG);
+ corbaPrimitiveMap.put("short", CorbaConstants.NT_CORBA_SHORT);
+ corbaPrimitiveMap.put("byte", CorbaConstants.NT_CORBA_CHAR);
+ corbaPrimitiveMap.put("int", CorbaConstants.NT_CORBA_LONG);
+ corbaPrimitiveMap.put("long", CorbaConstants.NT_CORBA_LONGLONG);
+ corbaPrimitiveMap.put("nonPositiveInteger", CorbaConstants.NT_CORBA_LONGLONG);
+ corbaPrimitiveMap.put("negativeInteger", CorbaConstants.NT_CORBA_LONGLONG);
+ corbaPrimitiveMap.put("nonNegativeInteger", CorbaConstants.NT_CORBA_ULONGLONG);
+ corbaPrimitiveMap.put("positiveInteger", CorbaConstants.NT_CORBA_ULONGLONG);
+ corbaPrimitiveMap.put("unsignedInt", CorbaConstants.NT_CORBA_ULONG);
+ corbaPrimitiveMap.put("unsignedLong", CorbaConstants.NT_CORBA_ULONGLONG);
+ corbaPrimitiveMap.put("unsignedShort", CorbaConstants.NT_CORBA_USHORT);
+ corbaPrimitiveMap.put("unsignedByte", CorbaConstants.NT_CORBA_OCTET);
+ corbaPrimitiveMap.put("anyType", CorbaConstants.NT_CORBA_ANY);
}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/XmlSchemaPrimitiveMap.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/XmlSchemaPrimitiveMap.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/XmlSchemaPrimitiveMap.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/XmlSchemaPrimitiveMap.java Fri Sep 29 06:49:48 2006
@@ -25,6 +25,7 @@
import javax.xml.namespace.QName;
import org.apache.ws.commons.schema.constants.Constants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class XmlSchemaPrimitiveMap {
private Map<QName, QName> xmlSchemaPrimitiveMap;
@@ -37,32 +38,32 @@
private void initializeMap() {
//<base_type_spec>
// <floating_pt_type> - OMG Syntax and semantics - CORBA v3.0
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_FLOAT, Constants.XSD_FLOAT);
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_DOUBLE, Constants.XSD_DOUBLE);
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_LONGDOUBLE, Constants.XSD_DOUBLE);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_FLOAT, Constants.XSD_FLOAT);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_DOUBLE, Constants.XSD_DOUBLE);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_LONGDOUBLE, Constants.XSD_DOUBLE);
// <integer_type>
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_SHORT, Constants.XSD_SHORT);
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_LONG, Constants.XSD_INT);
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_LONGLONG, Constants.XSD_LONG);
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_USHORT, Constants.XSD_UNSIGNEDSHORT);
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_ULONG, Constants.XSD_UNSIGNEDINT);
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_ULONGLONG, Constants.XSD_UNSIGNEDLONG);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_SHORT, Constants.XSD_SHORT);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_LONG, Constants.XSD_INT);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_LONGLONG, Constants.XSD_LONG);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_USHORT, Constants.XSD_UNSIGNEDSHORT);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_ULONG, Constants.XSD_UNSIGNEDINT);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_ULONGLONG, Constants.XSD_UNSIGNEDLONG);
// <char_type>
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_CHAR, Constants.XSD_BYTE);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_CHAR, Constants.XSD_BYTE);
// <wide_char_type>
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_WCHAR, Constants.XSD_STRING);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_WCHAR, Constants.XSD_STRING);
// <boolean_type>
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_BOOLEAN, Constants.XSD_BOOLEAN);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_BOOLEAN, Constants.XSD_BOOLEAN);
// <octet_type>
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_OCTET, Constants.XSD_UNSIGNEDBYTE);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_OCTET, Constants.XSD_UNSIGNEDBYTE);
// <any_type>
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_ANY, Constants.XSD_ANY);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_ANY, Constants.XSD_ANY);
// <object_type>
@@ -70,9 +71,9 @@
//<template_type_spec>
// <string_type>
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_STRING, Constants.XSD_STRING);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_STRING, Constants.XSD_STRING);
// <wide_string_type>
- xmlSchemaPrimitiveMap.put(CORBAConstants.NT_CORBA_WSTRING, Constants.XSD_STRING);
+ xmlSchemaPrimitiveMap.put(CorbaConstants.NT_CORBA_WSTRING, Constants.XSD_STRING);
}
public QName get(QName key) {
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java Fri Sep 29 06:49:48 2006
@@ -33,7 +33,7 @@
import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.CORBAConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class ArrayVisitor extends TypesVisitorBase {
@@ -82,9 +82,9 @@
corbaSeq.setQName(new QName(typeMap.getTargetNamespace(), name));
corbaSeq.setType(ct.getQName());
corbaSeq.setElemtype(TypesUtils.findCorbaType(getCorbaTypeMap(), stype.getQName()).getQName());
- corbaSeq.setRepositoryID(CORBAConstants.REPO_STRING
+ corbaSeq.setRepositoryID(CorbaConstants.REPO_STRING
+ name
- + CORBAConstants.IDL_VERSION);
+ + CorbaConstants.IDL_VERSION);
getCorbaTypeMap().getStructOrExceptionOrUnion().add(corbaSeq);
setSchemaType(ct);
setCorbaType(corbaSeq);
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/EnumVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/EnumVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/EnumVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/EnumVisitor.java Fri Sep 29 06:49:48 2006
@@ -35,7 +35,7 @@
import org.apache.ws.commons.schema.constants.Constants;
-import org.apache.yoko.tools.common.CORBAConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class EnumVisitor extends TypesVisitorBase {
@@ -62,9 +62,9 @@
// corba:enum
Enum corbaEnum = new Enum();
corbaEnum.setQName(new QName(typeMap.getTargetNamespace(), enumNameNode.toString()));
- corbaEnum.setRepositoryID(CORBAConstants.REPO_STRING
+ corbaEnum.setRepositoryID(CorbaConstants.REPO_STRING
+ enumNameNode.toString()
- + CORBAConstants.IDL_VERSION);
+ + CorbaConstants.IDL_VERSION);
corbaEnum.setType(enumSchemaSimpleType.getQName());
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ExceptionVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ExceptionVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ExceptionVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/ExceptionVisitor.java Fri Sep 29 06:49:48 2006
@@ -34,7 +34,7 @@
import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.CORBAConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class ExceptionVisitor extends TypesVisitorBase {
@@ -67,9 +67,9 @@
Exception exception = new Exception();
exception.setQName(new QName(typeMap.getTargetNamespace(), exceptionName));
exception.setType(complexType.getQName());
- exception.setRepositoryID(CORBAConstants.REPO_STRING
+ exception.setRepositoryID(CorbaConstants.REPO_STRING
+ exceptionName
- + CORBAConstants.IDL_VERSION);
+ + CorbaConstants.IDL_VERSION);
// exception members
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java Fri Sep 29 06:49:48 2006
@@ -34,7 +34,7 @@
import org.apache.ws.commons.schema.XmlSchemaTotalDigitsFacet;
import org.apache.ws.commons.schema.constants.Constants;
-import org.apache.yoko.tools.common.CORBAConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class FixedVisitor extends TypesVisitorBase {
@@ -110,9 +110,9 @@
corbaFixed.setQName(new QName(typeMap.getTargetNamespace(), identifierNode.toString()));
corbaFixed.setDigits(digits);
corbaFixed.setScale(scale);
- corbaFixed.setRepositoryID(CORBAConstants.REPO_STRING
+ corbaFixed.setRepositoryID(CorbaConstants.REPO_STRING
+ identifierNode.toString()
- + CORBAConstants.IDL_VERSION);
+ + CorbaConstants.IDL_VERSION);
//corbaFixed.setType(Constants.XSD_DECIMAL);
corbaFixed.setType(fixedSimpleType.getQName());
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java Fri Sep 29 06:49:48 2006
@@ -33,8 +33,8 @@
import antlr.collections.AST;
import org.apache.schemas.yoko.bindings.corba.AddressType;
-import org.apache.yoko.tools.common.CORBAConstants;
import org.apache.yoko.tools.common.ToolCorbaConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.objectweb.celtix.tools.common.Processor;
import org.objectweb.celtix.tools.common.ProcessorEnvironment;
@@ -75,7 +75,7 @@
String tns = (String) env.get(ToolCorbaConstants.CFG_TNS);
if (tns == null) {
- tns = CORBAConstants.WSDL_NS_URI + idl;
+ tns = CorbaConstants.WSDL_NS_URI + idl;
}
try {
@@ -126,7 +126,7 @@
port.setName(portTypeName + "CORBAPort");
AddressType address =
(AddressType) def.getExtensionRegistry().createExtension(Port.class,
- CORBAConstants.NE_CORBA_ADDRESS);
+ CorbaConstants.NE_CORBA_ADDRESS);
String addr = (String) env.get(ToolCorbaConstants.CFG_ADDRESS);
if (addr == null) {
addr = "IOR:";
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java Fri Sep 29 06:49:48 2006
@@ -32,7 +32,7 @@
import org.apache.schemas.yoko.bindings.corba.OperationType;
-import org.apache.yoko.tools.common.CORBAConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class OperationVisitor implements ASTVisitor {
@@ -80,7 +80,7 @@
OperationType operationType = null;
try {
operationType = (OperationType)extReg.createExtension(BindingOperation.class,
- CORBAConstants.NE_CORBA_OPERATION);
+ CorbaConstants.NE_CORBA_OPERATION);
} catch (WSDLException ex) {
throw new RuntimeException(ex);
}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java Fri Sep 29 06:49:48 2006
@@ -35,7 +35,7 @@
import org.apache.schemas.yoko.bindings.corba.BindingType;
-import org.apache.yoko.tools.common.CORBAConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class PortTypeVisitor implements ASTVisitor {
@@ -109,10 +109,10 @@
try {
BindingType bindingType = (BindingType)
- extReg.createExtension(Binding.class, CORBAConstants.NE_CORBA_BINDING);
- bindingType.setRepositoryID(CORBAConstants.REPO_STRING
+ extReg.createExtension(Binding.class, CorbaConstants.NE_CORBA_BINDING);
+ bindingType.setRepositoryID(CorbaConstants.REPO_STRING
+ portType.getQName().getLocalPart().replace('.', '/')
- + CORBAConstants.IDL_VERSION);
+ + CorbaConstants.IDL_VERSION);
binding.addExtensibilityElement(bindingType);
} catch (WSDLException ex) {
throw new RuntimeException(ex);
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/StructVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/StructVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/StructVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/StructVisitor.java Fri Sep 29 06:49:48 2006
@@ -34,7 +34,7 @@
import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.CORBAConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class StructVisitor extends TypesVisitorBase {
@@ -59,9 +59,9 @@
Struct struct = new Struct();
struct.setQName(new QName(typeMap.getTargetNamespace(), structName));
struct.setType(complexType.getQName());
- struct.setRepositoryID(CORBAConstants.REPO_STRING
+ struct.setRepositoryID(CorbaConstants.REPO_STRING
+ structName
- + CORBAConstants.IDL_VERSION);
+ + CorbaConstants.IDL_VERSION);
// struct members
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesUtils.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesUtils.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesUtils.java Fri Sep 29 06:49:48 2006
@@ -30,9 +30,9 @@
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.CORBAConstants;
import org.apache.yoko.tools.common.CorbaPrimitiveMap;
import org.apache.yoko.tools.common.XmlSchemaPrimitiveMap;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
public final class TypesUtils {
@@ -103,64 +103,64 @@
if ((node.getNextSibling() != null)
&& (node.getNextSibling().getType() == IDLTokenTypes.LITERAL_long)) {
// long long
- result = CORBAConstants.NT_CORBA_LONGLONG;
+ result = CorbaConstants.NT_CORBA_LONGLONG;
} else if ((node.getFirstChild() != null)
&& (node.getFirstChild().getType() == IDLTokenTypes.LITERAL_double)) {
// "double" node is a child of "long" node - instead of being a sibling
// long double
- result = CORBAConstants.NT_CORBA_LONGDOUBLE;
+ result = CorbaConstants.NT_CORBA_LONGDOUBLE;
} else {
// long
- result = CORBAConstants.NT_CORBA_LONG;
+ result = CorbaConstants.NT_CORBA_LONG;
}
break;
case IDLTokenTypes.LITERAL_unsigned:
AST node2 = node.getNextSibling();
if (node2 != null && node2.getType() == IDLTokenTypes.LITERAL_short) {
// unsigned short
- result = CORBAConstants.NT_CORBA_USHORT;
+ result = CorbaConstants.NT_CORBA_USHORT;
} else if (node2 != null && node2.getType() == IDLTokenTypes.LITERAL_long) {
AST node3 = node2.getNextSibling();
if (node3 != null && node3.getType() == IDLTokenTypes.LITERAL_long) {
// unsigned long long
- result = CORBAConstants.NT_CORBA_ULONGLONG;
+ result = CorbaConstants.NT_CORBA_ULONGLONG;
} else {
// unsigned long
- result = CORBAConstants.NT_CORBA_ULONG;
+ result = CorbaConstants.NT_CORBA_ULONG;
}
} else {
// TBD: we should never get here
}
break;
case IDLTokenTypes.LITERAL_short:
- result = CORBAConstants.NT_CORBA_SHORT;
+ result = CorbaConstants.NT_CORBA_SHORT;
break;
case IDLTokenTypes.LITERAL_float:
- result = CORBAConstants.NT_CORBA_FLOAT;
+ result = CorbaConstants.NT_CORBA_FLOAT;
break;
case IDLTokenTypes.LITERAL_double:
- result = CORBAConstants.NT_CORBA_DOUBLE;
+ result = CorbaConstants.NT_CORBA_DOUBLE;
break;
case IDLTokenTypes.LITERAL_char:
- result = CORBAConstants.NT_CORBA_CHAR;
+ result = CorbaConstants.NT_CORBA_CHAR;
break;
case IDLTokenTypes.LITERAL_wchar:
- result = CORBAConstants.NT_CORBA_WCHAR;
+ result = CorbaConstants.NT_CORBA_WCHAR;
break;
case IDLTokenTypes.LITERAL_string:
- result = CORBAConstants.NT_CORBA_STRING;
+ result = CorbaConstants.NT_CORBA_STRING;
break;
case IDLTokenTypes.LITERAL_wstring:
- result = CORBAConstants.NT_CORBA_WSTRING;
+ result = CorbaConstants.NT_CORBA_WSTRING;
break;
case IDLTokenTypes.LITERAL_boolean:
- result = CORBAConstants.NT_CORBA_BOOLEAN;
+ result = CorbaConstants.NT_CORBA_BOOLEAN;
break;
case IDLTokenTypes.LITERAL_octet:
- result = CORBAConstants.NT_CORBA_OCTET;
+ result = CorbaConstants.NT_CORBA_OCTET;
break;
case IDLTokenTypes.LITERAL_any:
- result = CORBAConstants.NT_CORBA_ANY;
+ result = CorbaConstants.NT_CORBA_ANY;
break;
default:
// TBD
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java Fri Sep 29 06:49:48 2006
@@ -45,8 +45,7 @@
import org.apache.ws.commons.schema.XmlSchemaSerializer;
import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.CORBAConstants;
-
+import org.apache.yoko.wsdl.CorbaConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
public class TypesVisitor implements ASTVisitor {
@@ -241,10 +240,10 @@
private void createCorbaTypeMap() throws WSDLException {
typeMap = (TypeMappingType)
definition.getExtensionRegistry().createExtension(Definition.class,
- CORBAConstants.NE_CORBA_TYPEMAPPING);
+ CorbaConstants.NE_CORBA_TYPEMAPPING);
typeMap.setTargetNamespace(definition.getTargetNamespace()
+ "/"
- + CORBAConstants.NS_CORBA_TYPEMAP);
+ + CorbaConstants.NS_CORBA_TYPEMAP);
definition.addExtensibilityElement(typeMap);
}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/UnionVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/UnionVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/UnionVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/UnionVisitor.java Fri Sep 29 06:49:48 2006
@@ -36,7 +36,7 @@
import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.CORBAConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
public class UnionVisitor extends TypesVisitorBase {
@@ -76,9 +76,9 @@
// corba:union
Union corbaUnion = new Union();
corbaUnion.setQName(new QName(typeMap.getTargetNamespace(), identifierNode.toString()));
- corbaUnion.setRepositoryID(CORBAConstants.REPO_STRING
+ corbaUnion.setRepositoryID(CorbaConstants.REPO_STRING
+ identifierNode.toString()
- + CORBAConstants.IDL_VERSION);
+ + CorbaConstants.IDL_VERSION);
corbaUnion.setType(unionSchemaComplexType.getQName());
corbaUnion.setDiscriminator(TypesUtils.findCorbaType(typeMap, type.getQName()).getQName());
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java Fri Sep 29 06:49:48 2006
@@ -44,8 +44,8 @@
import org.apache.schemas.yoko.bindings.corba.OperationType;
import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-import org.apache.yoko.tools.common.CORBAConstants;
import org.apache.yoko.tools.common.WSDLUtils;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.objectweb.celtix.tools.common.WSDLConstants;
import org.objectweb.celtix.wsdl.JAXBExtensionHelper;
@@ -66,7 +66,7 @@
definition.addNamespace(WSDLConstants.XSD_PREFIX, WSDLConstants.XSD_NAMESPACE);
definition.addNamespace(WSDLConstants.SOAP_PREFIX, WSDLConstants.SOAP11_NAMESPACE);
definition.addNamespace(WSDLConstants.TNS_PREFIX, tns);
- definition.addNamespace(CORBAConstants.NP_WSDL_CORBA, CORBAConstants.NU_WSDL_CORBA);
+ definition.addNamespace(CorbaConstants.NP_WSDL_CORBA, CorbaConstants.NU_WSDL_CORBA);
addCorbaExtensions(definition.getExtensionRegistry());
initVisitors();
}
@@ -117,7 +117,7 @@
List extElements = binding.getExtensibilityElements();
for (int i = 0; i < extElements.size(); i++) {
ExtensibilityElement el = (ExtensibilityElement) extElements.get(i);
- if (el.getElementType().equals(CORBAConstants.NE_CORBA_BINDING)) {
+ if (el.getElementType().equals(CorbaConstants.NE_CORBA_BINDING)) {
result.add(binding);
break;
}
@@ -143,12 +143,12 @@
JAXBExtensionHelper.addExtensions(extReg, Definition.class, TypeMappingType.class);
JAXBExtensionHelper.addExtensions(extReg, Port.class, AddressType.class);
- extReg.mapExtensionTypes(Binding.class, CORBAConstants.NE_CORBA_BINDING, BindingType.class);
- extReg.mapExtensionTypes(BindingOperation.class, CORBAConstants.NE_CORBA_OPERATION,
+ extReg.mapExtensionTypes(Binding.class, CorbaConstants.NE_CORBA_BINDING, BindingType.class);
+ extReg.mapExtensionTypes(BindingOperation.class, CorbaConstants.NE_CORBA_OPERATION,
org.apache.schemas.yoko.bindings.corba.OperationType.class);
- extReg.mapExtensionTypes(Definition.class, CORBAConstants.NE_CORBA_TYPEMAPPING,
+ extReg.mapExtensionTypes(Definition.class, CorbaConstants.NE_CORBA_TYPEMAPPING,
TypeMappingType.class);
- extReg.mapExtensionTypes(Port.class, CORBAConstants.NE_CORBA_ADDRESS,
+ extReg.mapExtensionTypes(Port.class, CorbaConstants.NE_CORBA_ADDRESS,
org.apache.schemas.yoko.bindings.corba.AddressType.class);
} catch (javax.xml.bind.JAXBException ex) {
throw new JAXBException(ex.getMessage());
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java Fri Sep 29 06:49:48 2006
@@ -84,10 +84,10 @@
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeList;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.CORBAConstants;
import org.apache.yoko.tools.common.CorbaPrimitiveMap;
import org.apache.yoko.tools.common.ReferenceConstants;
import org.apache.yoko.tools.common.W3CConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
import org.objectweb.celtix.common.logging.LogUtils;
import org.objectweb.celtix.wsdl.JAXBExtensionHelper;
@@ -279,10 +279,10 @@
}
// jwsdl model should have all other bindings in it.
- String pfx = definition.getPrefix(CORBAConstants.NU_WSDL_CORBA);
+ String pfx = definition.getPrefix(CorbaConstants.NU_WSDL_CORBA);
if (pfx == null) {
pfx = new String("corba");
- def.addNamespace(pfx, CORBAConstants.NU_WSDL_CORBA);
+ def.addNamespace(pfx, CorbaConstants.NU_WSDL_CORBA);
}
Binding binding = null;
@@ -298,7 +298,7 @@
try {
bindingType = (BindingType)extReg
- .createExtension(Binding.class, CORBAConstants.NE_CORBA_BINDING);
+ .createExtension(Binding.class, CorbaConstants.NE_CORBA_BINDING);
bindingType.setRepositoryID(repoString
+ binding.getPortType().getQName().getLocalPart().replace('.', '/')
+ idlversion);
@@ -362,12 +362,12 @@
JAXBExtensionHelper.addExtensions(extReg, Port.class,
org.apache.schemas.yoko.bindings.corba.AddressType.class);
- extReg.mapExtensionTypes(Binding.class, CORBAConstants.NE_CORBA_BINDING, BindingType.class);
- extReg.mapExtensionTypes(BindingOperation.class, CORBAConstants.NE_CORBA_OPERATION,
+ extReg.mapExtensionTypes(Binding.class, CorbaConstants.NE_CORBA_BINDING, BindingType.class);
+ extReg.mapExtensionTypes(BindingOperation.class, CorbaConstants.NE_CORBA_OPERATION,
org.apache.schemas.yoko.bindings.corba.OperationType.class);
- extReg.mapExtensionTypes(Definition.class, CORBAConstants.NE_CORBA_TYPEMAPPING,
+ extReg.mapExtensionTypes(Definition.class, CorbaConstants.NE_CORBA_TYPEMAPPING,
TypeMappingType.class);
- extReg.mapExtensionTypes(Port.class, CORBAConstants.NE_CORBA_ADDRESS,
+ extReg.mapExtensionTypes(Port.class, CorbaConstants.NE_CORBA_ADDRESS,
org.apache.schemas.yoko.bindings.corba.AddressType.class);
} catch (javax.xml.bind.JAXBException ex) {
LOG.log(Level.SEVERE, "Failing to serialize/deserialize extensions", ex);
@@ -381,7 +381,7 @@
OperationType operationType = null;
try {
operationType = (OperationType)extReg.createExtension(BindingOperation.class,
- CORBAConstants.NE_CORBA_OPERATION);
+ CorbaConstants.NE_CORBA_OPERATION);
} catch (WSDLException wse) {
LOG.log(Level.SEVERE, "Failed to create a Binding Operation extension", wse);
throw new Exception(LOG.toString(), wse);
@@ -419,7 +419,7 @@
private void addCorbaTypes(Definition definition) throws Exception {
try {
typeMappingType = (TypeMappingType)extReg
- .createExtension(Definition.class, CORBAConstants.NE_CORBA_TYPEMAPPING);
+ .createExtension(Definition.class, CorbaConstants.NE_CORBA_TYPEMAPPING);
CorbaTypeImpl corbaTypeImpl = null;
typeMappingType.setTargetNamespace(getIdlNamespace());
@@ -1517,7 +1517,7 @@
nilUnion.setName(name.getLocalPart());
nilUnion.setType(schemaType);
nilUnion.setQName(name);
- nilUnion.setDiscriminator(CORBAConstants.NT_CORBA_BOOLEAN);
+ nilUnion.setDiscriminator(CorbaConstants.NT_CORBA_BOOLEAN);
String id = repoString + nilUnion.getQName().getLocalPart().replace('.', '/') + idlversion;
nilUnion.setRepositoryID(id);
@@ -1703,7 +1703,7 @@
corbaUnion.setRepositoryID(id);
//Set Integer as Discriminator
- corbaUnion.setDiscriminator(CORBAConstants.NT_CORBA_LONG);
+ corbaUnion.setDiscriminator(CorbaConstants.NT_CORBA_LONG);
List fields = processContainerAsMembers(choice, defaultName, schematypeName);
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java Fri Sep 29 06:49:48 2006
@@ -56,7 +56,6 @@
import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
import org.apache.schemas.yoko.bindings.corba.Union;
import org.apache.schemas.yoko.bindings.corba.Unionbranch;
-import org.apache.yoko.tools.common.CORBAConstants;
import org.apache.yoko.tools.common.idltypes.CorbaUtils;
import org.apache.yoko.tools.common.idltypes.IdlAnonArray;
import org.apache.yoko.tools.common.idltypes.IdlAnonFixed;
@@ -83,6 +82,7 @@
import org.apache.yoko.tools.common.idltypes.IdlUnionBranch;
import org.apache.yoko.tools.utils.FileOutputStreamFactory;
import org.apache.yoko.tools.utils.OutputStreamFactory;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
import org.objectweb.celtix.common.logging.LogUtils;
import org.objectweb.celtix.wsdl.JAXBExtensionHelper;
@@ -142,12 +142,12 @@
JAXBExtensionHelper.addExtensions(extReg, Port.class,
org.apache.schemas.yoko.bindings.corba.AddressType.class);
- extReg.mapExtensionTypes(Binding.class, CORBAConstants.NE_CORBA_BINDING, BindingType.class);
- extReg.mapExtensionTypes(BindingOperation.class, CORBAConstants.NE_CORBA_OPERATION,
+ extReg.mapExtensionTypes(Binding.class, CorbaConstants.NE_CORBA_BINDING, BindingType.class);
+ extReg.mapExtensionTypes(BindingOperation.class, CorbaConstants.NE_CORBA_OPERATION,
org.apache.schemas.yoko.bindings.corba.OperationType.class);
- extReg.mapExtensionTypes(Definition.class, CORBAConstants.NE_CORBA_TYPEMAPPING,
+ extReg.mapExtensionTypes(Definition.class, CorbaConstants.NE_CORBA_TYPEMAPPING,
TypeMappingType.class);
- extReg.mapExtensionTypes(Port.class, CORBAConstants.NE_CORBA_ADDRESS,
+ extReg.mapExtensionTypes(Port.class, CorbaConstants.NE_CORBA_ADDRESS,
org.apache.schemas.yoko.bindings.corba.AddressType.class);
} catch (javax.xml.bind.JAXBException ex) {
@@ -366,7 +366,7 @@
CorbaTypeImpl corbatypeImpl) {
IdlType idlType = null;
- if (ntype.getNamespaceURI().equals(CORBAConstants.NU_WSDL_CORBA)) {
+ if (ntype.getNamespaceURI().equals(CorbaConstants.NU_WSDL_CORBA)) {
try {
idlType = createPrimitiveType(ntype, local);
} catch (Exception ex) {
@@ -414,7 +414,7 @@
* If we find a corba:dateTime then add the TimeBase.idl to the include
* list for the root.
*/
- if (idlType.equals(CORBAConstants.NT_CORBA_DATETIME)) {
+ if (idlType.equals(CorbaConstants.NT_CORBA_DATETIME)) {
root.addInclude("<omg/TimeBase.idl>");
}
return (IdlType)result;
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLTypes.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLTypes.java?view=diff&rev=451290&r1=451289&r2=451290
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLTypes.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLTypes.java Fri Sep 29 06:49:48 2006
@@ -46,8 +46,8 @@
import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
import org.apache.ws.commons.schema.XmlSchemaTotalDigitsFacet;
-import org.apache.yoko.tools.common.CORBAConstants;
import org.apache.yoko.tools.common.W3CConstants;
+import org.apache.yoko.wsdl.CorbaConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
import org.objectweb.celtix.common.logging.LogUtils;
@@ -202,7 +202,7 @@
anonString.setBound(bound);
anonString.setName(name.getLocalPart());
anonString.setQName(name);
- anonString.setType(CORBAConstants.NT_CORBA_STRING);
+ anonString.setType(CorbaConstants.NT_CORBA_STRING);
corbaTypeImpl = anonString;
}
return corbaTypeImpl;
@@ -355,9 +355,9 @@
seq.setName(name.getLocalPart());
seq.setQName(name);
seq.setType(stype);
- seq.setElemtype(CORBAConstants.NT_CORBA_OCTET);
+ seq.setElemtype(CorbaConstants.NT_CORBA_OCTET);
seq.setBound(bound);
return seq;
}
-}
\ No newline at end of file
+}