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/06/01 19:05:38 UTC

svn commit: r410914 - in /incubator/yoko/trunk: ./ api/src/main/java/org/apache/yoko/wsdl/ bindings/src/main/java/org/apache/yoko/bindings/corba/ tools/

Author: bravi
Date: Thu Jun  1 12:05:37 2006
New Revision: 410914

URL: http://svn.apache.org/viewvc?rev=410914&view=rev
Log:
Updated the pom to pick up java.net repository & also updated the corba binding classes to the new celtix binding api's.

Modified:
    incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaTypeImpl.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerBinding.java
    incubator/yoko/trunk/pom.xml
    incubator/yoko/trunk/tools/pom.xml

Modified: incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaTypeImpl.java?rev=410914&r1=410913&r2=410914&view=diff
==============================================================================
--- incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaTypeImpl.java (original)
+++ incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaTypeImpl.java Thu Jun  1 12:05:37 2006
@@ -1,6 +1,6 @@
 package org.apache.yoko.wsdl;
 
-import javax.xml.bind.annotation.AccessType;
+import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
@@ -35,7 +35,7 @@
  * 
  */
 
-@XmlAccessorType(AccessType.FIELD)
+@XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "corbaTypeImpl")
 public class CorbaTypeImpl 
       extends CorbaType {

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java?rev=410914&r1=410913&r2=410914&view=diff
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java Thu Jun  1 12:05:37 2006
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import javax.wsdl.WSDLException;
-import javax.xml.ws.Endpoint;
 
 import org.objectweb.celtix.Bus;
 import org.objectweb.celtix.bindings.BindingFactory;
@@ -28,9 +27,8 @@
     }
 
     public ServerBinding createServerBinding(EndpointReferenceType reference,
-                                             Endpoint ep,
                                              ServerBindingEndpointCallback cbFactory)
         throws WSDLException, IOException {
-        return new CorbaServerBinding(bus, reference, ep, cbFactory);
+        return new CorbaServerBinding(bus, reference, cbFactory);
     }
 }

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerBinding.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerBinding.java?rev=410914&r1=410913&r2=410914&view=diff
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerBinding.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaServerBinding.java Thu Jun  1 12:05:37 2006
@@ -5,7 +5,6 @@
 //import java.util.logging.Level;
 //import java.util.logging.Logger;
 
-import javax.xml.ws.Endpoint;
 import javax.xml.ws.handler.MessageContext;
 
 import org.objectweb.celtix.Bus;
@@ -22,9 +21,8 @@
     
     public CorbaServerBinding(Bus b,
                               EndpointReferenceType ref,
-                              Endpoint ep,
                               ServerBindingEndpointCallback cbFactory) {
-        super(b, ref, ep, cbFactory);
+        super(b, ref, cbFactory);
         corbaBinding = new CorbaBindingImpl(b, ref, true);
     }
     
@@ -40,5 +38,10 @@
     public boolean isBindingCompatible(String address) {
         // TODO - add support for files which contain IORs
         return address.startsWith("IOR:") || address.startsWith("corbaloc:");
+    }
+
+    public javax.xml.namespace.QName getOperationName(MessageContext ctx) {
+        // TODO - provide implementation
+        return null;
     }
 }

Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?rev=410914&r1=410913&r2=410914&view=diff
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Thu Jun  1 12:05:37 2006
@@ -26,7 +26,6 @@
     <!-- These properties should be defined in top level pom.xml -->
      <properties>
         <celtix.version>1.1-SNAPSHOT</celtix.version>
-        <jaxws.version>2.0-JAXWS-2.0-EA3</jaxws.version>
         <compiler.version>2.0.1</compiler.version>
         <javadoc.version>2.0-beta-3</javadoc.version>
         <jar.version>2.0</jar.version>
@@ -167,6 +166,12 @@
           <snapshots>
               <enabled>true</enabled>
           </snapshots>
+      </repository>
+      <repository>
+          <id>java.net</id>
+          <name>java.net Maven Repository</name>
+          <url>https://maven-repository.dev.java.net/nonav/repository/</url>
+          <layout>legacy</layout>
       </repository>
   </repositories>
  

Modified: incubator/yoko/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/pom.xml?rev=410914&r1=410913&r2=410914&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/pom.xml (original)
+++ incubator/yoko/trunk/tools/pom.xml Thu Jun  1 12:05:37 2006
@@ -31,11 +31,6 @@
             <scope>test</scope>
         </dependency>         -->
         <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>1.5.2</version>
-        </dependency>
-        <dependency>
             <groupId>org.objectweb.celtix</groupId>
             <artifactId>celtix-api</artifactId>
             <version>${celtix.version}</version>
@@ -44,16 +39,6 @@
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-api</artifactId>
             <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xerces</artifactId>
-            <version>2.4.0</version>
         </dependency>
         
     </dependencies>