Anonymous avatar Anonymous committed e70a5ef

Updated xfire from cvs

Comments (0)

Files changed (6)

Add a comment to this file

lib/optional/xfire/xfire-aegis.jar

Binary file modified.

Add a comment to this file

lib/optional/xfire/xfire-core.jar

Binary file modified.

src/java/com/opensymphony/workflow/query/FieldExpression.java

 
     //~ Methods ////////////////////////////////////////////////////////////////
 
+    public void setContext(int context) {
+        this.context = context;
+    }
+
     public int getContext() {
         return context;
     }
 
+    public void setField(int field) {
+        this.field = field;
+    }
+
     public int getField() {
         return field;
     }
         return false;
     }
 
+    public void setOperator(int operator) {
+        this.operator = operator;
+    }
+
     public int getOperator() {
         return operator;
     }
 
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
     public Object getValue() {
         return value;
     }

src/java/com/opensymphony/workflow/query/WorkflowExpressionQuery.java

 
     //~ Methods ////////////////////////////////////////////////////////////////
 
+    public void setExpression(Expression expression) {
+        this.expression = expression;
+    }
+
     public Expression getExpression() {
         return expression;
     }

src/java/com/opensymphony/workflow/soap/SOAPWorkflowServlet.java

 
 import com.opensymphony.workflow.Workflow;
 
+import org.codehaus.xfire.aegis.AegisBindingProvider;
+import org.codehaus.xfire.aegis.type.DefaultTypeMappingRegistry;
+import org.codehaus.xfire.aegis.type.TypeMappingRegistry;
 import org.codehaus.xfire.service.Service;
 import org.codehaus.xfire.service.ServiceRegistry;
 import org.codehaus.xfire.service.binding.BeanInvoker;
+import org.codehaus.xfire.service.binding.BindingProvider;
 import org.codehaus.xfire.service.binding.ObjectServiceFactory;
 import org.codehaus.xfire.transport.http.XFireServlet;
 
         super.init();
 
         ServiceRegistry registry = getXFire().getServiceRegistry();
-        ObjectServiceFactory factory = new ObjectServiceFactory(getXFire().getTransportManager());
+        TypeMappingRegistry typeRegistry = new DefaultTypeMappingRegistry(true);
+        BindingProvider binding = new AegisBindingProvider(typeRegistry);
+        ObjectServiceFactory factory = new ObjectServiceFactory(getXFire().getTransportManager(), binding);
         Service service = factory.create(Workflow.class);
-        service.getBinding().setInvoker(new BeanInvoker(new XFireSOAPWorkflow()));
+        service.setInvoker(new BeanInvoker(new XFireSOAPWorkflow()));
         registry.register(service);
+
+        //        TypeMapping mapping = typeRegistry.getTypeMapping("http://workflow.opensymphony.com");
+        //        BeanTypeInfo info = new BeanTypeInfo(FieldExpression.class, false);
+        //        BeanType beanType = new BeanType(info);
+        //
+        //        beanType.setSchemaType(createQName(FieldExpression.class));
+        //        mapping.register(Expression.class, createQName(Expression.class), new ObjectType(Collections.singleton(beanType), true));
     }
+
+    //    protected QName createQName(Class javaType) {
+    //        String clsName = javaType.getName();
+    //
+    //        String ns = NamespaceHelper.makeNamespaceFromClassName(clsName, "http");
+    //        String localName = ServiceUtils.makeServiceNameFromClassName(javaType);
+    //
+    //        return new QName(ns, localName);
+    //    }
 }

src/webapp/webapp.iml

     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="osworkflow" />
     <orderEntry type="library" name="Orion 2.x" level="application_server_libraries" />
-    <orderEntry type="module" module-name="osworkflow" />
     <orderEntryProperties />
   </component>
   <component name="OrionWebModuleProperties" />
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.