cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r606739 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/common/xmlschema/ rt/javascript/ rt/javascript/src/main/java/org/apache/cxf/javascript/ rt/javascript/src/test/java/org/apache/cxf/javascript/ rt/javascript/src/t...
Date Mon, 24 Dec 2007 21:17:46 GMT
Author: bimargulies
Date: Mon Dec 24 13:17:44 2007
New Revision: 606739

URL: http://svn.apache.org/viewvc?rev=606739&view=rev
Log:
Remodularize tests to allow for Aegis. Then hit anyType, and come to a temporary halt.

Added:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java   (with props)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java   (with props)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisService.java   (with props)
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisServiceImpl.java   (with props)
    incubator/cxf/trunk/rt/javascript/src/test/resources/AegisBeans.xml   (with props)
    incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AegisTests.js   (with props)
Removed:
    incubator/cxf/trunk/systests/src/test/resources/cxf1220Beans.xml
Modified:
    incubator/cxf/trunk/rt/javascript/pom.xml
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties
    incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
    incubator/cxf/trunk/rt/javascript/src/test/resources/AnyBeans.xml
    incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitBareClientTestBeans.xml
    incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml
    incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml
    incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml
    incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml
    incubator/cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml
    incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AnyTests.js

Added: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java?rev=606739&view=auto
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java (added)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java Mon Dec 24 13:17:44 2007
@@ -0,0 +1,32 @@
+/**
+ * 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.cxf.common.xmlschema;
+
+import javax.xml.namespace.QName;
+
+/**
+ * This class holds constants related to XML Schema. Over time, some of the contents
+ * of WSDLConstants should move here.
+ */
+public final class XmlSchemaConstants {
+    
+    public static final String XSD_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema";
+    public static final QName ANY_TYPE_QNAME = new QName(XSD_NAMESPACE_URI, "anyType");
+}

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/javascript/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/pom.xml?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/pom.xml (original)
+++ incubator/cxf/trunk/rt/javascript/pom.xml Mon Dec 24 13:17:44 2007
@@ -59,6 +59,13 @@
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-databinding-aegis</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-local</artifactId>
             <version>${project.version}</version>            
         </dependency>

Modified: incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java Mon Dec 24 13:17:44 2007
@@ -292,7 +292,8 @@
     
     /**
      * Generate code to serialize an xs:any.
-     * There is too much duplicate code the element serializer; fix that some day.
+     * There is too much duplicate code with 
+     * the element serializer; fix that some day.
      * @param elementInfo
      * @param schemaCollection
      */

Modified: incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties (original)
+++ incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties Mon Dec 24 13:17:44 2007
@@ -27,4 +27,4 @@
 ELEMENT_TYPE_MISSING=Element {0} references type {1} which is not defined.
 ELEMENT_SCHEMA_MISSING=Element {0} contained in missing schema.
 IMPOSSIBLE_GLOBAL_ITEM= JavaScript limitation: Element or xs:any at {0} used in a context that requires a global name, but it, and its type, are anonymous.
-
+MISSING_TYPE=Type {0} is missing from the WSDL schema for element {1}. {2}

Modified: incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java Mon Dec 24 13:17:44 2007
@@ -26,6 +26,7 @@
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
+import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaObject;
@@ -33,8 +34,8 @@
 import org.apache.ws.commons.schema.XmlSchemaType;
 
 /**
- * All the information needed to create the JavaScript for an Xml Schema
- * element or xs:any.
+ * All the information needed to create the JavaScript for an Xml Schema element
+ * or xs:any.
  */
 public final class ParticleInfo {
     private static final Logger LOG = LogUtils.getL7dLogger(ParticleInfo.class);
@@ -51,6 +52,7 @@
     private long maxOccurs;
     private boolean nillable;
     private boolean any;
+    private boolean anyType;
     private String defaultValue;
     private boolean global;
 
@@ -58,17 +60,18 @@
     }
 
     /**
-     * Create an elementInfo that stores information about a global, named, element.
-     * @param element the element   
+     * Create an elementInfo that stores information about a global, named,
+     * element.
+     * 
+     * @param element the element
      * @param currentSchema the schema it came from.
      * @param schemaCollection the collection of all schemas.
      * @param prefixAccumulator the accumulator that assigns prefixes.
      * @return
      */
-    public static ParticleInfo forGlobalElement(XmlSchemaElement element, 
-                                               XmlSchema currentSchema, 
-                                               SchemaCollection schemaCollection,
-                                               NamespacePrefixAccumulator prefixAccumulator) {
+    public static ParticleInfo forGlobalElement(XmlSchemaElement element, XmlSchema currentSchema,
+                                                SchemaCollection schemaCollection,
+                                                NamespacePrefixAccumulator prefixAccumulator) {
         ParticleInfo elementInfo = new ParticleInfo();
         elementInfo.particle = element;
         elementInfo.minOccurs = element.getMinOccurs();
@@ -76,32 +79,26 @@
         elementInfo.nillable = element.isNillable();
         elementInfo.global = true;
 
-        factoryCommon(element, 
-                     currentSchema, 
-                     schemaCollection, 
-                     prefixAccumulator, 
-                     elementInfo);
+        factoryCommon(element, currentSchema, schemaCollection, prefixAccumulator, elementInfo);
         return elementInfo;
     }
-    
+
     /**
-     * Create element information for a part element.
-     * For a part, the JavaScript and Element names are 
-     * calculated in advance, and the element itself might be null! 
-     * In that case, the minOccurs and maxOccurs are conventional.
-     * Note that in some cases the code in ServiceJavascriptBuilder uses a local
+     * Create element information for a part element. For a part, the JavaScript
+     * and Element names are calculated in advance, and the element itself might
+     * be null! In that case, the minOccurs and maxOccurs are conventional. Note
+     * that in some cases the code in ServiceJavascriptBuilder uses a local
      * element (or xa:any) from inside the part element, instead of the part
-     * element itself.  
+     * element itself.
+     * 
      * @param element the element, or null
      * @param schemaCollection the schema collection, for resolving types.
      * @param javascriptName javascript variable name
      * @param xmlElementName xml element string
      * @return
      */
-    public static ParticleInfo forPartElement(XmlSchemaElement element,
-                                             SchemaCollection schemaCollection,
-                                             String javascriptName,
-                                             String xmlElementName) {
+    public static ParticleInfo forPartElement(XmlSchemaElement element, SchemaCollection schemaCollection,
+                                              String javascriptName, String xmlElementName) {
         ParticleInfo elementInfo = new ParticleInfo();
         elementInfo.particle = element;
         if (element == null) {
@@ -116,38 +113,35 @@
         elementInfo.javascriptName = javascriptName;
         elementInfo.xmlName = xmlElementName;
         elementInfo.global = true;
-        
+
         return elementInfo;
     }
 
     /**
      * Fill in an ElementInfo for an element or xs:any from a sequence.
+     * 
      * @param sequenceElement
      * @param currentSchema
      * @param schemaCollection
      * @param prefixAccumulator
      * @return
      */
-    public static ParticleInfo forLocalItem(XmlSchemaObject sequenceObject, 
-                                            XmlSchema currentSchema, 
+    public static ParticleInfo forLocalItem(XmlSchemaObject sequenceObject, XmlSchema currentSchema,
                                             SchemaCollection schemaCollection,
-                                            NamespacePrefixAccumulator prefixAccumulator,
-                                            QName contextName) {
-        XmlSchemaParticle sequenceParticle = 
-            XmlSchemaUtils.getObjectParticle(sequenceObject, contextName);
+                                            NamespacePrefixAccumulator prefixAccumulator, QName contextName) {
+        XmlSchemaParticle sequenceParticle = XmlSchemaUtils.getObjectParticle(sequenceObject, contextName);
         ParticleInfo elementInfo = new ParticleInfo();
         XmlSchemaParticle realParticle = sequenceParticle;
-        
+
         if (sequenceParticle instanceof XmlSchemaElement) {
-            XmlSchemaElement sequenceElement = (XmlSchemaElement) sequenceParticle;
+            XmlSchemaElement sequenceElement = (XmlSchemaElement)sequenceParticle;
 
             if (sequenceElement.getRefName() != null) {
-                XmlSchemaElement refElement = 
-                    schemaCollection.getElementByQName(sequenceElement.getRefName());
+                XmlSchemaElement refElement = schemaCollection
+                    .getElementByQName(sequenceElement.getRefName());
                 if (refElement == null) {
-                    Message message = new Message("ELEMENT_DANGLING_REFERENCE", LOG, 
-                                                  sequenceElement.getQName(),
-                                                  sequenceElement.getRefName());
+                    Message message = new Message("ELEMENT_DANGLING_REFERENCE", LOG, sequenceElement
+                        .getQName(), sequenceElement.getRefName());
                     throw new UnsupportedConstruct(message.toString());
                 }
                 realParticle = refElement;
@@ -155,29 +149,24 @@
             }
             elementInfo.nillable = ((XmlSchemaElement)realParticle).isNillable();
         }
-            
+
         elementInfo.minOccurs = sequenceParticle.getMinOccurs();
         elementInfo.maxOccurs = sequenceParticle.getMaxOccurs();
 
-        factoryCommon(realParticle, 
-                     currentSchema, 
-                     schemaCollection, 
-                     prefixAccumulator, 
-                     elementInfo);
-        
+        factoryCommon(realParticle, currentSchema, schemaCollection, prefixAccumulator, elementInfo);
+
         elementInfo.particle = realParticle;
 
         return elementInfo;
     }
 
-    private static void factoryCommon(XmlSchemaParticle particle, 
-                                      XmlSchema currentSchema,
+    private static void factoryCommon(XmlSchemaParticle particle, XmlSchema currentSchema,
                                       SchemaCollection schemaCollection,
                                       NamespacePrefixAccumulator prefixAccumulator, 
                                       ParticleInfo elementInfo) {
-        
+
         if (particle instanceof XmlSchemaElement) {
-            XmlSchemaElement element = (XmlSchemaElement) particle;
+            XmlSchemaElement element = (XmlSchemaElement)particle;
             String elementNamespaceURI = element.getQName().getNamespaceURI();
             boolean elementNoNamespace = "".equals(elementNamespaceURI);
 
@@ -190,13 +179,12 @@
             }
 
             boolean qualified = !elementNoNamespace
-                                && XmlSchemaUtils.isElementQualified(element, 
-                                                                     true, 
-                                                                     currentSchema, 
+                                && XmlSchemaUtils.isElementQualified(element, true, currentSchema,
                                                                      elementSchema);
             elementInfo.xmlName = prefixAccumulator.xmlElementString(element, qualified);
             // we are assuming here that we are not dealing, in close proximity,
-            // with elements with identical local names and different namespaces.
+            // with elements with identical local names and different
+            // namespaces.
             elementInfo.javascriptName = element.getQName().getLocalPart();
             elementInfo.defaultValue = element.getDefaultValue();
             factorySetupType(element, schemaCollection, elementInfo);
@@ -210,37 +198,45 @@
         }
     }
 
-    private static void factorySetupType(XmlSchemaElement element, 
-                                         SchemaCollection schemaCollection,
+    private static void factorySetupType(XmlSchemaElement element, SchemaCollection schemaCollection,
                                          ParticleInfo elementInfo) {
         elementInfo.type = element.getSchemaType();
         if (elementInfo.type == null) {
-            elementInfo.type = schemaCollection.getTypeByQName(element.getSchemaTypeName());
-            if (elementInfo.type == null) {
-                throw new RuntimeException("null type");
+            if (element.getSchemaTypeName().equals(XmlSchemaConstants.ANY_TYPE_QNAME)) {
+                elementInfo.anyType = true;
+            } else {
+                elementInfo.type = schemaCollection.getTypeByQName(element.getSchemaTypeName());
+                if (elementInfo.type == null 
+                    && !element.getSchemaTypeName()
+                            .getNamespaceURI().equals(XmlSchemaConstants.XSD_NAMESPACE_URI)) {
+                    XmlSchemaUtils.unsupportedConstruct("MISSING_TYPE", element.getSchemaTypeName()
+                            .toString(), element.getQName(), element);
+                }
             }
         }
     }
-    
+
     /**
-     * As a general rule, the JavaScript code is organized by types. The exception
-     * is global elements that have anonymous types. In those cases, the JavaScript code
-     * has its functions named according to the element. This method returns the QName 
-     * for the type or element, accordingly. If a schema has a local element with an
-     * anonymous, complex, type, this will throw. This will need to be fixed.
+     * As a general rule, the JavaScript code is organized by types. The
+     * exception is global elements that have anonymous types. In those cases,
+     * the JavaScript code has its functions named according to the element.
+     * This method returns the QName for the type or element, accordingly. If a
+     * schema has a local element with an anonymous, complex, type, this will
+     * throw. This will need to be fixed.
+     * 
      * @return the qname.
      */
     public QName getControllingName() {
         if (type != null && type.getQName() != null) {
             return type.getQName();
         } else if (particle instanceof XmlSchemaElement) {
-            XmlSchemaElement element = (XmlSchemaElement) particle;
+            XmlSchemaElement element = (XmlSchemaElement)particle;
             if (element.getQName() != null) {
                 return element.getQName();
-            } 
+            }
         }
-        Message message = new Message("IMPOSSIBLE_GLOBAL_ITEM", LOG, 
-                                      XmlSchemaUtils.cleanedUpSchemaSource(particle));
+        Message message = new Message("IMPOSSIBLE_GLOBAL_ITEM", LOG, XmlSchemaUtils
+            .cleanedUpSchemaSource(particle));
         LOG.severe(message.toString());
         throw new UnsupportedConstruct(message);
     }
@@ -252,7 +248,7 @@
     public String getJavascriptName() {
         return javascriptName;
     }
-    
+
     public void setJavascriptName(String name) {
         javascriptName = name;
     }
@@ -300,23 +296,30 @@
     public boolean isArray() {
         return maxOccurs > 1;
     }
-    
+
     public boolean isOptional() {
         return minOccurs == 0 && maxOccurs == 1;
     }
-    
-    /** 
+
+    /**
      * @return Returns the nillable flag for the element. False for 'xs:any'
      */
     public boolean isNillable() {
         return nillable;
     }
-    
+
     public boolean isAny() {
         return any;
     }
 
-    /** * @return Returns the defaultValue.
+    public boolean isAnyType() {
+        return anyType;
+    }
+
+    /**
+     * *
+     * 
+     * @return Returns the defaultValue.
      */
     public String getDefaultValue() {
         if (isOptional()) {
@@ -332,13 +335,13 @@
     public void setDefaultValue(String defaultValue) {
         this.defaultValue = defaultValue;
     }
-    
+
     /**
      * True if this describes a global, named, element.
+     * 
      * @return
      */
     public boolean isGlobal() {
         return global;
     }
 }
-

Added: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java?rev=606739&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java (added)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java Mon Dec 24 13:17:44 2007
@@ -0,0 +1,84 @@
+/**
+ * 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.cxf.javascript;
+
+import java.util.Collection;
+import java.util.logging.Logger;
+
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable;
+import org.apache.cxf.javascript.fortest.AegisServiceImpl;
+import org.junit.Before;
+import org.junit.Test;
+import org.mozilla.javascript.Context;
+import org.springframework.context.support.GenericApplicationContext;
+
+/*
+ * We end up here with a part with isElement == true, a non-array element, 
+ * but a complex type for an array of the element.
+ */
+@org.junit.Ignore
+public class AegisTest extends JavascriptRhinoTest {
+
+    private static final Logger LOG = LogUtils.getL7dLogger(AegisTest.class);
+
+    AegisServiceImpl implementor;
+
+    public AegisTest() throws Exception {
+        super();
+    }
+
+    @Override
+    protected void additionalSpringConfiguration(GenericApplicationContext context) throws Exception {
+    }
+    
+    @Override
+    protected String[] getConfigLocations() {
+        return new String[] {"classpath:AegisBeans.xml"};
+    }
+    
+    @Before
+    public void before() throws Exception {
+        setupRhino("aegis-service", 
+                   "/org/apache/cxf/javascript/AegisTests.js",
+                   true);
+        implementor = (AegisServiceImpl)rawImplementor;
+        implementor.reset();
+    }
+    
+    private Void acceptAny(Context context) {
+        LOG.info("About to call acceptAny with Raw XML" + getAddress());
+        testUtilities.rhinoCall("testAnyNToServerRaw",  
+                                testUtilities.javaToJS(getAddress()));
+        assertEquals("before items", implementor.getAcceptedString());
+        Collection<Object> something = implementor.getAcceptedCollection();
+        assertNotNull(something);
+        return null;
+    }
+    
+    @Test
+    public void callAcceptAny() {
+        testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
+            public Void run(Context context) {
+                return acceptAny(context);
+            }
+        });
+    }
+}

Propchange: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java Mon Dec 24 13:17:44 2007
@@ -59,18 +59,17 @@
     
     @Before
     public void before() throws Exception {
-        setupRhino("any-proxy-factory", 
-                   "any-service-endpoint", 
+        setupRhino("any-service-endpoint", 
                    "/org/apache/cxf/javascript/AnyTests.js",
                    true);
-        implementor = (AnyImpl)endpoint.getImplementor();
+        implementor = (AnyImpl)rawImplementor;
         implementor.reset();
     }
     
     private Void acceptOneChalk(Context context) {
-        LOG.info("About to call accept1 with Chalk" + endpoint.getAddress());
+        LOG.info("About to call accept1 with Chalk" + getAddress());
         testUtilities.rhinoCall("testAny1ToServerChalk",  
-                                testUtilities.javaToJS(endpoint.getAddress()));
+                                testUtilities.javaToJS(getAddress()));
         assertEquals("before chalk", implementor.getBefore());
         Object someAlternative = implementor.getAny1value();
         assertTrue(someAlternative instanceof Alternative1);
@@ -90,9 +89,9 @@
     }
     
     private Void acceptOneRaw(Context context) {
-        LOG.info("About to call accept1 with Raw XML" + endpoint.getAddress());
+        LOG.info("About to call accept1 with Raw XML" + getAddress());
         testUtilities.rhinoCall("testAny1ToServerRaw",  
-                                testUtilities.javaToJS(endpoint.getAddress()));
+                                testUtilities.javaToJS(getAddress()));
         assertEquals("before chalk", implementor.getBefore());
         Object something = implementor.getAny1value();
         assertNotNull(something);
@@ -103,7 +102,7 @@
         assertEquals("after chalk", implementor.getAfter());
         return null;
     }
-    
+
     @Test
     public void callAcceptOneRaw() {
         testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
@@ -112,11 +111,39 @@
             }
         });
     }
+    
+    private Void acceptNRaw(Context context) {
+        LOG.info("About to call acceptN with Raw XML" + getAddress());
+        testUtilities.rhinoCall("testAnyNToServerRaw",  
+                                testUtilities.javaToJS(getAddress()));
+        assertEquals("before chalk", implementor.getBefore());
+        Object[] something = implementor.getAnyNvalue();
+        assertNotNull(something);
+        assertTrue(something[0] instanceof Element);
+        Element walrus = (Element) something[0];
+        assertEquals("walrus", walrus.getNodeName());
+        assertEquals("tusks", walrus.getTextContent());
+        assertTrue(something[1] instanceof Element);
+        Element penguin = (Element) something[1];
+        assertEquals("penguin", penguin.getNodeName());
+        assertEquals("emperor", penguin.getTextContent());
+        assertEquals("after chalk", implementor.getAfter());
+        return null;
+    }
+    
+    @Test
+    public void callAcceptNRaw() {
+        testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
+            public Void run(Context context) {
+                return acceptNRaw(context);
+            }
+        });
+    }
 
     private Void returnAny1(Context context) {
         Notifier notifier = 
             testUtilities.rhinoCallConvert("testAny1ToClientChalk", Notifier.class, 
-                                           testUtilities.javaToJS(endpoint.getAddress()));
+                                           testUtilities.javaToJS(getAddress()));
         
         boolean notified = notifier.waitForJavascript(1000 * 10);
         assertTrue(notified);

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java Mon Dec 24 13:17:44 2007
@@ -59,11 +59,10 @@
     
     @Before
     public void before() throws Exception {
-        setupRhino("dlb-proxy-factory", 
-                   "dlb-service-endpoint", 
+        setupRhino("dlb-service-endpoint", 
                    "/org/apache/cxf/javascript/DocLitBareTests.js",
                    true);
-        implementor = (SimpleDocLitBareImpl)endpoint.getImplementor();
+        implementor = (SimpleDocLitBareImpl)rawImplementor;
         implementor.resetLastValues();
     }
 
@@ -90,10 +89,10 @@
         Scriptable jsBean1 = testBean1ToJS(testUtilities, context, b1);
         Scriptable jsBeanArray = context.newArray(testUtilities.getRhinoScope(), jsBeans);
         
-        LOG.info("About to call beanFunctionTest " + endpoint.getAddress());
+        LOG.info("About to call beanFunctionTest " + getAddress());
         Notifier notifier = 
             testUtilities.rhinoCallConvert("beanFunctionTest", Notifier.class, 
-                                           testUtilities.javaToJS(endpoint.getAddress()),
+                                           testUtilities.javaToJS(getAddress()),
                                            jsBean1,
                                            jsBeanArray);
         boolean notified = notifier.waitForJavascript(1000 * 10);
@@ -107,7 +106,7 @@
         Scriptable responseObject = (Scriptable)testUtilities.rhinoEvaluate("globalResponseObject");
         // there is no response, this thing returns 'void'
         assertNull(responseObject);
-        SimpleDocLitBareImpl impl = getBean(SimpleDocLitBareImpl.class, "dlb-service");
+        SimpleDocLitBareImpl impl = (SimpleDocLitBareImpl)rawImplementor;
         TestBean1 b1returned = impl.getLastBean1();
         assertEquals(b1, b1returned);
         // commented out until 
@@ -124,10 +123,10 @@
         
         Scriptable jsBean1 = testBean1ToJS(testUtilities, context, b1);
         
-        LOG.info("About to call compliant" + endpoint.getAddress());
+        LOG.info("About to call compliant" + getAddress());
         Notifier notifier = 
             testUtilities.rhinoCallConvert("compliantTest", Notifier.class, 
-                                           testUtilities.javaToJS(endpoint.getAddress()),
+                                           testUtilities.javaToJS(getAddress()),
                                            jsBean1);
         boolean notified = notifier.waitForJavascript(1000 * 10);
         assertTrue(notified);
@@ -143,10 +142,10 @@
     }
     
     private Void actionMethodCaller(Context context) {
-        LOG.info("About to call actionMethod" + endpoint.getAddress());
+        LOG.info("About to call actionMethod" + getAddress());
         Notifier notifier = 
             testUtilities.rhinoCallConvert("actionMethodTest", Notifier.class, 
-                                           testUtilities.javaToJS(endpoint.getAddress()),
+                                           testUtilities.javaToJS(getAddress()),
                                            "wrong");
         boolean notified = notifier.waitForJavascript(1000 * 10);
         assertTrue(notified);
@@ -162,19 +161,19 @@
     }
     
     private Void onewayCaller(Context context) {
-        LOG.info("About to call onewayMethod" + endpoint.getAddress());
+        LOG.info("About to call onewayMethod" + getAddress());
         testUtilities.rhinoCall("actionMethodTest",  
-                                testUtilities.javaToJS(endpoint.getAddress()),
+                                testUtilities.javaToJS(getAddress()),
                                 "corrigan");
         assertEquals("corrigan", implementor.getLastString());
         return null;
     }
     
     private Void compliantNoArgsCaller(Context context) {
-        LOG.info("About to call compliantNoArgs " + endpoint.getAddress());
+        LOG.info("About to call compliantNoArgs " + getAddress());
         Notifier notifier = 
             testUtilities.rhinoCallConvert("compliantNoArgsTest", Notifier.class, 
-                                           testUtilities.javaToJS(endpoint.getAddress()));
+                                           testUtilities.javaToJS(getAddress()));
 
         boolean notified = notifier.waitForJavascript(1000 * 10);
         assertTrue(notified);

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java Mon Dec 24 13:17:44 2007
@@ -53,8 +53,7 @@
 
     @Before
     public void before() throws Exception {
-        setupRhino("dlw-proxy-factory", 
-                   "dlw-service-endpoint", 
+        setupRhino("dlw-service-endpoint", 
                    "/org/apache/cxf/javascript/DocLitWrappedTests.js", 
                    false);
     }
@@ -88,10 +87,10 @@
         Scriptable jsBean1 = testBean1ToJS(testUtilities, context, b1);
         Scriptable jsBeanArray = context.newArray(testUtilities.getRhinoScope(), jsBeans);
         
-        LOG.info("About to call test4 " + endpoint.getAddress());
+        LOG.info("About to call test4 " + getAddress());
         Notifier notifier = 
             testUtilities.rhinoCallConvert("test4", Notifier.class, 
-                                           testUtilities.javaToJS(endpoint.getAddress()),
+                                           testUtilities.javaToJS(getAddress()),
                                            testUtilities.javaToJS(Boolean.valueOf(useWrapper)),
                                            jsBean1,
                                            jsBeanArray);
@@ -107,7 +106,7 @@
         Object responseObject = testUtilities.rhinoEvaluate("globalResponseObject");
         assertNotNull(responseObject);
         assertEquals(Context.getUndefinedValue(), responseObject);
-        SimpleDocLitWrappedImpl impl = getBean(SimpleDocLitWrappedImpl.class, "dlw-service");
+        SimpleDocLitWrappedImpl impl = (SimpleDocLitWrappedImpl)rawImplementor; 
         TestBean1 b1returned = impl.getLastBean1();
         assertEquals(b1, b1returned);
         TestBean1[] beansReturned = impl.getLastBean1Array();
@@ -140,10 +139,10 @@
     public void callIntReturnMethod() {
         testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
             public Void run(Context context) {
-                LOG.info("About to call test3/IntFunction" + endpoint.getAddress());
+                LOG.info("About to call test3/IntFunction" + getAddress());
                 Notifier notifier = 
                     testUtilities.rhinoCallConvert("test3", Notifier.class, 
-                                                   testUtilities.javaToJS(endpoint.getAddress()), 
+                                                   testUtilities.javaToJS(getAddress()), 
                                                    testUtilities.javaToJS(Double.valueOf(17.0)),
                                                    testUtilities.javaToJS(Float.valueOf((float)111.0)),
                                                    testUtilities.javaToJS(Integer.valueOf(142)),
@@ -173,10 +172,10 @@
     public void callMethodWithoutWrappers() {
         testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
             public Void run(Context context) {
-                LOG.info("About to call test2 " + endpoint.getAddress());
+                LOG.info("About to call test2 " + getAddress());
                 Notifier notifier = 
                     testUtilities.rhinoCallConvert("test2", Notifier.class, 
-                                                   testUtilities.javaToJS(endpoint.getAddress()), 
+                                                   testUtilities.javaToJS(getAddress()), 
                                                    testUtilities.javaToJS(Double.valueOf(17.0)),
                                                    testUtilities.javaToJS(Float.valueOf((float)111.0)),
                                                    testUtilities.javaToJS(Integer.valueOf(142)),
@@ -206,10 +205,10 @@
     public void callMethodWithWrappers() {
         testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
             public Void run(Context context) {
-                LOG.info("About to call test1 " + endpoint.getAddress());
+                LOG.info("About to call test1 " + getAddress());
 
                 Notifier notifier = testUtilities.rhinoCallConvert("test1", Notifier.class, testUtilities
-                    .javaToJS(endpoint.getAddress()), testUtilities.javaToJS(Double.valueOf(7.0)),
+                    .javaToJS(getAddress()), testUtilities.javaToJS(Double.valueOf(7.0)),
                                                                    testUtilities.javaToJS(Float
                                                                        .valueOf((float)11.0)), testUtilities
                                                                        .javaToJS(Integer.valueOf(42)),
@@ -237,10 +236,10 @@
     public void callTest2WithNullString() {
         testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
             public Void run(Context context) {
-                LOG.info("About to call test2 with null string" + endpoint.getAddress());
+                LOG.info("About to call test2 with null string" + getAddress());
                 Notifier notifier = 
                     testUtilities.rhinoCallConvert("test2", Notifier.class, 
-                                                   testUtilities.javaToJS(endpoint.getAddress()), 
+                                                   testUtilities.javaToJS(getAddress()), 
                                                    testUtilities.javaToJS(Double.valueOf(17.0)),
                                                    testUtilities.javaToJS(Float.valueOf((float)111.0)),
                                                    testUtilities.javaToJS(Integer.valueOf(142)),

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java Mon Dec 24 13:17:44 2007
@@ -47,7 +47,7 @@
     @Before
     public 
     void before() throws Exception {
-        setupRhino("greeter-proxy-factory", "greeter-service-endpoint",  
+        setupRhino("greeter-service-endpoint",  
                    "/org/apache/cxf/javascript/GreeterTests.js",
                    true);
     }
@@ -55,7 +55,7 @@
     private Void sayHiCaller(Context context) {
         Notifier notifier = 
             testUtilities.rhinoCallConvert("sayHiTest", Notifier.class, 
-                                           testUtilities.javaToJS(endpoint.getAddress()));
+                                           testUtilities.javaToJS(getAddress()));
         
         boolean notified = notifier.waitForJavascript(1000 * 10);
         assertTrue(notified);

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java Mon Dec 24 13:17:44 2007
@@ -22,8 +22,8 @@
 import java.util.List;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.jaxws.EndpointImpl;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.model.ServiceInfo;
@@ -33,10 +33,9 @@
     
     protected JavascriptTestUtilities testUtilities;
     protected JaxWsProxyFactoryBean clientProxyFactory;
-    protected EndpointImpl endpoint;
-    protected Client client;
     protected ServiceInfo serviceInfo;
-
+    protected Object rawImplementor;
+    private Endpoint endpoint;
     
     public JavascriptRhinoTest() throws Exception {
         super();
@@ -44,25 +43,30 @@
         testUtilities.addDefaultNamespaces();
     }
 
-    public void setupRhino(String proxyFactoryBean, 
-                           String serviceEndpointBean, 
+    public void setupRhino(String serviceEndpointBean, 
                            String testsJavascript,
                            boolean validation) throws Exception {
         testUtilities.setBus(getBean(Bus.class, "cxf"));
         testUtilities.initializeRhino();
+        ServerFactoryBean serverFactoryBean = getBean(ServerFactoryBean.class, serviceEndpointBean);
+        endpoint = serverFactoryBean.getServer().getEndpoint();
+        // we need to find the implementor.
+        rawImplementor = serverFactoryBean.getServiceBean();
+
         testUtilities.readResourceIntoRhino("/org/apache/cxf/javascript/cxf-utils.js");
-        clientProxyFactory = getBean(JaxWsProxyFactoryBean.class, proxyFactoryBean);
-        client = clientProxyFactory.getClientFactoryBean().create();
-        List<ServiceInfo> serviceInfos = client.getEndpoint().getService().getServiceInfos();
+        List<ServiceInfo> serviceInfos = endpoint.getService().getServiceInfos();
         // there can only be one.
         assertEquals(1, serviceInfos.size());
         serviceInfo = serviceInfos.get(0);
         testUtilities.loadJavascriptForService(serviceInfo);
         testUtilities.readResourceIntoRhino(testsJavascript);
-        endpoint = getBean(EndpointImpl.class, serviceEndpointBean);
         if (validation) {
             endpoint.getService().put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE);
         }
+    }
+    
+    protected String getAddress() {
+        return endpoint.getEndpointInfo().getAddress();
     }
 
 }

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java Mon Dec 24 13:17:44 2007
@@ -29,7 +29,8 @@
 import java.util.logging.Logger;
 
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.jaxws.EndpointImpl;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.test.AbstractCXFSpringTest;
 import org.junit.Before;
 import org.junit.Test;
@@ -41,9 +42,9 @@
 public class QueryHandlerTest extends AbstractCXFSpringTest {
     private static final Charset UTF8 = Charset.forName("utf-8");
     private static final Logger LOG = LogUtils.getL7dLogger(QueryHandlerTest.class);
-    private EndpointImpl hwEndpoint;
-    private EndpointImpl dlbEndpoint;
-    private EndpointImpl hwgEndpoint;
+    private Endpoint hwEndpoint;
+    private Endpoint dlbEndpoint;
+    private Endpoint hwgEndpoint;
 
     public QueryHandlerTest() throws Exception {
         super();
@@ -66,10 +67,12 @@
     
     @Before
     public void before() {
-        hwEndpoint = getBean(EndpointImpl.class, "hw-service-endpoint");
-        hwgEndpoint = getBean(EndpointImpl.class, "hwg-service-endpoint");
-        dlbEndpoint = getBean(EndpointImpl.class, "dlb-service-endpoint");
-
+        ServerFactoryBean serverFactoryBean = getBean(ServerFactoryBean.class, "hw-service-endpoint");
+        hwEndpoint = serverFactoryBean.getServer().getEndpoint();
+        serverFactoryBean = getBean(ServerFactoryBean.class, "hwg-service-endpoint");
+        hwgEndpoint = serverFactoryBean.getServer().getEndpoint();
+        serverFactoryBean = getBean(ServerFactoryBean.class, "dlb-service-endpoint");
+        dlbEndpoint = serverFactoryBean.getServer().getEndpoint();
     }
     
     private String getStringFromURL(URL url) throws IOException {
@@ -96,7 +99,7 @@
     
     @Test
     public void hwQueryTest() throws Exception {
-        URL endpointURL = new URL(hwEndpoint.getAddress()  + "?js");
+        URL endpointURL = new URL(hwEndpoint.getEndpointInfo().getAddress()  + "?js");
         String js = getStringFromURL(endpointURL); 
         assertNotSame(0, js.length());
     }
@@ -104,7 +107,7 @@
     @Test
     public void dlbQueryTest() throws Exception {
         LOG.finest("logged to avoid warning on LOG");
-        URL endpointURL = new URL(dlbEndpoint.getAddress()  + "?js");
+        URL endpointURL = new URL(dlbEndpoint.getEndpointInfo().getAddress()  + "?js");
         URLConnection connection = endpointURL.openConnection();
         assertEquals("application/javascript;charset=UTF-8", connection.getContentType());
         InputStream jsStream = connection.getInputStream();
@@ -114,7 +117,7 @@
     
     @Test
     public void utilsTest() throws Exception {
-        URL endpointURL = new URL(dlbEndpoint.getAddress()  + "?js&nojsutils");
+        URL endpointURL = new URL(dlbEndpoint.getEndpointInfo().getAddress()  + "?js&nojsutils");
         URLConnection connection = endpointURL.openConnection();
         assertEquals("application/javascript;charset=UTF-8", connection.getContentType());
         InputStream jsStream = connection.getInputStream();
@@ -126,7 +129,7 @@
     @org.junit.Ignore
     @Test 
     public void namespacePrefixTest() throws Exception {
-        URL endpointURL = new URL(hwgEndpoint.getAddress()  + "?js");
+        URL endpointURL = new URL(hwgEndpoint.getEndpointInfo().getAddress()  + "?js");
         String js = getStringFromURL(endpointURL);
         assertTrue(js.contains("hg_Greeter"));
     }

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/RPCClientTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/RPCClientTest.java?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/RPCClientTest.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/RPCClientTest.java Mon Dec 24 13:17:44 2007
@@ -50,9 +50,9 @@
 
     @Before
     public void before() throws Exception {
-        setupRhino("rpc-proxy-factory", "rpc-service-endpoint", 
+        setupRhino("rpc-service-endpoint", 
                    "/org/apache/cxf/javascript/RPCTests.js", false); 
-        implementor = (SimpleRPCImpl)endpoint.getImplementor();
+        implementor = (SimpleRPCImpl)rawImplementor;
         implementor.resetLastValues();
     }
     
@@ -67,10 +67,10 @@
 
     private Void simpleCaller(Context context) {
         
-        LOG.info("About to call simpleTest " + endpoint.getAddress());
+        LOG.info("About to call simpleTest " + getAddress());
         Notifier notifier = 
             testUtilities.rhinoCallConvert("simpleTest", Notifier.class, 
-                                           testUtilities.javaToJS(endpoint.getAddress()),
+                                           testUtilities.javaToJS(getAddress()),
                                            "String Parameter",
                                            testUtilities.javaToJS(new Integer(1776)));
         
@@ -113,10 +113,10 @@
         Scriptable jsBean1 = testBean1ToJS(testUtilities, context, b1);
         Scriptable jsBeanArray = context.newArray(testUtilities.getRhinoScope(), jsBeans);
         
-        LOG.info("About to call beanFunctionTest " + endpoint.getAddress());
+        LOG.info("About to call beanFunctionTest " + getAddress());
         Notifier notifier = 
             testUtilities.rhinoCallConvert("beanFunctionTest", Notifier.class, 
-                                           testUtilities.javaToJS(endpoint.getAddress()),
+                                           testUtilities.javaToJS(getAddress()),
                                            jsBean1,
                                            jsBeanArray);
         boolean notified = notifier.waitForJavascript(1000 * 10);

Added: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisService.java?rev=606739&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisService.java (added)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisService.java Mon Dec 24 13:17:44 2007
@@ -0,0 +1,27 @@
+/**
+ * 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.cxf.javascript.fortest;
+
+import java.util.Collection;
+
+public interface AegisService {
+    void acceptAny(String before, Collection<Object> anything);
+}
+

Propchange: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisServiceImpl.java?rev=606739&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisServiceImpl.java (added)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisServiceImpl.java Mon Dec 24 13:17:44 2007
@@ -0,0 +1,55 @@
+/**
+ * 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.cxf.javascript.fortest;
+
+import java.util.Collection;
+
+/**
+ * Service used to test out JavaScript talking to Aegis.
+ */
+public class AegisServiceImpl implements AegisService {
+    private String acceptedString;
+    private Collection<Object> acceptedCollection;
+    
+    public void reset() {
+        acceptedString = null;
+        acceptedCollection = null;
+    }
+    
+    /** {@inheritDoc}*/
+    public void acceptAny(String before, Collection<Object> anything) {
+        acceptedString = before;
+        acceptedCollection = anything;
+    }
+
+    /**
+     * @return Returns the acceptedCollection.
+     */
+    public Collection<Object> getAcceptedCollection() {
+        return acceptedCollection;
+    }
+
+    /**
+     * @return Returns the acceptedString.
+     */
+    public String getAcceptedString() {
+        return acceptedString;
+    }
+}

Propchange: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AegisServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/javascript/src/test/resources/AegisBeans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/AegisBeans.xml?rev=606739&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/AegisBeans.xml (added)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/AegisBeans.xml Mon Dec 24 13:17:44 2007
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the v 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:simple="http://cxf.apache.org/simple"
+  xmlns:soap="http://cxf.apache.org/bindings/soap"
+  xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd
+           http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
+              
+  <import resource="classpath:META-INF/cxf/cxf.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-extension-xml.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
+  
+  <simple:server id="aegis-service" 
+                 serviceClass="org.apache.cxf.javascript.fortest.AegisService" 
+                 address="http://localhost:8808/aegis">
+  	<simple:serviceBean>
+  		<bean class="org.apache.cxf.javascript.fortest.AegisServiceImpl" />
+  	</simple:serviceBean>
+  	<simple:dataBinding >
+      <bean class="org.apache.cxf.aegis.databinding.AegisDatabinding" />
+  	</simple:dataBinding>
+  </simple:server>
+  
+  </beans>
+  
+  
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/javascript/src/test/resources/AegisBeans.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/javascript/src/test/resources/AegisBeans.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/javascript/src/test/resources/AegisBeans.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/AnyBeans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/AnyBeans.xml?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/AnyBeans.xml (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/AnyBeans.xml Mon Dec 24 13:17:44 2007
@@ -32,14 +32,11 @@
   <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
   <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
               
- <jaxws:endpoint id="any-service-endpoint" 
-    implementor="org.apache.cxf.javascript.fortest.AnyImpl" 
+ <jaxws:server id="any-service-endpoint" 
     address="http://localhost:8808/any" >
- </jaxws:endpoint>
- 
- <bean id="any-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" >
-    <property name="serviceClass" value="org.apache.cxf.javascript.fortest.AnyImpl"/>
-    <property name="address" value="http://localhost:8808/any"/>
- </bean>
+    <jaxws:serviceBean>
+      <bean class='org.apache.cxf.javascript.fortest.AnyImpl'/>
+    </jaxws:serviceBean>
+ </jaxws:server>
  
  </beans>

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitBareClientTestBeans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitBareClientTestBeans.xml?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitBareClientTestBeans.xml (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitBareClientTestBeans.xml Mon Dec 24 13:17:44 2007
@@ -32,17 +32,11 @@
   <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
   <import resource="classpath:META-INF/cxf/cxf-extension-javascript-client.xml" />
   
-  <bean id='dlb-service' class='org.apache.cxf.javascript.fortest.SimpleDocLitBareImpl'/>
-  
-  <!-- use # so that we can pull state out of the service object in the tests. -->            
-  <jaxws:endpoint id="dlb-service-endpoint" 
-    implementor="#dlb-service" 
-    address="http://localhost:8808/SimpleDocLitBare" >
-  </jaxws:endpoint>
- 
-  <bean id="dlb-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" >
-    <property name="serviceClass" value="org.apache.cxf.javascript.fortest.SimpleDocLitBare"/>
-    <property name="address" value="http://localhost:8808/SimpleDocLitBare"/>
-  </bean>
- 
+  <jaxws:server id="dlb-service-endpoint" 
+    address="http://localhost:8808/SimpleDocLitBare" >
+    <jaxws:serviceBean>
+      <bean class='org.apache.cxf.javascript.fortest.SimpleDocLitBareImpl'/>
+    </jaxws:serviceBean>
+  </jaxws:server>
+
  </beans>

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml Mon Dec 24 13:17:44 2007
@@ -31,18 +31,11 @@
   <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
   <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
   
-  <bean id='dlw-service' class='org.apache.cxf.javascript.fortest.SimpleDocLitWrappedImpl'/>
-  
-  <!-- use # so that we can pull state out of the service object in the tests. -->            
-  <jaxws:endpoint id="dlw-service-endpoint" 
-    implementor="#dlw-service" 
-    address="http://localhost:8808/SimpleDocLitWrapped" >
-  </jaxws:endpoint>
- 
-  <bean id="dlw-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" >
-    <property name="serviceClass" value="org.apache.cxf.javascript.fortest.SimpleDocLitWrapped"/>
-    <property name="address" value="http://localhost:8808/SimpleDocLitWrapped"/>
-  </bean>
- 
- 
+  <jaxws:server id="dlw-service-endpoint" 
+    address="http://localhost:8808/SimpleDocLitWrapped" >
+     <jaxws:serviceBean>
+      <bean class='org.apache.cxf.javascript.fortest.SimpleDocLitWrappedImpl'/>
+    </jaxws:serviceBean>
+  </jaxws:server>
+
  </beans>

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/GreeterClientTestBeans.xml Mon Dec 24 13:17:44 2007
@@ -32,15 +32,10 @@
   <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
   <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
               
- <jaxws:endpoint id="greeter-service-endpoint" 
-    implementor="org.apache.cxf.javascript.hwdemo.GreeterImpl" 
-    address="http://localhost:8808/Greeter" >
- </jaxws:endpoint>
- 
- <bean id="greeter-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" >
-    <property name="serviceClass" value="org.apache.cxf.javascript.hwdemo.GreeterImpl"/>
-    <property name="address" value="http://localhost:8808/Greeter"/>
- </bean>
- 
- 
+ <jaxws:server id="greeter-service-endpoint" 
+    address="http://localhost:8808/Greeter" >
+    <jaxws:serviceBean>
+      <bean class='org.apache.cxf.javascript.hwdemo.GreeterImpl'/>
+    </jaxws:serviceBean>
+ </jaxws:server>
  </beans>

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldDocLitBeans.xml Mon Dec 24 13:17:44 2007
@@ -32,16 +32,11 @@
   <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
   <import resource="classpath:META-INF/cxf/cxf-extension-javascript-client.xml" />
   
-  <bean id='hw-service' class='org.apache.hello_world_doc_lit.GreeterImplDoc'/>
-  
-  <jaxws:endpoint id="hw-service-endpoint" 
-    implementor="#hw-service" 
-    address="http://localhost:8808/HelloWorldDocLit" >
-  </jaxws:endpoint>
- 
-  <bean id="hw-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" >
-    <property name="serviceClass" value="org.apache.hello_world_doc_lit.Greeter"/>
-    <property name="address" value="http://localhost:8808/HelloWorldDocLit"/>
-  </bean>
+  <jaxws:server id="hw-service-endpoint" 
+    address="http://localhost:8808/HelloWorldDocLit" >
+    <jaxws:serviceBean>
+    	<bean class='org.apache.hello_world_doc_lit.GreeterImplDoc'/>
+    </jaxws:serviceBean>
+  </jaxws:server>
  
  </beans>

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/HelloWorldGreeterBeans.xml Mon Dec 24 13:17:44 2007
@@ -1,64 +1,64 @@
-<?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:jaxws="http://cxf.apache.org/jaxws"
-	xsi:schemaLocation="
+<?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:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="
            http://cxf.apache.org/jaxws                                 
               http://cxf.apache.org/schemas/jaxws.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:META-INF/cxf/cxf.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-	<import
-		resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
-	<import
-		resource="classpath:META-INF/cxf/cxf-extension-javascript-client.xml" />
-
-	<bean id='hwg-service' class='org.apache.hello_world.GreeterImpl' />
-
-	<jaxws:endpoint id="hwg-service-endpoint" implementor="#hwg-service"
-		address="http://localhost:8808/HelloWorldGreeter">
-		<jaxws:features>
-			<bean
-				class="org.apache.cxf.javascript.JavascriptOptionsFeature">
-				<property name="namespacePrefixMap">
-					<map>
-						<entry>
-							<key>
-								<value>http://apache.org/hello_world</value>
-							</key>
-							<value>hg</value>
-						</entry>
-						<entry>
-							<key>
-								<value>http://apache.org/hello_world/types</value>
-							</key>
-							<value>hgt</value>
-						</entry>
-					</map>
-				</property>
-			</bean>
-		</jaxws:features>
-	</jaxws:endpoint>
-
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
+ <import
+  resource="classpath:META-INF/cxf/cxf-extension-javascript-client.xml" />
+
+
+ <jaxws:server id="hwg-service-endpoint"
+  address="http://localhost:8808/HelloWorldGreeter">
+  <jaxws:serviceBean>
+   <bean class='org.apache.hello_world.GreeterImpl' />
+  </jaxws:serviceBean>
+  <jaxws:features>
+   <bean class="org.apache.cxf.javascript.JavascriptOptionsFeature">
+    <property name="namespacePrefixMap">
+     <map>
+      <entry>
+       <key>
+        <value>http://apache.org/hello_world</value>
+       </key>
+       <value>hg</value>
+      </entry>
+      <entry>
+       <key>
+        <value>http://apache.org/hello_world/types</value>
+       </key>
+       <value>hgt</value>
+      </entry>
+     </map>
+    </property>
+   </bean>
+  </jaxws:features>
+ </jaxws:server>
+
 </beans>

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/RPCClientTestBeans.xml Mon Dec 24 13:17:44 2007
@@ -33,15 +33,11 @@
   
   <bean id='rpc-service' class='org.apache.cxf.javascript.fortest.SimpleRPCImpl'/>
   
-  <!-- use # so that we can pull state out of the service object in the tests. -->            
-  <jaxws:endpoint id="rpc-service-endpoint" 
-    implementor="#rpc-service" 
-    address="http://localhost:8808/SimpleRPC" >
-  </jaxws:endpoint>
- 
-  <bean id="rpc-proxy-factory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean" >
-    <property name="serviceClass" value="org.apache.cxf.javascript.fortest.SimpleRPC"/>
-    <property name="address" value="http://localhost:8808/SimpleRPC"/>
-  </bean>
+  <jaxws:server id="rpc-service-endpoint" 
+    address="http://localhost:8808/SimpleRPC" >
+     <jaxws:serviceBean>
+      <ref bean="rpc-service" />
+    </jaxws:serviceBean>
+  </jaxws:server>
  
  </beans>

Added: incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AegisTests.js
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AegisTests.js?rev=606739&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AegisTests.js (added)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AegisTests.js Mon Dec 24 13:17:44 2007
@@ -0,0 +1,47 @@
+/**
+ * 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.
+ */
+
+function assertionFailed(explanation)
+{
+ 	var assert = new Assert(explanation); // this will throw out in Java.
+}
+
+var globalNotifier = null;
+var globalErrorStatus = null;
+var globalErrorStatusText = null;
+var globalResponseObject = null;
+
+function resetGlobals() {
+	globalNotifier = null;
+	globalErrorStatus = null;
+	globalErrorStatusText = null;
+	globalResponseObject = null;
+}
+
+function testAnyNToServerRaw(url)
+{
+	var service = new cxf_apache_org_jstest_any_AcceptAny();
+	service.url = url;
+	var param = new cxf_apache_org_jstest_types_any_acceptAnyN();
+	param.setBefore("before chalk");
+	var holder = new org_apache_cxf_raw_any_holder("<walrus xmlns='uri:iam'>tusks</walrus><penguin xmlns='uri:linux'>emperor</penguin>");
+	param.setAny(holder);
+	param.setAfter("after chalk");
+	service.acceptAnyN(param);
+}

Propchange: incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AegisTests.js
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AnyTests.js
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AnyTests.js?rev=606739&r1=606738&r2=606739&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AnyTests.js (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/org/apache/cxf/javascript/AnyTests.js Mon Dec 24 13:17:44 2007
@@ -60,6 +60,18 @@
 	service.acceptAny1(param);
 }
 
+function testAnyNToServerRaw(url)
+{
+	var service = new cxf_apache_org_jstest_any_AcceptAny();
+	service.url = url;
+	var param = new cxf_apache_org_jstest_types_any_acceptAnyN();
+	param.setBefore("before chalk");
+	var holder = new org_apache_cxf_raw_any_holder("<walrus xmlns='uri:iam'>tusks</walrus><penguin xmlns='uri:linux'>emperor</penguin>");
+	param.setAny(holder);
+	param.setAfter("after chalk");
+	service.acceptAnyN(param);
+}
+
 function errorCallback(httpStatus, httpStatusText) 
 {
     org_apache_cxf_trace.trace("error");
@@ -86,4 +98,4 @@
 	service.url = url;
 	service.returnAny1(any1ToClientSuccessCallback, errorCallback, dummyParam);
 	return globalNotifier; 
-}
\ No newline at end of file
+}



Mime
View raw message