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 2007/05/25 13:39:55 UTC
svn commit: r541645 - in
/incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba:
interceptors/CorbaStreamOutEndingInterceptor.java
interceptors/CorbaStreamOutInterceptor.java types/CorbaHandlerUtils.java
utils/CorbaUtils.java
Author: bravi
Date: Fri May 25 06:39:54 2007
New Revision: 541645
URL: http://svn.apache.org/viewvc?view=rev&rev=541645
Log: (empty)
Modified:
incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutEndingInterceptor.java
incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutInterceptor.java
incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java
incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java
Modified: incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutEndingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutEndingInterceptor.java?view=diff&rev=541645&r1=541644&r2=541645
==============================================================================
--- incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutEndingInterceptor.java (original)
+++ incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutEndingInterceptor.java Fri May 25 06:39:54 2007
@@ -21,12 +21,10 @@
import java.util.Iterator;
import java.util.List;
-import java.util.logging.Logger;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -55,7 +53,6 @@
public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Message> {
- private static final Logger LOG = LogUtils.getL7dLogger(CorbaStreamOutEndingInterceptor.class);
private org.omg.CORBA.ORB orb;
private CorbaTypeMap typeMap;
private ServiceInfo service;
Modified: incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutInterceptor.java?view=diff&rev=541645&r1=541644&r2=541645
==============================================================================
--- incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutInterceptor.java (original)
+++ incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamOutInterceptor.java Fri May 25 06:39:54 2007
@@ -22,11 +22,9 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.logging.Logger;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -48,8 +46,6 @@
public class CorbaStreamOutInterceptor extends AbstractPhaseInterceptor<Message> {
- private static final Logger LOG = LogUtils.getL7dLogger(CorbaStreamOutInterceptor.class);
-
private org.omg.CORBA.ORB orb;
private CorbaTypeMap typeMap;
private ServiceInfo service;
Modified: incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java?view=diff&rev=541645&r1=541644&r2=541645
==============================================================================
--- incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java (original)
+++ incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java Fri May 25 06:39:54 2007
@@ -20,12 +20,9 @@
import java.util.Iterator;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.xml.namespace.QName;
-import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.schemas.yoko.bindings.corba.Alias;
@@ -60,8 +57,6 @@
public class CorbaHandlerUtils {
- private static final Logger LOG = LogUtils.getL7dLogger(CorbaHandlerUtils.class);
-
public static CorbaObjectHandler createTypeHandler(ORB orb,
QName name,
QName idlType,
@@ -179,7 +174,6 @@
initializeSequenceHandler(orb, obj, name, schemaType, typeMap, serviceInfo);
break;
case TCKind._tk_struct:
- //obj.setXmlSchemaObject(schemaType);
initializeStructHandler(orb, obj, name, schemaType, typeMap, serviceInfo);
break;
case TCKind._tk_union:
@@ -232,11 +226,7 @@
Exception exceptType = (Exception)obj.getType();
List<MemberType> exceptMembers = exceptType.getMember();
XmlSchemaComplexType ctype = (XmlSchemaComplexType) schemaType;
- QName qname = name;
- if (ctype.getQName() != null) {
- qname = ctype.getQName();
- }
- String nsURI = getNamespaceURI(serviceInfo, qname);
+ String nsURI = name.getNamespaceURI();
XmlSchemaGroupBase group = (XmlSchemaGroupBase) ctype.getParticle();
for (int i = 0; i < exceptMembers.size(); ++i) {
MemberType member = exceptMembers.get(i);
@@ -307,12 +297,8 @@
XmlSchemaObjectCollection members = null;
XmlSchemaObject stype = schemaType;
- QName qname = name;
if (schemaType instanceof XmlSchemaElement) {
XmlSchemaElement el = (XmlSchemaElement) schemaType;
- if (el.getQName() != null) {
- qname = el.getQName();
- }
stype = el.getSchemaType();
if (stype == null) {
stype = CorbaUtils.getXmlSchemaType(serviceInfo, el.getRefName());
@@ -320,9 +306,6 @@
}
if (stype instanceof XmlSchemaComplexType) {
XmlSchemaComplexType ctype = (XmlSchemaComplexType) stype;
- if (ctype.getQName() != null) {
- qname = ctype.getQName();
- }
attrs = ctype.getAttributes();
stype = ctype.getParticle();
}
@@ -331,7 +314,7 @@
} else if (stype instanceof XmlSchemaGroupBase) {
members = ((XmlSchemaGroupBase) stype).getItems();
}
- String nsURI = getNamespaceURI(serviceInfo, qname);
+ String nsURI = name.getNamespaceURI();
int attrCount = 0;
int memberCount = 0;
for (int i = 0; i < structMembers.size(); ++i) {
@@ -375,12 +358,8 @@
boolean isAttr = false;
boolean isElementNil = false;
XmlSchemaObject stype = schemaType;
- QName qname = name;
if (schemaType instanceof XmlSchemaAttribute) {
XmlSchemaAttribute attr = (XmlSchemaAttribute) schemaType;
- if (attr.getQName() != null) {
- qname = attr.getQName();
- }
isAttr = true;
} else if (schemaType instanceof XmlSchemaElement) {
XmlSchemaElement el = (XmlSchemaElement) schemaType;
@@ -388,15 +367,12 @@
//should not write the start Element.
isElementNil = true;
}
- if (el.getQName() != null) {
- qname = el.getQName();
- }
stype = el.getSchemaType();
if (stype == null) {
stype = CorbaUtils.getXmlSchemaType(serviceInfo, el.getRefName());
}
}
- String nsURI = getNamespaceURI(serviceInfo, qname);
+ String nsURI = name.getNamespaceURI();
// Now handle all of the branches
List<Unionbranch> unionBranches = unionType.getUnionbranch();
for (Iterator<Unionbranch> iter = unionBranches.iterator(); iter.hasNext();) {
@@ -462,55 +438,44 @@
}
CorbaTypeListener result = null;
if (CorbaUtils.isPrimitiveIdlType(idlType)) {
- LOG.log(Level.INFO, "Reading primitive type from XML reader");
handler = new CorbaPrimitiveHandler(name, idlType, tc, null);
result = new CorbaPrimitiveListener(handler);
} else {
CorbaTypeImpl type = CorbaUtils.getCorbaType(idlType, typeMap);
switch (tc.kind().value()) {
case TCKind._tk_any:
- LOG.log(Level.INFO, "Reading any type from XML reader");
break;
case TCKind._tk_array:
- LOG.log(Level.INFO, "Reading array type from XML reader");
handler = new CorbaArrayHandler(name, idlType, tc, type);
result = new CorbaArrayListener(handler, typeMap, orb);
break;
case TCKind._tk_enum:
- LOG.log(Level.INFO, "Reading enumeration type from XML reader");
handler = new CorbaEnumHandler(name, idlType, tc, type);
result = new CorbaEnumListener(handler);
break;
case TCKind._tk_except:
- LOG.log(Level.INFO, "Reading exception type from XML reader");
handler = new CorbaExceptionHandler(name, idlType, tc, type);
result = new CorbaExceptionListener(handler, typeMap, orb);
break;
case TCKind._tk_fixed:
- LOG.log(Level.INFO, "Reading fixed type from XML reader");
handler = new CorbaFixedHandler(name, idlType, tc, type);
result = new CorbaFixedListener(handler);
break;
case TCKind._tk_sequence:
- LOG.log(Level.INFO, "Reading sequence type from XML reader");
handler = new CorbaSequenceHandler(name, idlType, tc, type);
result = new CorbaSequenceListener(handler, typeMap, orb);
break;
case TCKind._tk_string:
case TCKind._tk_wstring:
// These will be the case if we have anonymous strings
- LOG.log(Level.INFO, "Reading anonymous string from XML reader");
break;
case TCKind._tk_struct:
- LOG.log(Level.INFO, "Reading struct type from XML reader");
handler = new CorbaStructHandler(name, idlType, tc, type);
result = new CorbaStructListener(handler, typeMap, orb);
break;
case TCKind._tk_union:
- LOG.log(Level.INFO, "Reading union type from XML reader");
break;
case TCKind._tk_objref:
- LOG.log(Level.INFO, "Reading object reference from XML reader");
handler =
new CorbaObjectReferenceHandler(name, idlType, tc, type);
result = new CorbaObjectReferenceListener(handler, orb);
@@ -535,35 +500,27 @@
} else {
switch (tc.kind().value()) {
case TCKind._tk_any:
- LOG.log(Level.INFO, "Reading any type from XML reader");
break;
case TCKind._tk_array:
- LOG.log(Level.INFO, "Reading array type from XML reader");
result = new CorbaArrayEventProducer(handler, typeMap, serviceInfo, orb);
break;
case TCKind._tk_enum:
- LOG.log(Level.INFO, "Reading enumeration type from XML reader");
result = new CorbaEnumEventProducer(handler, serviceInfo);
break;
case TCKind._tk_except:
- LOG.log(Level.INFO, "Reading exception type from XML reader");
result = new CorbaExceptionEventProducer(handler, typeMap, serviceInfo, orb);
break;
case TCKind._tk_fixed:
- LOG.log(Level.INFO, "Reading fixed type from XML reader");
result = new CorbaFixedEventProducer(handler, serviceInfo);
break;
case TCKind._tk_sequence:
- LOG.log(Level.INFO, "Reading sequence type from XML reader");
result = new CorbaSequenceEventProducer(handler, typeMap, serviceInfo, orb);
break;
case TCKind._tk_string:
case TCKind._tk_wstring:
// These will be the case if we have anonymous strings
- LOG.log(Level.INFO, "Reading anonymous string from XML reader");
break;
case TCKind._tk_struct:
- LOG.log(Level.INFO, "Reading struct type from XML reader");
if (handler.isAnonymousType()) {
result = new CorbaAnonStructEventProducer(handler, typeMap, serviceInfo, orb);
} else {
@@ -571,10 +528,8 @@
}
break;
case TCKind._tk_union:
- LOG.log(Level.INFO, "Reading union type from XML reader");
break;
case TCKind._tk_objref:
- LOG.log(Level.INFO, "Reading object reference from XML reader");
result = new CorbaObjectReferenceEventProducer(handler, serviceInfo, orb);
break;
default:
Modified: incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java?view=diff&rev=541645&r1=541644&r2=541645
==============================================================================
--- incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java (original)
+++ incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java Fri May 25 06:39:54 2007
@@ -42,7 +42,6 @@
import org.apache.schemas.yoko.bindings.corba.Anonwstring;
import org.apache.schemas.yoko.bindings.corba.Array;
import org.apache.schemas.yoko.bindings.corba.CaseType;
-//import org.apache.schemas.yoko.bindings.corba.Const;
import org.apache.schemas.yoko.bindings.corba.CorbaType;
import org.apache.schemas.yoko.bindings.corba.Enum;
import org.apache.schemas.yoko.bindings.corba.Enumerator;
@@ -89,7 +88,10 @@
return getTypeCode(orb, type, null, typeMap);
}
- public static TypeCode getTypeCode(ORB orb, QName type, CorbaType obj, CorbaTypeMap typeMap) {
+ public static TypeCode getTypeCode(ORB orb,
+ QName type,
+ CorbaType obj,
+ CorbaTypeMap typeMap) {
TypeCode tc = null;
// first see if it is a primitive
tc = getPrimitiveTypeCode(orb, type);