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/10/02 17:50:36 UTC
svn commit: r452146 [2/2] - in /incubator/yoko: branches/cxf_port/
trunk/api/ trunk/api/src/main/resources/schemas/wsdl/ trunk/bindings/
trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/
trunk/bindings/src/main/java/org/apache/yoko/bindings...
Added: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaInInterceptor.java?view=auto&rev=452146
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaInInterceptor.java (added)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaInInterceptor.java Mon Oct 2 10:50:34 2006
@@ -0,0 +1,40 @@
+/**
+ * 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.corba2.interceptors;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+
+public class CorbaInInterceptor extends AbstractPhaseInterceptor<Message> {
+
+ public CorbaInInterceptor() {
+ super();
+ setPhase(Phase.RECEIVE);
+ }
+
+ public void handleMessage(Message message) {
+ XMLStreamReader reader = message.getContent(XMLStreamReader.class);
+ assert reader != null;
+ System.out.println("handleMessage() in CorbaInInterceptor...");
+ }
+}
Propchange: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaInInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaInInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaOutInterceptor.java?view=auto&rev=452146
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaOutInterceptor.java (added)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaOutInterceptor.java Mon Oct 2 10:50:34 2006
@@ -0,0 +1,41 @@
+/**
+ * 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.corba2.interceptors;
+
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.cxf.message.Message;
+
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+
+public class CorbaOutInterceptor extends AbstractPhaseInterceptor<Message> {
+
+ public CorbaOutInterceptor() {
+ super();
+ setPhase(Phase.SEND);
+ }
+
+ public void handleMessage(Message message) {
+ XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
+ assert writer != null;
+ System.out.println("handleMessage() in CorbaOutInterceptor...");
+ }
+}
Propchange: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaOutInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba2/interceptors/CorbaOutInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/yoko/trunk/bindings/src/main/resources/META-INF/bus-extensions.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/resources/META-INF/bus-extensions.xml?view=auto&rev=452146
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/resources/META-INF/bus-extensions.xml (added)
+++ incubator/yoko/trunk/bindings/src/main/resources/META-INF/bus-extensions.xml Mon Oct 2 10:50:34 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<extensions xmlns="http://cxf.apache.org/bus/extension">
+
+ <extension class="org.apache.yoko.bindings.corba2.CorbaBindingFactory" deferred="true">
+ <namespace>http://schemas.apache.org/yoko/bindings/corba</namespace>
+ </extension>
+
+</extensions>
Propchange: incubator/yoko/trunk/bindings/src/main/resources/META-INF/bus-extensions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/yoko/trunk/bindings/src/main/resources/META-INF/bus-extensions.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/yoko/trunk/bindings/src/main/resources/META-INF/bus-extensions.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/yoko/trunk/bindings/src/main/resources/META-INF/cxf/cxf-extension.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/resources/META-INF/cxf/cxf-extension.xml?view=auto&rev=452146
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/resources/META-INF/cxf/cxf-extension.xml (added)
+++ incubator/yoko/trunk/bindings/src/main/resources/META-INF/cxf/cxf-extension.xml Mon Oct 2 10:50:34 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean class="org.apache.yoko.bindings.corba2.CorbaBindingFactory" lazy-init="true">
+ <property name="bus" ref="cxf"/>
+ <property name="activationNamespaces">
+ <set>
+ <value>http://schemas.apache.org/yoko/bindings/corba</value>
+ </set>
+ </property>
+ </bean>
+</beans>
Propchange: incubator/yoko/trunk/bindings/src/main/resources/META-INF/cxf/cxf-extension.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/yoko/trunk/bindings/src/main/resources/META-INF/cxf/cxf-extension.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/yoko/trunk/bindings/src/main/resources/META-INF/cxf/cxf-extension.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml?view=auto&rev=452146
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml (added)
+++ incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml Mon Oct 2 10:50:34 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+ <entry key="org.apache.yoko.bindings.corba-1">javax.wsdl.Binding=org.apache.schemas.yoko.bindings.corba.BindingType</entry>
+ <entry key="org.apache.yoko.bindings.corba-2">javax.wsdl.Port=org.apache.schemas.yoko.bindings.corba.AddressType</entry>
+ <entry key="org.apache.yoko.bindings.corba-3">javax.wsdl.BindingOperation=org.apache.schemas.yoko.bindings.corba.OperationType</entry>
+ <entry key="org.apache.yoko.bindings.corba-4">javax.wsdl.Definition=org.apache.schemas.yoko.bindings.corba.TypeMappingType</entry>
+</properties>
Propchange: incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/yoko/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/pom.xml?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/pom.xml (original)
+++ incubator/yoko/trunk/tools/pom.xml Mon Oct 2 10:50:34 2006
@@ -23,8 +23,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.objectweb.celtix</groupId>
- <artifactId>celtix-api</artifactId>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
@@ -38,6 +42,11 @@
<groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
</dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>2.9</version>
+ </dependency>
</dependencies>
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/IDLToWSDL.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/IDLToWSDL.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/IDLToWSDL.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/IDLToWSDL.java Mon Oct 2 10:50:34 2006
@@ -23,25 +23,25 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.tools.common.AbstractCXFToolContainer;
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.common.toolspec.ToolRunner;
+import org.apache.cxf.tools.common.toolspec.ToolSpec;
+import org.apache.cxf.tools.common.toolspec.parser.BadUsageException;
+import org.apache.cxf.tools.common.toolspec.parser.CommandDocument;
+import org.apache.cxf.tools.common.toolspec.parser.ErrorVisitor;
+
import org.apache.yoko.tools.common.ToolCorbaConstants;
import org.apache.yoko.tools.processors.idl.IDLToWSDLProcessor;
-import org.objectweb.celtix.common.i18n.Message;
-import org.objectweb.celtix.tools.AbstractCeltixToolContainer;
-import org.objectweb.celtix.tools.common.ProcessorEnvironment;
-import org.objectweb.celtix.tools.common.ToolConstants;
-import org.objectweb.celtix.tools.common.ToolException;
-import org.objectweb.celtix.tools.common.toolspec.ToolRunner;
-import org.objectweb.celtix.tools.common.toolspec.ToolSpec;
-import org.objectweb.celtix.tools.common.toolspec.parser.BadUsageException;
-import org.objectweb.celtix.tools.common.toolspec.parser.CommandDocument;
-import org.objectweb.celtix.tools.common.toolspec.parser.ErrorVisitor;
-
/**
* This class can converts an IDL to a WSDL with CORBA binding information
*/
-public class IDLToWSDL extends AbstractCeltixToolContainer {
+public class IDLToWSDL extends AbstractCXFToolContainer {
static final String TOOL_NAME = "idltowsdl";
private static String[] args;
@@ -56,12 +56,12 @@
public void execute(boolean exitOnFinish) {
IDLToWSDLProcessor idlProcessor = new IDLToWSDLProcessor();
- ProcessorEnvironment env = null;
+ ToolContext env = null;
try {
super.execute(exitOnFinish);
if (!hasInfoOption()) {
- env = new ProcessorEnvironment();
+ env = new ToolContext();
env.setParameters(getParametersMap(getArrayKeys()));
if (isVerboseOn()) {
env.put(ToolConstants.CFG_VERBOSE, Boolean.TRUE);
@@ -92,7 +92,7 @@
}
}
- private void initialise(ProcessorEnvironment env) throws ToolException {
+ private void initialise(ToolContext env) throws ToolException {
CommandDocument doc = super.getCommandDocument();
if (env.optionSet(ToolCorbaConstants.CFG_IDLFILE)) {
@@ -132,7 +132,7 @@
}
}
- private void validate(ProcessorEnvironment env) throws ToolException {
+ private void validate(ToolContext env) throws ToolException {
String outdir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
if (outdir != null) {
File dir = new File(outdir);
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/WSDLToIDL.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/WSDLToIDL.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/WSDLToIDL.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/WSDLToIDL.java Mon Oct 2 10:50:34 2006
@@ -23,25 +23,26 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.tools.common.AbstractCXFToolContainer;
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.common.toolspec.ToolRunner;
+import org.apache.cxf.tools.common.toolspec.ToolSpec;
+import org.apache.cxf.tools.common.toolspec.parser.BadUsageException;
+import org.apache.cxf.tools.common.toolspec.parser.CommandDocument;
+import org.apache.cxf.tools.common.toolspec.parser.ErrorVisitor;
+
import org.apache.yoko.tools.common.ToolCorbaConstants;
import org.apache.yoko.tools.processors.wsdl.WSDLToCorbaProcessor;
-import org.objectweb.celtix.common.i18n.Message;
-import org.objectweb.celtix.tools.AbstractCeltixToolContainer;
-import org.objectweb.celtix.tools.common.ProcessorEnvironment;
-import org.objectweb.celtix.tools.common.ToolConstants;
-import org.objectweb.celtix.tools.common.ToolException;
-import org.objectweb.celtix.tools.common.toolspec.ToolRunner;
-import org.objectweb.celtix.tools.common.toolspec.ToolSpec;
-import org.objectweb.celtix.tools.common.toolspec.parser.BadUsageException;
-import org.objectweb.celtix.tools.common.toolspec.parser.CommandDocument;
-import org.objectweb.celtix.tools.common.toolspec.parser.ErrorVisitor;
/**
* This class can augment a plain WSDL definition with CORBA binding
* information, and can take WSDL CORBA binding information and convert it into
* the equivalent CORBA IDL.
*/
-public class WSDLToIDL extends AbstractCeltixToolContainer {
+public class WSDLToIDL extends AbstractCXFToolContainer {
static final String TOOL_NAME = "wsdltoidl";
private static String[] args;
@@ -58,12 +59,12 @@
public void execute(boolean exitOnFinish) {
WSDLToCorbaProcessor corbaProcessor = new WSDLToCorbaProcessor();
- ProcessorEnvironment env = null;
+ ToolContext env = null;
try {
super.execute(exitOnFinish);
if (!hasInfoOption()) {
- env = new ProcessorEnvironment();
+ env = new ToolContext();
env.setParameters(getParametersMap(getArrayKeys()));
if (isVerboseOn()) {
env.put(ToolConstants.CFG_VERBOSE, Boolean.TRUE);
@@ -103,7 +104,7 @@
}
}
- private void initialise(ProcessorEnvironment env) throws ToolException {
+ private void initialise(ToolContext env) throws ToolException {
CommandDocument doc = super.getCommandDocument();
if (env.optionSet(ToolConstants.CFG_BINDING)) {
@@ -157,7 +158,7 @@
}
}
- private void validate(ProcessorEnvironment env) throws ToolException {
+ private void validate(ToolContext env) throws ToolException {
String outdir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
if (outdir != null) {
File dir = new File(outdir);
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/WSDLUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/WSDLUtils.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/WSDLUtils.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/WSDLUtils.java Mon Oct 2 10:50:34 2006
@@ -26,7 +26,7 @@
import javax.wsdl.WSDLException;
import javax.wsdl.xml.WSDLWriter;
-import org.objectweb.celtix.tools.utils.FileWriterUtil;
+import org.apache.cxf.tools.util.FileWriterUtil;
public final class WSDLUtils {
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlArray.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlArray.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlArray.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlArray.java Mon Oct 2 10:50:34 2006
@@ -23,7 +23,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.objectweb.celtix.common.logging.LogUtils;
+import org.apache.cxf.common.logging.LogUtils;
public final class IdlArray extends IdlArrayBase {
@@ -50,4 +50,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlField.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlField.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlField.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlField.java Mon Oct 2 10:50:34 2006
@@ -24,7 +24,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.objectweb.celtix.common.logging.LogUtils;
+import org.apache.cxf.common.logging.LogUtils;
public class IdlField extends IdlDefnImplBase {
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlParam.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlParam.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlParam.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlParam.java Mon Oct 2 10:50:34 2006
@@ -24,7 +24,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.objectweb.celtix.common.logging.LogUtils;
+import org.apache.cxf.common.logging.LogUtils;
public final class IdlParam extends IdlDefnImplBase {
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlSequence.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlSequence.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlSequence.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlSequence.java Mon Oct 2 10:50:34 2006
@@ -23,7 +23,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.objectweb.celtix.common.logging.LogUtils;
+import org.apache.cxf.common.logging.LogUtils;
public final class IdlSequence extends IdlSequenceBase {
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlStruct.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlStruct.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlStruct.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/idltypes/IdlStruct.java Mon Oct 2 10:50:34 2006
@@ -23,7 +23,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.objectweb.celtix.common.logging.LogUtils;
+import org.apache.cxf.common.logging.LogUtils;
public final class IdlStruct extends IdlStructBase {
private static final Logger LOG = LogUtils.getL7dLogger(IdlStruct.class);
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=452146&r1=452145&r2=452146
==============================================================================
--- 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 Mon Oct 2 10:50:34 2006
@@ -32,20 +32,20 @@
import antlr.collections.AST;
+import org.apache.cxf.tools.common.Processor;
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.util.FileWriterUtil;
+
import org.apache.schemas.yoko.bindings.corba.AddressType;
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;
-import org.objectweb.celtix.tools.common.ToolConstants;
-import org.objectweb.celtix.tools.common.ToolException;
-import org.objectweb.celtix.tools.utils.FileWriterUtil;
-
public class IDLToWSDLProcessor implements Processor {
private String idl;
- private ProcessorEnvironment env;
+ private ToolContext env;
private Writer outputWriter;
public void process() throws ToolException {
@@ -94,11 +94,11 @@
}
}
- public void setEnvironment(ProcessorEnvironment penv) {
+ public void setEnvironment(ToolContext penv) {
env = penv;
}
- public ProcessorEnvironment getEnvironment() {
+ public ToolContext getEnvironment() {
return env;
}
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=452146&r1=452145&r2=452146
==============================================================================
--- 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 Mon Oct 2 10:50:34 2006
@@ -39,6 +39,9 @@
import antlr.ASTVisitor;
import antlr.collections.AST;
+import org.apache.cxf.tools.common.WSDLConstants;
+import org.apache.cxf.wsdl.JAXBExtensionHelper;
+
import org.apache.schemas.yoko.bindings.corba.AddressType;
import org.apache.schemas.yoko.bindings.corba.BindingType;
import org.apache.schemas.yoko.bindings.corba.OperationType;
@@ -46,9 +49,6 @@
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;
public class WSDLASTVisitor implements ASTVisitor {
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=452146&r1=452145&r2=452146
==============================================================================
--- 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 Mon Oct 2 10:50:34 2006
@@ -48,6 +48,9 @@
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.wsdl.JAXBExtensionHelper;
+
import org.apache.schemas.yoko.bindings.corba.ArgType;
import org.apache.schemas.yoko.bindings.corba.BindingType;
import org.apache.schemas.yoko.bindings.corba.CaseType;
@@ -89,8 +92,6 @@
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;
public class WSDLToCorbaBinding {
protected static final Logger LOG = LogUtils.getL7dLogger(WSDLToCorbaBinding.class);
@@ -201,7 +202,7 @@
Map portTypes = def.getPortTypes();
if (portTypes == null) {
- org.objectweb.celtix.common.i18n.Message msg = new org.objectweb.celtix.common.i18n.Message(
+ org.apache.cxf.common.i18n.Message msg = new org.apache.cxf.common.i18n.Message(
"No PortTypes defined in wsdl", LOG);
throw new Exception(msg.toString());
} else {
@@ -226,8 +227,8 @@
private void throwMultiplePortTypeException(Map portTypes) throws Exception {
StringBuffer sb = new StringBuffer();
- org.objectweb.celtix.common.i18n.Message msgDef =
- new org.objectweb.celtix.common.i18n.Message("Multiple PortTypes defined in wsdl", LOG);
+ org.apache.cxf.common.i18n.Message msgDef =
+ new org.apache.cxf.common.i18n.Message("Multiple PortTypes defined in wsdl", LOG);
sb.append(msgDef.toString());
Iterator it2 = portTypes.keySet().iterator();
int cnt = 0;
@@ -272,8 +273,8 @@
if (queryBinding(definition, bqname)) {
String msgStr = "Binding " + bqname.getLocalPart()
+ " already exists in WSDL.";
- org.objectweb.celtix.common.i18n.Message msg =
- new org.objectweb.celtix.common.i18n.Message(msgStr, LOG);
+ org.apache.cxf.common.i18n.Message msg =
+ new org.apache.cxf.common.i18n.Message(msgStr, LOG);
throw new Exception(msg.toString());
}
}
@@ -580,16 +581,16 @@
} else {
String msgStr = "Fault " + fault.getMessage().getQName().getLocalPart()
+ " INCORRECT_FAULT_MSG.";
- org.objectweb.celtix.common.i18n.Message msg =
- new org.objectweb.celtix.common.i18n.Message(msgStr, LOG);
+ org.apache.cxf.common.i18n.Message msg =
+ new org.apache.cxf.common.i18n.Message(msgStr, LOG);
throw new Exception(msg.toString());
}
if (corbaex == null) {
String msgStr = "Fault " + fault.getMessage().getQName().getLocalPart()
+ " UNSUPPORTED_FAULT.";
- org.objectweb.celtix.common.i18n.Message msg =
- new org.objectweb.celtix.common.i18n.Message(msgStr, LOG);
+ org.apache.cxf.common.i18n.Message msg =
+ new org.apache.cxf.common.i18n.Message(msgStr, LOG);
throw new Exception(msg.toString());
} else {
// Set the repository ID for Exception
@@ -878,7 +879,7 @@
if ((type instanceof Struct) && (struct.getMember().size() == 0)) {
String msgStr = "Cannot create CORBA Struct" + struct.getName()
+ "from container with no members";
- org.objectweb.celtix.common.i18n.Message msg = new org.objectweb.celtix.common.i18n.Message(
+ org.apache.cxf.common.i18n.Message msg = new org.apache.cxf.common.i18n.Message(
msgStr, LOG);
throw new Exception(msg.toString());
}
@@ -1477,7 +1478,7 @@
}
} else {
- org.objectweb.celtix.common.i18n.Message msg = new org.objectweb.celtix.common.i18n.Message(
+ org.apache.cxf.common.i18n.Message msg = new org.apache.cxf.common.i18n.Message(
"Restriction inside ComplexContent is not yet Supported.", LOG);
//throw new Exception(msg.toString());
return null;
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java Mon Oct 2 10:50:34 2006
@@ -27,15 +27,15 @@
import javax.wsdl.Definition;
import javax.xml.bind.JAXBException;
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.common.ToolException;
+
import org.apache.yoko.tools.common.ToolCorbaConstants;
import org.apache.yoko.tools.common.WSDLUtils;
-import org.objectweb.celtix.common.i18n.Message;
-import org.objectweb.celtix.common.logging.LogUtils;
-import org.objectweb.celtix.tools.common.ProcessorEnvironment;
-import org.objectweb.celtix.tools.common.ToolConstants;
-import org.objectweb.celtix.tools.common.ToolException;
-
public class WSDLToCorbaProcessor extends WSDLToProcessor {
protected static final Logger LOG = LogUtils.getL7dLogger(WSDLToCorbaProcessor.class);
@@ -47,7 +47,7 @@
String outputdir = ".";
String wsdlOutput;
String idlOutput;
- ProcessorEnvironment env;
+ ToolContext env;
public void process() throws ToolException {
Definition def = null;
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=452146&r1=452145&r2=452146
==============================================================================
--- 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 Mon Oct 2 10:50:34 2006
@@ -37,6 +37,9 @@
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.wsdl.JAXBExtensionHelper;
+
import org.apache.schemas.yoko.bindings.corba.Anonarray;
import org.apache.schemas.yoko.bindings.corba.Anonfixed;
import org.apache.schemas.yoko.bindings.corba.Anonsequence;
@@ -84,8 +87,6 @@
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;
public class WSDLToIDLAction {
@@ -123,8 +124,8 @@
Binding binding = findBinding(def);
if (binding == null) {
String msgStr = "Binding " + bindingName + " doesn't exists in WSDL.";
- org.objectweb.celtix.common.i18n.Message msg =
- new org.objectweb.celtix.common.i18n.Message(msgStr, LOG);
+ org.apache.cxf.common.i18n.Message msg =
+ new org.apache.cxf.common.i18n.Message(msgStr, LOG);
throw new Exception(msg.toString());
}
generateIDL(def, binding);
@@ -293,8 +294,8 @@
idlOp.addException((IdlException)type);
} else {
String msgStr = type.fullName() + " is not a type.";
- org.objectweb.celtix.common.i18n.Message msg =
- new org.objectweb.celtix.common.i18n.Message(msgStr, LOG);
+ org.apache.cxf.common.i18n.Message msg =
+ new org.apache.cxf.common.i18n.Message(msgStr, LOG);
throw new Exception(msg.toString());
}
}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java Mon Oct 2 10:50:34 2006
@@ -41,14 +41,14 @@
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.tools.common.Processor;
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.common.ToolException;
+
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.objectweb.celtix.common.logging.LogUtils;
-import org.objectweb.celtix.tools.common.Processor;
-import org.objectweb.celtix.tools.common.ProcessorEnvironment;
-import org.objectweb.celtix.tools.common.ToolException;
-
public class WSDLToProcessor implements Processor {
protected static final Logger LOG =
@@ -57,7 +57,7 @@
protected WSDLFactory wsdlFactory;
protected WSDLReader wsdlReader;
private XmlSchema schematype;
- private ProcessorEnvironment env;
+ private ToolContext env;
private ExtensionRegistry extReg;
private List<Definition> importedDefinitions = new ArrayList<Definition>();
private XmlSchemaCollection schemaCol = new XmlSchemaCollection();
@@ -84,8 +84,8 @@
parseImports(wsdlDefinition);
buildWSDLDefinition();
} catch (WSDLException we) {
- org.objectweb.celtix.common.i18n.Message msg =
- new org.objectweb.celtix.common.i18n.Message(
+ org.apache.cxf.common.i18n.Message msg =
+ new org.apache.cxf.common.i18n.Message(
"FAIL_TO_CREATE_WSDL_DEFINITION", LOG);
throw new ToolException(msg, we);
}
@@ -158,7 +158,7 @@
public void process() throws ToolException {
if (env == null) {
- env = new ProcessorEnvironment();
+ env = new ToolContext();
env.put("wsdlurl", wsdlDefinition.getDocumentBaseURI());
}
@@ -227,11 +227,11 @@
return this.schematypeList;
}
- public void setEnvironment(ProcessorEnvironment environement) {
+ public void setEnvironment(ToolContext environement) {
this.env = environement;
}
- public ProcessorEnvironment getEnvironment() {
+ public ToolContext getEnvironment() {
return this.env;
}
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=452146&r1=452145&r2=452146
==============================================================================
--- 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 Mon Oct 2 10:50:34 2006
@@ -26,6 +26,8 @@
import javax.xml.namespace.QName;
+import org.apache.cxf.common.logging.LogUtils;
+
import org.apache.schemas.yoko.bindings.corba.Anonarray;
import org.apache.schemas.yoko.bindings.corba.Anonfixed;
import org.apache.schemas.yoko.bindings.corba.Anonsequence;
@@ -49,7 +51,6 @@
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;
public final class WSDLTypes {
Modified: incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java (original)
+++ incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java Mon Oct 2 10:50:34 2006
@@ -28,9 +28,10 @@
import junit.framework.TestCase;
+import org.apache.cxf.tools.common.ToolContext;
+
import org.apache.yoko.tools.common.ToolCorbaConstants;
import org.apache.yoko.tools.processors.idl.IDLToWSDLProcessor;
-import org.objectweb.celtix.tools.common.ProcessorEnvironment;
public class IDLToWSDLGenerationTest extends TestCase {
@@ -55,7 +56,7 @@
String expectedWsdlFilename)
throws Exception {
URL idl = getClass().getResource(sourceIdlFilename);
- ProcessorEnvironment env = new ProcessorEnvironment();
+ ToolContext env = new ToolContext();
Map<String, Object> cfg = new HashMap<String, Object>();
cfg.put(ToolCorbaConstants.CFG_IDLFILE, idl.getFile());
env.setParameters(cfg);
Modified: incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/utils/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/utils/TestUtils.java?view=diff&rev=452146&r1=452145&r2=452146
==============================================================================
--- incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/utils/TestUtils.java (original)
+++ incubator/yoko/trunk/tools/src/test/java/org/apache/yoko/tools/utils/TestUtils.java Mon Oct 2 10:50:34 2006
@@ -21,8 +21,8 @@
import java.io.InputStream;
-import org.objectweb.celtix.tools.common.toolspec.ToolSpec;
-import org.objectweb.celtix.tools.common.toolspec.parser.CommandLineParser;
+import org.apache.cxf.tools.common.toolspec.ToolSpec;
+import org.apache.cxf.tools.common.toolspec.parser.CommandLineParser;
public class TestUtils {
private String mUsage;