@@ -13,5 +13,6 @@ Import-Package: org.osgi.framework;version="1.3.0", uk.co.arum.osgi.amf3;version="1.0.0", uk.co.arum.osgi.amf3.flex.remoting;version="1.0.0", uk.co.arum.osgi.amf3.flex.remoting.events;version="1.0.0" -Export-Package: uk.co.arum.osgi.amf3.flex.remoting;version="1.0.0", +Export-Package: flex.messaging.messages, + uk.co.arum.osgi.amf3.flex.remoting;version="1.0.0", uk.co.arum.osgi.amf3.flex.remoting.events;version="1.0.0";uses:="org.osgi.service.event" uk.co.arum.osgi.amf3.flex.remoting/META-INF/MANIFEST.MF @@ -32,6 +32,7 @@ import java.util.UUID; import org.osgi.service.log.LogService; import uk.co.arum.osgi.amf3.AMFFactory; +import uk.co.arum.osgi.amf3.flex.remoting.RemotingContext; import uk.co.arum.osgi.amf3.flex.remoting.events.PublishedObjectEvent; import flex.messaging.messages.AcknowledgeMessage; import flex.messaging.messages.AsyncMessage; @@ -263,7 +264,10 @@ public class FlexRemotingAMFFactory implements AMFFactory { if (null != opargs) { int i = 0; for (Object arg : opargs) { - opargsClasses[i++] = arg.getClass(); + if (null != arg) { + opargsClasses[i] = arg.getClass(); + } + i++; } } @@ -277,12 +281,8 @@ public class FlexRemotingAMFFactory implements AMFFactory { // is there an operation on this class that matches requested // operation? if (null != serviceClass) { - try { - method = serviceClass.getMethod( - remoting.getOperation(), opargsClasses); - } catch (NoSuchMethodException e) { - // could happen - } + method = findMethod(serviceClass, remoting.getOperation(), + opargsClasses, opargs); } } catch (ClassNotFoundException e) { @@ -297,25 +297,80 @@ public class FlexRemotingAMFFactory implements AMFFactory { .getOperation())); } - // TODO add security hooks in case a bundle wants to prevent access to - // this service for some reason - // if the same operation exists on the actual service class, invoke it - try { - method = serviceConfig.getService().getClass().getMethod( - remoting.getOperation(), opargsClasses); - } catch (NoSuchMethodException e) { - return e; + if (null == (method = findMethod(serviceConfig.getService().getClass(), + remoting.getOperation(), opargsClasses, opargs))) { + throw new RuntimeException(new NoSuchMethodException(remoting + .getOperation())); } try { - return method.invoke(serviceConfig.getService(), + new RemotingContext(remoting); + Object returnValue = method.invoke(serviceConfig.getService(), (Object[]) remoting.getBody()); + return config.translate(returnValue); } catch (Exception e) { throw new RuntimeException(e); } } + @SuppressWarnings("unchecked") + private boolean compareArgList(Class[] methodArgs, Class[] requiredArgs, + Object[] args) { + + if (methodArgs.length != requiredArgs.length) { + return false; + } + + for (int i = 0; i < methodArgs.length; i++) { + + if (null == requiredArgs[i] + || methodArgs[i].isAssignableFrom(requiredArgs[i]) + || isAssignable(methodArgs[i], requiredArgs[i], args[i])) { + continue; + } + + return false; + } + + return true; + } + + @SuppressWarnings("unchecked") + private boolean isAssignable(Class methodArgType, Class requiredArgType, + Object arg) { + + try { + requiredArgType.cast(arg); + } catch (ClassCastException e) { + return false; + } + + return true; + } + + @SuppressWarnings("unchecked") + private Method findMethod(Class c, String name, Class[] argTypes, + Object[] args) { + Method method = null; + try { + method = c.getDeclaredMethod(name, argTypes); + } catch (NoSuchMethodException e) { + // could happen + for (Method xMethod : c.getDeclaredMethods()) { + if (xMethod.getName().equals(name)) { + if (compareArgList(xMethod.getParameterTypes(), argTypes, + args)) { + method = xMethod; + } + } + } + + } + + return method; + } + private Object processPublishMessage(Object incoming) { if (incoming instanceof Message) { uk.co.arum.osgi.amf3.flex.remoting/src/uk/co/arum/osgi/amf3/flex/remoting/bundle/FlexRemotingAMFFactory.java @@ -29,9 +29,11 @@ import java.util.Set; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import uk.co.arum.osgi.amf3.flex.remoting.OSGiAMFConstants; +import uk.co.arum.osgi.amf3.flex.remoting.Translator; public class OSGiAMFConfig { @@ -47,7 +49,8 @@ public class OSGiAMFConfig { /** * Load the class with the given name from the bundles that have registered - * a service.<p/> + * a service. + * <p/> * * TODO cache the class, but uncache if associated service disappears * @@ -133,4 +136,33 @@ public class OSGiAMFConfig { configs.clear(); } + public Object translate(Object from) { + + if (null == from || from instanceof Void) { + return from; + } + + ServiceReference[] refs = null; + + try { + refs = context.getServiceReferences(Translator.class.getName(), + null); + } catch (InvalidSyntaxException e) { + throw new RuntimeException(e); + } + + for (ServiceReference ref : refs) { + Translator t = (Translator) context.getService(ref); + try { + if (t.canTranslate(from)) { + return t.translate(from); + } + } finally { + context.ungetService(ref); + } + } + + return from; + } + } uk.co.arum.osgi.amf3.flex.remoting/src/uk/co/arum/osgi/amf3/flex/remoting/bundle/OSGiAMFConfig.java @@ -26,6 +26,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; public class HttpRequestContext { @@ -58,6 +59,15 @@ public class HttpRequestContext { } /** + * Get the current http session, creating a new one if necessary. + * + * @return the http session + */ + public HttpSession getSession() { + return request.getSession(true); + } + + /** * Can be used by other bundles to set properties for this request. * * @return properties specific to this context uk.co.arum.osgi.amf3.http/src/uk/co/arum/osgi/amf3/http/HttpRequestContext.java @@ -6,11 +6,13 @@ Bundle-Version: 1.0.0 Bundle-Activator: uk.co.arum.osgi.amf3.sample.bundle.Activator Bundle-Vendor: Arum Systems Ltd Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: javax.servlet;version="2.4.0", +Import-Package: flex.messaging.messages, + javax.servlet;version="2.4.0", javax.servlet.http;version="2.4.0", org.osgi.framework;version="1.3.0", org.osgi.service.event;version="1.1.0";resolution:=optional, org.osgi.service.http;version="1.2.0", uk.co.arum.osgi.amf3;version="1.0.0", + uk.co.arum.osgi.amf3.flex.remoting;version="1.0.0", uk.co.arum.osgi.amf3.flex.remoting.events;version="1.0.0", uk.co.arum.osgi.amf3.http;version="1.0.0" uk.co.arum.osgi.amf3.sample/META-INF/MANIFEST.MF @@ -1,32 +1,33 @@ <?xml version="1.0" encoding="utf-8"?>  -<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="vertical" - implements="mx.rpc.IResponder" - creationComplete="onCreationComplete(event)"> +<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" + layout="vertical" + implements="mx.rpc.IResponder" + creationComplete="onCreationComplete(event)"> <mx:Script> <![CDATA[ @@ -42,130 +43,210 @@ import mx.messaging.ChannelSet; import uk.co.arum.osgi.amf3.sample.VerySimpleObject; import uk.co.arum.osgi.amf3.sample.SampleObject; - + private var sample:SampleObject; - + private var simple:VerySimpleObject; - - private function onCreationComplete(event:Event) : void { - simple = createVerySimpleObject("very simple"); - - sample = createSampleObject("sample object", null, 1024); - var child1:SampleObject = createSampleObject("child 1", sample, 22); - var child2:SampleObject = createSampleObject("child 2", sample, 65); - var child3:SampleObject = createSampleObject("child 3", sample, 65); - var child2_1:SampleObject = createSampleObject("child 2.1", child2, 2011); + + private function onCreationComplete(event:Event):void + { + simpleService.setRemoteCredentials("remotecredentials", "12345"); - var cs:ChannelSet = new ChannelSet(); - var channel:Channel = new AMFChannel("events", "/amf3osgi"); + simple=createVerySimpleObject("very simple"); + + sample=createSampleObject("sample object", null, 1024); + var child1:SampleObject=createSampleObject("child 1", sample, 22); + var child2:SampleObject=createSampleObject("child 2", sample, 65); + var child3:SampleObject=createSampleObject("child 3", sample, 65); + var child2_1:SampleObject=createSampleObject("child 2.1", child2, 2011); + + var cs:ChannelSet=new ChannelSet(); + var channel:Channel=new AMFChannel("events", "/amf3osgi"); cs.addChannel(channel); - consumer.channelSet = cs; + consumer.channelSet=cs; consumer.subscribe(); - - producer.channelSet = cs; + + producer.channelSet=cs; producer.send(createAsyncMessage()); } - - private function createVerySimpleObject(name:String) : VerySimpleObject { - var vso:VerySimpleObject = new VerySimpleObject(); - vso.name = name; + + private function createVerySimpleObject(name:String):VerySimpleObject + { + var vso:VerySimpleObject=new VerySimpleObject(); + vso.name=name; return vso; } - - private function createSampleObject(name:String, parent:SampleObject, value:Number) : SampleObject { - var sample:SampleObject = new SampleObject(); - - sample.parent = parent; - if (sample.parent) { - if (!sample.parent.children) { - sample.parent.children = new ArrayCollection(); + + private function createSampleObject(name:String, parent:SampleObject, value:Number):SampleObject + { + var sample:SampleObject=new SampleObject(); + + sample.parent=parent; + if (sample.parent) + { + if (!sample.parent.children) + { + sample.parent.children=new ArrayCollection(); } sample.parent.children.addItem(sample); } - - sample.name = name; - sample.value = value; + + sample.name=name; + sample.value=value; return sample; } - - private function createAsyncMessage(text:String = "Hello") : AsyncMessage { - var async:AsyncMessage = new AsyncMessage(); - async.destination = "events"; - async.body = {"Say":text}; + + private function createAsyncMessage(text:String="Hello"):AsyncMessage + { + var async:AsyncMessage=new AsyncMessage(); + async.destination="events"; + async.body={"Say":text}; return async; } - - private function onFault(event:Event) : void { + + private function onFault(event:Event):void + { Alert.show(event.toString()); } - - private function onResult(event:ResultEvent) : void { - textArea.text = event.toString() + "\n" + textArea.text; - textArea.text = event.result.toString() + "\n" + textArea.text; + + private function onResult(event:ResultEvent):void + { + textArea.text=event.toString() + "\n" + textArea.text; + textArea.text=event.result.toString() + "\n" + textArea.text; } - - public function fault(o:Object) : void { + + public function fault(o:Object):void + { onFault(FaultEvent(o)); } - - public function result(o:Object) : void { + + public function result(o:Object):void + { onResult(ResultEvent(o)); } - - private function onClickSendButton(event:Event) : void { + + private function onClickSendButton(event:Event):void + { producer.send(createAsyncMessage(textInput.text)); } - - private function onConsumerMessage(event:MessageEvent) : void { - messagesArea.text = event.toString() + "\n" + messagesArea.text; - messagesArea.text = event.message.body.Say + "\n" + messagesArea.text; + + private function onConsumerMessage(event:MessageEvent):void + { + messagesArea.text=event.toString() + "\n" + messagesArea.text; + messagesArea.text=event.message.body.Say + "\n" + messagesArea.text; } - ]]> </mx:Script> - - <mx:Consumer id="consumer" message="onConsumerMessage(event)" destination="events" fault="onFault(event)"/> - - <mx:Producer id="producer" destination="events" fault="onFault(event)" /> - - <mx:RemoteObject id="simpleService" endpoint="/amf3osgi" destination="uk.co.arum.osgi.amf3.sample.SimpleService"> - <mx:method id="echoMethod" name="echo" result="onResult(event)" fault="onFault(event)" /> - <mx:method id="reverseMethod" name="reverse" result="onResult(event)" fault="onFault(event)" /> - <mx:method id="randomMethod" name="random" result="onResult(event)" fault="onFault(event)" /> - <mx:method id="getSampleObjectMethod" name="getSampleObject" result="onResult(event)" fault="onFault(event)" /> - <mx:method id="sendVerySimpleObjectMethod" name="sendVerySimpleObject" result="onResult(event)" fault="onFault(event)" /> - <mx:method id="sendSampleObjectMethod" name="sendSampleObject" result="onResult(event)" fault="onFault(event)" /> - <mx:method id="throwExceptionMethod" name="throwException" result="onResult(event)" fault="onFault(event)" /> + + <mx:Consumer id="consumer" + message="onConsumerMessage(event)" + destination="events" + fault="onFault(event)"/> + + <mx:Producer id="producer" + destination="events" + fault="onFault(event)"/> + + <mx:RemoteObject id="simpleService" + endpoint="/amf3osgi" + destination="uk.co.arum.osgi.amf3.sample.SimpleService" + > + <mx:method id="echoMethod" + name="echo" + result="onResult(event)" + fault="onFault(event)"/> + <mx:method id="reverseMethod" + name="reverse" + result="onResult(event)" + fault="onFault(event)"/> + <mx:method id="randomMethod" + name="random" + result="onResult(event)" + fault="onFault(event)"/> + <mx:method id="getSampleObjectMethod" + name="getSampleObject" + result="onResult(event)" + fault="onFault(event)"/> + <mx:method id="sendVerySimpleObjectMethod" + name="sendVerySimpleObject" + result="onResult(event)" + fault="onFault(event)"/> + <mx:method id="sendSampleObjectMethod" + name="sendSampleObject" + result="onResult(event)" + fault="onFault(event)"/> + <mx:method id="throwExceptionMethod" + name="throwException" + result="onResult(event)" + fault="onFault(event)"/> </mx:RemoteObject> - - <mx:HBox width="100%" defaultButton="{echoButton}"> - <mx:Label text="Enter Your Text:" /> - <mx:TextInput id="textInput" width="100%" /> - <mx:Button id="echoButton" label="Echo" click="simpleService.echo(textInput.text)" enabled="{StringUtil.trim(textInput.text).length > 0}" /> - <mx:Button id="reverseButton" label="Reverse" click="simpleService.reverse(textInput.text)" enabled="{StringUtil.trim(textInput.text).length > 0}" /> - <mx:Button id="sendButton" label="Send" click="onClickSendButton(event)" toolTip="Send text as a message" enabled="{StringUtil.trim(textInput.text).length > 0}" /> - <mx:Button id="exceptionButton" label="Exception" click="simpleService.throwException(textInput.text)" toolTip="Have the server thrown an exception with the given message" enabled="{StringUtil.trim(textInput.text).length > 0}" /> + + <mx:HBox width="100%" + defaultButton="{echoButton}"> + <mx:Label text="Enter Your Text:"/> + <mx:TextInput id="textInput" + width="100%"/> + <mx:Button id="echoButton" + label="Echo" + click="simpleService.echo(textInput.text)" + enabled="{StringUtil.trim(textInput.text).length > 0}"/> + <mx:Button id="reverseButton" + label="Reverse" + click="simpleService.reverse(textInput.text)" + enabled="{StringUtil.trim(textInput.text).length > 0}"/> + <mx:Button id="sendButton" + label="Send" + click="onClickSendButton(event)" + toolTip="Send text as a message" + enabled="{StringUtil.trim(textInput.text).length > 0}"/> + <mx:Button id="exceptionButton" + label="Exception" + click="simpleService.throwException(textInput.text)" + toolTip="Have the server thrown an exception with the given message" + enabled="{StringUtil.trim(textInput.text).length > 0}"/> </mx:HBox> <mx:HBox width="100%"> - <mx:Button id="randomButton" label="Get Random Number" click="simpleService.random()" toolTip="Have the server generate a random number"/> - <mx:Button id="getSampleObjectButton" label="Get Sample Object" click="simpleService.getSampleObject()" toolTip="Have the server retrieve a sample object instance"/> - <mx:Button id="sendVerySimpleObjectButton" label="Send Very Simple Object" click="simpleService.sendVerySimpleObject(simple)" toolTip="Send a simple object"/> - <mx:Button id="sendSampleObjectButton" label="Send Sample Object" click="simpleService.sendSampleObject(sample)" toolTip="Send and retrieve a more complicated sample object"/> + <mx:Button id="randomButton" + label="Get Random Number" + click="simpleService.random()" + toolTip="Have the server generate a random number"/> + <mx:Button id="getSampleObjectButton" + label="Get Sample Object" + click="simpleService.getSampleObject()" + toolTip="Have the server retrieve a sample object instance"/> + <mx:Button id="sendVerySimpleObjectButton" + label="Send Very Simple Object" + click="simpleService.sendVerySimpleObject(simple)" + toolTip="Send a simple object"/> + <mx:Button id="sendSampleObjectButton" + label="Send Sample Object" + click="simpleService.sendSampleObject(sample)" + toolTip="Send and retrieve a more complicated sample object"/> </mx:HBox> - - <mx:HBox width="100%" height="100%"> - <mx:Panel title="Output from remote methods" width="100%" height="100%" > - <mx:TextArea id="textArea" width="100%" height="100%" /> + + <mx:HBox width="100%" + height="100%"> + <mx:Panel title="Output from remote methods" + width="100%" + height="100%"> + <mx:TextArea id="textArea" + width="100%" + height="100%"/> </mx:Panel> - <mx:Panel title="Messages" width="100%" height="100%" > - <mx:TextArea id="messagesArea" width="100%" height="100%" /> + <mx:Panel title="Messages" + width="100%" + height="100%"> + <mx:TextArea id="messagesArea" + width="100%" + height="100%"/> </mx:Panel> </mx:HBox> - + <mx:HBox width="100%"> - <mx:Spacer width="100%" /> - <mx:Button label="Clear" click="textArea.text = ''" /> + <mx:Spacer width="100%"/> + <mx:Button label="Clear" + click="textArea.text = ''"/> </mx:HBox> </mx:Application> uk.co.arum.osgi.amf3.sample/flexsrc/main.mxml @@ -25,6 +25,7 @@ import java.util.Enumeration; import javax.servlet.http.HttpServletRequest; +import uk.co.arum.osgi.amf3.flex.remoting.RemotingContext; import uk.co.arum.osgi.amf3.http.HttpRequestContext; import uk.co.arum.osgi.amf3.sample.SampleObject; import uk.co.arum.osgi.amf3.sample.SimpleService; @@ -99,6 +100,10 @@ public class SimpleServiceImpl implements SimpleService { System.out.println("Method: " + request.getMethod()); + System.out.println("Credentials: " + + RemotingContext.getCurrent().getMessage().getHeader( + "DSRemoteCredentials")); + boolean headers = false; System.out.println("Headers: "); Enumeration<?> headersEnum = request.getHeaderNames(); uk.co.arum.osgi.amf3.sample/src/uk/co/arum/osgi/amf3/sample/bundle/SimpleServiceImpl.java @@ -1,90 +1,95 @@ -/* - GRANITE DATA SERVICES - Copyright (C) 2007-2008 ADEQUATE SYSTEMS SARL - - This file is part of Granite Data Services. - - Granite Data Services is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 3 of the License, or (at your - option) any later version. - - Granite Data Services is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, see <http://www.gnu.org/licenses/>. -*/ - -package org.granite.messaging.amf.io.util; - -import java.beans.BeanInfo; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @author Franck WOLFF - */ -public class DefaultJavaClassDescriptor extends JavaClassDescriptor { - - public DefaultJavaClassDescriptor(Class<?> type) { - super(type); - } - - @Override - protected List<Property> introspectProperties() { - List<Property> properties = null; - Class<?> type = getType(); - - if (!isExternalizable() && !Map.class.isAssignableFrom(type) - && !Hashtable.class.isAssignableFrom(type)) { - properties = new ArrayList<Property>(); - - try { - Set<String> propertyNames = new HashSet<String>(); - - // Add read/write properties (ie: public getter/setter). - BeanInfo info = Introspector.getBeanInfo(type); - for (PropertyDescriptor property : info - .getPropertyDescriptors()) { - String propertyName = property.getName(); - if (property.getWriteMethod() != null - && property.getReadMethod() != null) { - properties.add(new MethodProperty(propertyName, - property.getWriteMethod(), property - .getReadMethod())); - propertyNames.add(propertyName); - } - } - - // Add other public fields. - Field[] fields = type.getFields(); - for (Field field : fields) { - String propertyName = field.getName(); - if (!propertyNames.contains(propertyName) - && !Modifier.isStatic(field.getModifiers()) - && !Modifier.isTransient(field.getModifiers())) { - properties.add(new FieldProperty(field)); - propertyNames.add(propertyName); - } - } - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - return properties; - } -} +/* + GRANITE DATA SERVICES + Copyright (C) 2007-2008 ADEQUATE SYSTEMS SARL + + This file is part of Granite Data Services. + + Granite Data Services is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 3 of the License, or (at your + option) any later version. + + Granite Data Services is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, see <http://www.gnu.org/licenses/>. +*/ + +package org.granite.messaging.amf.io.util; + +import java.beans.BeanInfo; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * @author Franck WOLFF + */ +public class DefaultJavaClassDescriptor extends JavaClassDescriptor { + + public DefaultJavaClassDescriptor(Class<?> type) { + super(type); + } + + @Override + protected List<Property> introspectProperties() { + List<Property> properties = null; + Class<?> type = getType(); + + if (!isExternalizable() && !Map.class.isAssignableFrom(type) + && !Hashtable.class.isAssignableFrom(type)) { + properties = new ArrayList<Property>(); + + try { + Set<String> propertyNames = new HashSet<String>(); + + // Add read/write properties (ie: public getter/setter). + BeanInfo info = Introspector.getBeanInfo(type); + for (PropertyDescriptor property : info + .getPropertyDescriptors()) { + String propertyName = property.getName(); + if (/*property.getWriteMethod() != null* + &&*/ property.getReadMethod() != null && !property.getPropertyType().equals(Class.class)) { + properties.add(new MethodProperty(propertyName, + property.getWriteMethod(), property + .getReadMethod())); + propertyNames.add(propertyName); + } + } + + // Add other public fields. + Field[] fields = type.getFields(); + for (Field field : fields) { + String propertyName = field.getName(); + if (!propertyNames.contains(propertyName) + && !Modifier.isStatic(field.getModifiers()) + && !Modifier.isTransient(field.getModifiers())) { + properties.add(new FieldProperty(field)); + propertyNames.add(propertyName); + } + } + + if (Enum.class.isAssignableFrom(type)) { + properties.add(new MethodProperty("name", null, type.getMethod("name"))); + propertyNames.add("name"); + } + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + return properties; + } +} uk.co.arum.osgi.amf3/src/org/granite/messaging/amf/io/util/DefaultJavaClassDescriptor.java @@ -49,8 +49,6 @@ public class MethodProperty extends Property { public void setProperty(Object instance, Object value, boolean convert) { /* - * FIXME review - * * Basically, what is happening here is that if a property that is * supposedly an AMF Object is being set to null, it is coming through * as a type 0x9 element (array) with a single null value, rather than a uk.co.arum.osgi.amf3/src/org/granite/messaging/amf/io/util/MethodProperty.java @@ -84,18 +84,19 @@ public class GlueManager { // might be that this class doesn't require any bindings, // so check to be sure - if (!active) { + if (!active && allBindings.size() == 0) { check(); } } - private void extractBindings(Glueable glueable, String bindMethodName, - String unbindMethodName, Map<String, Bindings> bindingMethods) { + private void extractBindings(Glueable glueable, String bindMethodPrefix, + String unbindMethodPrefix, Map<String, Bindings> bindingMethods) { Method[] methods = glueable.getClass().getMethods(); for (Method bindMethod : methods) { - if (bindMethod.getName().startsWith(bindMethodName) + if (bindMethod.getName().startsWith(bindMethodPrefix) + && !bindMethod.getName().equals("bindContext") && bindMethod.getParameterTypes().length == 1) { Bindings bindings; @@ -111,12 +112,12 @@ public class GlueManager { // look for the extra part to the binding name String extra = ""; - if (!bindMethod.getName().equals(bindMethodName)) { + if (!bindMethod.getName().equals(bindMethodPrefix)) { extra = bindMethod.getName().substring( - bindMethodName.length()); + bindMethodPrefix.length()); } - String actualUnbindMethodName = unbindMethodName + extra; + String actualUnbindMethodName = unbindMethodPrefix + extra; try { bindings.unbindMethod = glueable.getClass().getMethod( actualUnbindMethodName, paramType); @@ -128,7 +129,7 @@ public class GlueManager { // developer to decide if (null == bindings.unbindMethod) { logService.log(LogService.LOG_INFO, "No matching " - + unbindMethodName + " method found #" + + unbindMethodPrefix + " method found #" + actualUnbindMethodName + "(" + paramType.getName() + ")"); } uk.co.arum.osgi.glue/src/uk/co/arum/osgi/glue/bundle/GlueManager.java uk.co.arum.osgi.amf3.flex.remoting/build.xml uk.co.arum.osgi.amf3.http/build.xml uk.co.arum.osgi.amf3.sample/build.xml uk.co.arum.osgi.amf3/build.xml uk.co.arum.osgi.glue.sample/build.xml uk.co.arum.osgi.glue/build.xml uk.co.arum.osgi.log.sysout/build.xml 5cd84e14e06eedef9b90870f38355ac9758092cf brindy brindy@brindy.org.uk http://github.com/arum/bundles/commit/3340bed36e835fa4aff20d26c0875a79b73ed131 3340bed36e835fa4aff20d26c0875a79b73ed131

2009-09-30T10:16:15-07:00

various fixes and improvements (will start using jira from now on) 1111e8cf93c8fa2b05f8d73122501e6aaf668be9 brindy brindy@brindy.org.uk