uk.co.arum.osgi.amf3.flex.remoting/src/uk/co/arum/osgi/amf3/flex/remoting/bundle/AMFServicesTracker.java uk.co.arum.osgi.amf3.sample/src/uk/co/arum/osgi/amf3/sample/bundle/PublishedObjectEventHandler.java @@ -2,17 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AMF3 Flex Remoting for OSGi Bundle-SymbolicName: uk.co.arum.osgi.amf3.flex.remoting -Bundle-Version: 1.0.1 -Bundle-Activator: uk.co.arum.osgi.amf3.flex.remoting.bundle.Activator +Bundle-Version: 1.0.2 Bundle-Vendor: Arum Systems Ltd Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.osgi.framework;version="1.3.0", - org.osgi.service.event;version="1.1.0", - org.osgi.service.log;version="1.3.0", - org.osgi.util.tracker;version="1.3.3", - 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" +Import-Package: flex.messaging.io, + org.osgi.framework;version="[1.3.0,2.0.0)", + org.osgi.service.event;version="[1.1.0,2.0.0)", + org.osgi.service.log;version="[1.3.0,2.0.0)", + org.osgi.util.tracker;version="[1.3.3,2.0.0)", + uk.co.arum.osgi.amf3;version="[1.0.0,2.0.0)", + uk.co.arum.osgi.amf3.flex.remoting;version="[1.0.0,2.0.0)", + uk.co.arum.osgi.amf3.flex.remoting.events;version="[1.0.0,2.0.0)", + uk.co.arum.osgi.glue;version="[1.0.1,2.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" +Glueable-Component: uk.co.arum.osgi.amf3.flex.remoting.bundle.MessagingManager, + uk.co.arum.osgi.amf3.flex.remoting.bundle.FlexRemotingAMFFactory uk.co.arum.osgi.amf3.flex.remoting/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"> <info organisation="uk.co.arum" module="uk.co.arum.osgi.amf3.flex.remoting" /> <publications> - <artifact name="uk.co.arum.osgi.amf3.flex.remoting_1.0.1" ext="jar"/> + <artifact name="uk.co.arum.osgi.amf3.flex.remoting_1.0.2" ext="jar"/> </publications> <dependencies> <dependency org="uk.org.brindy" name="uk.org.brindy.osgibb" @@ -14,5 +14,6 @@ <dependency org="org.osgi" name="org.osgi.core" rev="4.1.0" /> <dependency org="org.osgi" name="org.osgi.compendium" rev="4.1.0" /> <dependency org="uk.co.arum" name="uk.co.arum.osgi.amf3" rev="1.0.1" /> + <dependency org="uk.co.arum" name="uk.co.arum.osgi.glue" rev="1.0.0" /> </dependencies> </ivy-module> uk.co.arum.osgi.amf3.flex.remoting/ivy.xml @@ -25,15 +25,19 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.ArrayList; +import java.util.Dictionary; import java.util.List; import java.util.UUID; +import org.osgi.framework.BundleContext; 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 uk.co.arum.osgi.glue.Activatable; +import uk.co.arum.osgi.glue.Contextual; +import uk.co.arum.osgi.glue.GlueableService; import flex.messaging.messages.AcknowledgeMessage; import flex.messaging.messages.AsyncMessage; import flex.messaging.messages.CommandMessage; @@ -41,7 +45,8 @@ import flex.messaging.messages.ErrorMessage; import flex.messaging.messages.Message; import flex.messaging.messages.RemotingMessage; -public class FlexRemotingAMFFactory implements AMFFactory { +public class FlexRemotingAMFFactory implements GlueableService, Activatable, + Contextual, AMFFactory { private static final String NIL_DSID = "nil"; @@ -49,19 +54,24 @@ public class FlexRemotingAMFFactory implements AMFFactory { private static final String DSID = "DSId"; - private final OSGiAMFConfig config; + private OSGiAMFConfig config; - private final MessagingManager messagingManager; + private MessagingManager messagingManager; private LogService logService; - public FlexRemotingAMFFactory(OSGiAMFConfig config, - MessagingManager messagingManager) { - this.config = config; - this.messagingManager = messagingManager; + private BundleContext context; + + private AMFServicesTracker amfServicesTracker; + + public FlexRemotingAMFFactory() { + } + + public void bind(MessagingManager mgr) { + this.messagingManager = mgr; } - public void setLogService(LogService logService) { + public void bind(LogService logService) { this.logService = logService; } @@ -154,8 +164,59 @@ public class FlexRemotingAMFFactory implements AMFFactory { } + public Object handleException(Exception ex) { + return new ErrorMessage(ex); + } + + public Object readExternal(String name, ObjectInput deserializer) { + return null; + } + + public boolean writeExternal(Object o, ObjectOutput serialiser) { + return false; + } + + public void activate() throws Exception { + logService.log(LogService.LOG_DEBUG, + "FlexRemotingAMFFactory - ACTIVATED"); + config = new OSGiAMFConfig(context); + amfServicesTracker = new AMFServicesTracker(context, config); + amfServicesTracker.open(); + } + + public void deactivate() throws Exception { + logService.log(LogService.LOG_DEBUG, + "FlexRemotingAMFFactory - DEACTIVATING"); + + amfServicesTracker.close(); + amfServicesTracker = null; + + config.dispose(); + config = null; + } + + public void bindContext(BundleContext context) { + this.context = context; + } + + public void unbindContext(BundleContext context) { + this.context = null; + } + + public Dictionary<?, ?> getProperties(String serviceName) { + return null; + } + + public String getServiceFilter(String serviceName, String name) { + return null; + } + + public String[] getServiceNames() { + return new String[] { AMFFactory.class.getName() }; + } + private Object doProcess(Object o) { - if (o instanceof ArrayList) { + if (o instanceof List<?>) { List<?> list = (List<?>) o; if (list.size() > 0) { o = list.get(0); @@ -389,16 +450,4 @@ public class FlexRemotingAMFFactory implements AMFFactory { return null; } - public Object handleException(Exception ex) { - return new ErrorMessage(ex); - } - - public Object readExternal(String name, ObjectInput deserializer) { - return null; - } - - public boolean writeExternal(Object o, ObjectOutput serialiser) { - return false; - } - } uk.co.arum.osgi.amf3.flex.remoting/src/uk/co/arum/osgi/amf3/flex/remoting/bundle/FlexRemotingAMFFactory.java @@ -23,8 +23,10 @@ package uk.co.arum.osgi.amf3.flex.remoting.bundle; import java.util.Collection; import java.util.Collections; +import java.util.Dictionary; import java.util.HashMap; import java.util.HashSet; +import java.util.Hashtable; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -35,31 +37,37 @@ import java.util.UUID; import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; +import org.osgi.service.event.EventConstants; import org.osgi.service.event.EventHandler; -import org.osgi.service.log.LogService; import uk.co.arum.osgi.amf3.flex.remoting.events.PublishedObjectEvent; +import uk.co.arum.osgi.glue.Activatable; +import uk.co.arum.osgi.glue.GlueableService; import flex.messaging.messages.AsyncMessage; @SuppressWarnings("unchecked") -public class MessagingManager implements EventHandler { +public class MessagingManager implements Activatable, GlueableService, + EventHandler { // TODO make this configurable? if so, how? public static final long SUBSCRIPTION_TIMEOUT = 1000 * 30; - private EventAdmin eventAdmin; + private final Map<String, Long> accessTimes = new HashMap<String, Long>(); - private LogService logService; + private EventAdmin eventAdmin; private final Set<Subscription> subscriptions = Collections .synchronizedSet(new HashSet<Subscription>()); - private final Map<String, List> waitingMessages = new HashMap<String, List>(); + private Timer timer; - private final Map<String, Long> accessTimes = new HashMap<String, Long>(); + private final Map<String, List> waitingMessages = new HashMap<String, List>(); public MessagingManager() { - Timer timer = new Timer(); + } + + public void activate() throws Exception { + timer = new Timer(); timer.schedule(new TimerTask() { @Override public void run() { @@ -68,24 +76,13 @@ public class MessagingManager implements EventHandler { }, SUBSCRIPTION_TIMEOUT); } - public void setEventAdmin(EventAdmin eventAdmin) { + public void bind(EventAdmin eventAdmin) { this.eventAdmin = eventAdmin; } - public void setLogService(LogService logService) { - this.logService = logService; - } - - public void handleEvent(Event event) { - if (event instanceof PublishedObjectEvent) { - PublishedObjectEvent poevent = (PublishedObjectEvent) event; - - // if the event was generated internally dispatch the event to - // connected clients - if (null == poevent.getSourceID()) { - dispatch(poevent); - } - } + public void deactivate() throws Exception { + timer.cancel(); + timer = null; } public void dispatch(PublishedObjectEvent event) { @@ -97,12 +94,7 @@ public class MessagingManager implements EventHandler { // if the event was generated externally dispatch an osgi event if (null != event.getSourceID()) { - if (eventAdmin != null) { - eventAdmin.postEvent(event); - } else { - logService.log(LogService.LOG_WARNING, - "PublishedObjectEvent: No event admin"); - } + eventAdmin.postEvent(event); } } @@ -134,34 +126,25 @@ public class MessagingManager implements EventHandler { return null; } - public void subscribe(String subscriptionID, String channel) { - - subscriptions.add(new Subscription(channel, null, this)); - addSubscriber(subscriptionID, channel, null); - - if (null == waitingMessages.get(subscriptionID)) { - waitingMessages.put(subscriptionID, new LinkedList()); - } + public Dictionary getProperties(String serviceName) { - if (null == accessTimes.get(subscriptionID)) { - accessTimes.put(subscriptionID, System.currentTimeMillis()); + if (serviceName.equals(EventHandler.class.getName())) { + String[] topics = new String[] { PublishedObjectEvent.TOPIC }; + Hashtable ht = new Hashtable(); + ht.put(EventConstants.EVENT_TOPIC, topics); + return ht; } + return null; } - public void unsubscribe(String subscriptionID, String channel) { - - Set<Subscription> expiredSubscriptions = new HashSet<Subscription>(); - for (Subscription sub : getSubscriptions(subscriptionID)) { - if (sub.getChannel().equals(channel)) { - if (sub.removeSubscription(subscriptionID) <= 0) { - expiredSubscriptions.add(sub); - } - } - } - - subscriptions.removeAll(expiredSubscriptions); + public String getServiceFilter(String serviceName, String name) { + return null; + } + public String[] getServiceNames() { + return new String[] { EventHandler.class.getName(), + MessagingManager.class.getName() }; } public Collection<Subscription> getSubscriptions(String subscriptionID) { @@ -176,6 +159,18 @@ public class MessagingManager implements EventHandler { return subs; } + public void handleEvent(Event event) { + if (event instanceof PublishedObjectEvent) { + PublishedObjectEvent poevent = (PublishedObjectEvent) event; + + // if the event was generated internally dispatch the event to + // connected clients + if (null == poevent.getSourceID()) { + dispatch(poevent); + } + } + } + public void sendMessage(String subscriptionID, String channelID, Object message) { List messages = waitingMessages.get(subscriptionID); @@ -195,6 +190,44 @@ public class MessagingManager implements EventHandler { } } + public void subscribe(String subscriptionID, String channel) { + + subscriptions.add(new Subscription(channel, null, this)); + addSubscriber(subscriptionID, channel, null); + + if (null == waitingMessages.get(subscriptionID)) { + waitingMessages.put(subscriptionID, new LinkedList()); + } + + if (null == accessTimes.get(subscriptionID)) { + accessTimes.put(subscriptionID, System.currentTimeMillis()); + } + + } + + public void unsubscribe(String subscriptionID, String channel) { + + Set<Subscription> expiredSubscriptions = new HashSet<Subscription>(); + for (Subscription sub : getSubscriptions(subscriptionID)) { + if (sub.getChannel().equals(channel)) { + if (sub.removeSubscription(subscriptionID) <= 0) { + expiredSubscriptions.add(sub); + } + } + } + + subscriptions.removeAll(expiredSubscriptions); + + } + + private void addSubscriber(String subscriptionID, String channel, + String topic) { + Collection<Subscription> subs = find(channel); + for (Subscription sub : subs) { + sub.addSubscription(subscriptionID); + } + } + private void cleanupSubscriptions() { long now = System.currentTimeMillis(); @@ -223,12 +256,4 @@ public class MessagingManager implements EventHandler { return subs; } - private void addSubscriber(String subscriptionID, String channel, - String topic) { - Collection<Subscription> subs = find(channel); - for (Subscription sub : subs) { - sub.addSubscription(subscriptionID); - } - } - } uk.co.arum.osgi.amf3.flex.remoting/src/uk/co/arum/osgi/amf3/flex/remoting/bundle/MessagingManager.java @@ -151,14 +151,16 @@ public class OSGiAMFConfig { throw new RuntimeException(e); } - for (ServiceReference ref : refs) { - Translator t = (Translator) context.getService(ref); - try { - if (t.canTranslate(from)) { - return t.translate(from); + if (null != refs) { + for (ServiceReference ref : refs) { + Translator t = (Translator) context.getService(ref); + try { + if (t.canTranslate(from)) { + return t.translate(from); + } + } finally { + context.ungetService(ref); } - } finally { - context.ungetService(ref); } } uk.co.arum.osgi.amf3.flex.remoting/src/uk/co/arum/osgi/amf3/flex/remoting/bundle/OSGiAMFConfig.java @@ -28,12 +28,15 @@ import java.util.UUID; import org.osgi.service.event.Event; /** - * A published object event. If source id has been set, it is assume this object - * was published from a Flex client. Bundles are free to dispatch this event in - * order to send objects to Flex clients subscribed to the specified channels - * and topics, but should specify null for the source id. + * A published object event. + * <p/> + * If source id has been set, it is assumed this object was published from a + * Flex client. + * <p/> + * On the server, bundles are free to dispatch this event in order to send + * objects to Flex clients subscribed to the specified channels and topics, but + * should specify null for the source id. * <p/> - * * Likewise, bundles can listen for this event, filtering on the appropriate * properties if desired in order to handle messages from Flex clients. * </p> uk.co.arum.osgi.amf3.flex.remoting/src/uk/co/arum/osgi/amf3/flex/remoting/events/PublishedObjectEvent.java @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: AMF3 Support for OSGi Over HTTP Bundle-SymbolicName: uk.co.arum.osgi.amf3.http Bundle-Version: 1.0.0 -Bundle-Activator: uk.co.arum.osgi.amf3.http.bundle.Activator Bundle-Vendor: Arum Systems Ltd Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javax.servlet;version="2.4.0", @@ -16,6 +15,8 @@ Import-Package: javax.servlet;version="2.4.0", uk.co.arum.osgi.amf3;version="1.0.0", uk.co.arum.osgi.amf3.http;version="1.0.0", uk.co.arum.osgi.amf3.http.events;version="1.0.0", - uk.co.arum.osgi.amf3.io;version="1.0.0" + uk.co.arum.osgi.amf3.io;version="1.0.0", + uk.co.arum.osgi.glue;version="[1.0.1,2.0.0)" Export-Package: uk.co.arum.osgi.amf3.http;version="1.0.0";uses:="javax.servlet.http", uk.co.arum.osgi.amf3.http.events;version="1.0.0";uses:="uk.co.arum.osgi.amf3.http,org.osgi.service.event" +Glueable-Component: uk.co.arum.osgi.amf3.http.bundle.AMFServlet uk.co.arum.osgi.amf3.http/META-INF/MANIFEST.MF @@ -33,6 +33,7 @@ import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; import org.osgi.service.event.EventAdmin; +import org.osgi.service.http.HttpService; import org.osgi.service.log.LogService; import uk.co.arum.osgi.amf3.AMFFactory; @@ -41,29 +42,64 @@ import uk.co.arum.osgi.amf3.http.HttpRequestContext; import uk.co.arum.osgi.amf3.http.events.HttpSessionCreatedEvent; import uk.co.arum.osgi.amf3.http.events.HttpSessionExpiredEvent; import uk.co.arum.osgi.amf3.io.AMFProcessor; +import uk.co.arum.osgi.glue.Activatable; +import uk.co.arum.osgi.glue.Glueable; -public class AMFServlet extends HttpServlet { +public class AMFServlet extends HttpServlet implements Glueable, Activatable { + + private static final String ALIAS_OSGIAMF = "/amf3osgi"; private static final long serialVersionUID = 1L; - private final AMFProcessor processor; + private CompoundAMFFactory compoundFactory; + + private AMFProcessor processor; + + private HttpService httpService; private EventAdmin eventAdmin; private LogService logService; - public AMFServlet(AMFFactory factory) { - this.processor = new AMFProcessor(factory); + public AMFServlet() { + } + + public void bind(HttpService httpService) { + this.httpService = httpService; } - public void setEventAdmin(EventAdmin eventAdmin) { + public void bind(EventAdmin eventAdmin) { this.eventAdmin = eventAdmin; } - public void setLogService(LogService logService) { + public void bind(LogService logService) { this.logService = logService; } + public void bind(AMFFactory[] factories) { + compoundFactory = new CompoundAMFFactory(); + for (AMFFactory factory : factories) { + compoundFactory.add(factory); + } + } + + public void unbind(AMFFactory[] factories) { + for (AMFFactory factory : factories) { + compoundFactory.remove(factory); + } + compoundFactory = null; + } + + public void activate() throws Exception { + processor = new AMFProcessor(compoundFactory); + httpService.registerServlet(ALIAS_OSGIAMF, this, null, null); + } + + public void deactivate() throws Exception { + httpService.unregister(ALIAS_OSGIAMF); + processor = null; + } + @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -122,4 +158,7 @@ public class AMFServlet extends HttpServlet { response.getOutputStream().write(outBytes.toByteArray()); } + public String getServiceFilter(String serviceName, String name) { + return null; + } } uk.co.arum.osgi.amf3.http/src/uk/co/arum/osgi/amf3/http/bundle/AMFServlet.java @@ -41,7 +41,7 @@ public class HttpSessionCreatedEvent extends Event { * the request context */ public HttpSessionCreatedEvent(HttpRequestContext context) { - super(TOPIC, (Dictionary) null); + super(TOPIC, (Dictionary<?, ?>) null); this.context = context; } uk.co.arum.osgi.amf3.http/src/uk/co/arum/osgi/amf3/http/events/HttpSessionCreatedEvent.java @@ -41,7 +41,7 @@ public class HttpSessionExpiredEvent extends Event { * the request context */ public HttpSessionExpiredEvent(HttpRequestContext context) { - super(TOPIC, (Dictionary) null); + super(TOPIC, (Dictionary<?, ?>) null); this.context = context; } uk.co.arum.osgi.amf3.http/src/uk/co/arum/osgi/amf3/http/events/HttpSessionExpiredEvent.java @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: Sample Flex OSGi AMF Bundle Bundle-SymbolicName: uk.co.arum.osgi.amf3.sample 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: flex.messaging.messages, @@ -11,8 +10,11 @@ Import-Package: flex.messaging.messages, 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", + org.osgi.service.http;version="[1.2.0,2.0.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.http;version="1.0.0", + uk.co.arum.osgi.glue;version="[1.0.1,2.0.0)" +Glueable-Component: uk.co.arum.osgi.amf3.sample.bundle.PublishedObjectEventHandler, + uk.co.arum.osgi.amf3.sample.bundle.SimpleServiceImpl uk.co.arum.osgi.amf3.sample/META-INF/MANIFEST.MF @@ -21,17 +21,23 @@ package uk.co.arum.osgi.amf3.sample.bundle; +import java.util.Dictionary; import java.util.Enumeration; +import java.util.Hashtable; import javax.servlet.http.HttpServletRequest; +import org.osgi.service.http.HttpService; +import org.osgi.service.http.NamespaceException; + 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; import uk.co.arum.osgi.amf3.sample.VerySimpleObject; +import uk.co.arum.osgi.glue.GlueableService; -public class SimpleServiceImpl implements SimpleService { +public class SimpleServiceImpl implements SimpleService, GlueableService { private SampleObject sampleObject; @@ -49,6 +55,35 @@ public class SimpleServiceImpl implements SimpleService { } + public void bind(HttpService httpService) { + try { + httpService.registerResources("/sample", "/flexbin", null); + } catch (NamespaceException e) { + throw new RuntimeException(e); + } + } + + public void unbind(HttpService httpService) { + httpService.unregister("/sample"); + } + + public Dictionary<?, ?> getProperties(String serviceName) { + if (serviceName.equals(SimpleService.class.getName())) { + Dictionary<String, String> properties = new Hashtable<String, String>(); + properties.put("AMF_SERVICE_NAME", SimpleService.class.getName()); + return properties; + } + return null; + } + + public String getServiceFilter(String serviceName, String name) { + return null; + } + + public String[] getServiceNames() { + return new String[] { SimpleService.class.getName() }; + } + private SampleObject createSampleObject(SampleObject parent, String name, long value) { SampleObject sampleObject = new SampleObject(); uk.co.arum.osgi.amf3.sample/src/uk/co/arum/osgi/amf3/sample/bundle/SimpleServiceImpl.java @@ -6,9 +6,11 @@ Bundle-Version: 1.0.1 Bundle-Vendor: Arum Systems Ltd Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . -Export-Package: uk.co.arum.osgi.amf3;version="1.0.0", +Export-Package: flex.messaging.io, + uk.co.arum.osgi.amf3;version="1.0.0", uk.co.arum.osgi.amf3.io;version="1.0.0";uses:="uk.co.arum.osgi.amf3" -Import-Package: javax.xml.parsers, +Import-Package: flex.messaging.io, + javax.xml.parsers, javax.xml.transform, javax.xml.transform.dom, javax.xml.transform.stream, uk.co.arum.osgi.amf3/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ 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 flex.messaging.io; @@ -30,50 +30,53 @@ import java.util.Collection; /** * @author Franck WOLFF */ -public class ArrayCollection extends ArrayList<Object> implements Externalizable { - - private static final long serialVersionUID = 1L; - - public ArrayCollection() { - super(); - } - - public ArrayCollection(int capacity) { - super(capacity); - } - - public ArrayCollection(Collection<?> col) { - super(col); - } - - public ArrayCollection(Object[] array) { - super(); - addAll(array); - } - - public void addAll(Object[] array) { - for (Object o : array) - add(o); - } - - public void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(toArray()); - } - - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - Object o = in.readObject(); - if (o != null) { - if (o instanceof Collection) - addAll((Collection<?>)o); - else if (o.getClass().isArray()) - addAll((Object[])o); - else // should we throw an exception ? - add(o); - } - } - - @Override - public String toString() { - return super.toString(); - } +public class ArrayCollection extends ArrayList<Object> implements + Externalizable { + + private static final long serialVersionUID = 1L; + + public ArrayCollection() { + super(); + } + + public ArrayCollection(int capacity) { + super(capacity); + } + + public ArrayCollection(Collection<?> col) { + super(col); + } + + public ArrayCollection(Object[] array) { + super(); + addAll(array); + } + + public void addAll(Object[] array) { + for (Object o : array) + add(o); + } + + public void writeExternal(ObjectOutput out) throws IOException { + out.writeObject(toArray()); + } + + public void readExternal(ObjectInput in) throws IOException, + ClassNotFoundException { + Object o = in.readObject(); + if (o != null) { + if (o instanceof Collection<?>) + addAll((Collection<?>) o); + else if (o.getClass().isArray()) + addAll((Object[]) o); + else + // should we throw an exception ? + add(o); + } + } + + @Override + public String toString() { + return super.toString(); + } } uk.co.arum.osgi.amf3/src/flex/messaging/io/ArrayCollection.java @@ -40,7 +40,6 @@ import uk.co.arum.osgi.amf3.AMFFactory; import flex.messaging.io.ASObject; import flex.messaging.io.ASRecordSet; - /** * AMF Serializer * @@ -52,7 +51,7 @@ import flex.messaging.io.ASRecordSet; * @version $Revision: 1.54 $, $Date: 2006/03/25 23:41:41 $ */ public class AMF0Serializer { - + private static final int MILLS_PER_HOUR = 60000; /** * Null message @@ -193,11 +192,11 @@ public class AMF0Serializer { if (value instanceof Object[]) { // write Object Array writeArray((Object[]) value); - } else if (value instanceof Iterator) { + } else if (value instanceof Iterator<?>) { write((Iterator<?>) value); - } else if (value instanceof Collection) { + } else if (value instanceof Collection<?>) { write((Collection<?>) value); - } else if (value instanceof Map) { + } else if (value instanceof Map<?, ?>) { writeMap((Map<?, ?>) value); } else if (value instanceof ResultSet) { ASRecordSet asRecordSet = new ASRecordSet(); @@ -207,11 +206,11 @@ public class AMF0Serializer { write((Document) value); } else { /* - MM's gateway requires all objects to be marked with the - Serializable interface in order to be serialized - That should still be followed if possible, but there is - no good reason to enforce it. - */ + * MM's gateway requires all objects to be marked with the + * Serializable interface in order to be serialized That should + * still be followed if possible, but there is no good reason to + * enforce it. + */ writeObject(value); } } uk.co.arum.osgi.amf3/src/org/granite/messaging/amf/io/AMF0Serializer.java @@ -16,7 +16,7 @@ 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; @@ -95,7 +95,7 @@ public class AMF3Serializer extends DataOutputStream implements ObjectOutput, writeAMF3Date(((Calendar) o).getTime()); } else if (o instanceof Document) { writeAMF3Xml((Document) o); - } else if (o instanceof Collection) { + } else if (o instanceof Collection<?>) { writeAMF3Collection((Collection<?>) o); } else if (o.getClass().isArray()) { if (o.getClass().getComponentType() == Byte.TYPE) { uk.co.arum.osgi.amf3/src/org/granite/messaging/amf/io/AMF3Serializer.java @@ -13,8 +13,8 @@ package uk.co.arum.osgi.glue; * all dependencies are satisfied the component is then considered activated. * * <p/> - * optional (0..1) - services are bound using optionalBind (and unbound - * using optionalUnbind), otherwise bind must be used. e.g. + * optional (0..1) - services are bound using optionalBind (and unbound using + * optionalUnbind), otherwise bind must be used. e.g. * <p/> * <code><pre> * // activation will not occur until this has been called @@ -62,10 +62,10 @@ package uk.co.arum.osgi.glue; * a new array of matching services will be passed to the bind method. * <p/> * - * Finally, in order to have the same type of service injected multiple - * times but with a different service filter Glue will take any text after the - * bind or set part of the method name. Matching unbind/optionalUnbind methods - * must still be specified, e.g. + * Finally, in order to have the same type of service injected multiple times + * but with a different service filter Glue will take any text after the bind or + * set part of the method name. Matching unbind/optionalUnbind methods must + * still be specified, e.g. * <p/> * * <code><pre> @@ -106,11 +106,11 @@ public interface Glueable { * * @param serviceName * the name of the OSGi service to lookup - * @param name + * @param bindName * any text after 'bind' or 'optionalBind' for a given service, * blank if none, but always non-null * @return the filter to use */ - String getServiceFilter(String serviceName, String name); + String getServiceFilter(String serviceName, String bindName); } uk.co.arum.osgi.glue/src/uk/co/arum/osgi/glue/Glueable.java @@ -1,5 +1,6 @@ package uk.co.arum.osgi.glue.bundle; +import java.lang.reflect.Array; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collection; @@ -105,8 +106,12 @@ public class GlueManager { bindings = new Bindings(paramType.getComponentType() .getName()); bindings.multiple = true; + System.out.println("creating array binding " + + paramType.getComponentType().getName() + "[]"); } else { bindings = new Bindings(paramType.getName()); + System.out.println("creating binding " + + paramType.getName()); } bindings.bindMethod = bindMethod; @@ -307,7 +312,8 @@ public class GlueManager { public Bindings(String serviceName) { this.serviceName = serviceName; uid = UUID.randomUUID().toString(); - logService.log(LogService.LOG_DEBUG, uid + " bindings created"); + logService.log(LogService.LOG_DEBUG, uid + " " + serviceName + + " bindings created for " + bound); } public void serviceChanged(ServiceEvent event) { @@ -372,10 +378,20 @@ public class GlueManager { services.add(o); // rebind - Object bound = services.toArray(); + Class<?> t = getArrayClass(services.iterator().next()); + Object array = Array.newInstance(t, services.size()); - bindMethod.invoke(glueable, new Object[] { bound }); - this.bound = bound; + // Object bound = services.toArray(); + int i = 0; + for (Object value : services) { + Array.set(array, i++, value); + } + + System.out.println("invoking " + bindMethod.getDeclaringClass() + + "#bind(" + t + "[])"); + bindMethod.invoke(glueable, new Object[] { array }); + + this.bound = array; // check check(); @@ -399,6 +415,20 @@ public class GlueManager { } + Class<?> getArrayClass(Object o) { + System.out.println("Looking for " + serviceName); + + Class<?>[] at = o.getClass().getInterfaces(); + for (Class<?> i : at) { + if (i.getName().equals(serviceName)) { + return i; + } + } + + throw new RuntimeException("Unable to find class " + serviceName + + " in " + o); + } + void serviceUnregistered(Object o) throws Exception { if (multiple) { uk.co.arum.osgi.glue/src/uk/co/arum/osgi/glue/bundle/GlueManager.java @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> uk.co.arum.osgi.log.sysout/.classpath @@ -8,3 +8,4 @@ Bundle-Vendor: Arum Systems Ltd Import-Package: org.osgi.framework;version="1.3.0", org.osgi.service.log;version="1.3.0", org.osgi.util.tracker;version="1.3.3" +Bundle-RequiredExecutionEnvironment: J2SE-1.5 uk.co.arum.osgi.log.sysout/META-INF/MANIFEST.MF uk.co.arum.osgi.amf3.flex.remoting/src/uk/co/arum/osgi/amf3/flex/remoting/bundle/Activator.java uk.co.arum.osgi.amf3.http/src/uk/co/arum/osgi/amf3/http/bundle/Activator.java uk.co.arum.osgi.amf3.sample/src/uk/co/arum/osgi/amf3/sample/bundle/Activator.java 9b2490cab0509ff44ddbb02e8bac007b8ed5450c brindy brindy@brindy.org.uk http://github.com/arum/bundles/commit/6fdec706a434ce8ebbb9d4beb05d78fef56ee412 6fdec706a434ce8ebbb9d4beb05d78fef56ee412 2009-10-16T18:18:28-07:00 2009-10-16T18:09:15-07:00 AMF3 OSGi now uses Arum Glue for dependency injection. Added translator facility. Added RemoteContext facility. Fixed imports and exports. 1c08bc0360bf2227d0ac8a7a90ec1094a452bc09 brindy brindy@brindy.org.uk