ace-commits mailing list archives

Author: marrs
Date: Wed Mar 23 16:16:07 2011
New Revision: 1084624

URL: http://svn.apache.org/viewvc?rev=1084624&view=rev
Log:
Fixed a bug where new targets did not immediately show up in the UI.

Modified:
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
    incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
    incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java?rev=1084624&r1=1084623&r2=1084624&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
(original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java
Wed Mar 23 16:16:07 2011
@@ -132,7 +132,7 @@ public class Activator extends Dependenc
         String filter = "(" + SessionFactory.SERVICE_SID + "=" + sessionID + ")";
         topic.put(EventConstants.EVENT_FILTER, filter);
         topic.put(SessionFactory.SERVICE_SID, sessionID);
-        StatefulGatewayRepositoryImpl statefulGatewayRepositoryImpl = new StatefulGatewayRepositoryImpl();
+        StatefulGatewayRepositoryImpl statefulGatewayRepositoryImpl = new StatefulGatewayRepositoryImpl(sessionID);
         sd.m_service2 = createComponent()
             .setInterface(new String[] { StatefulGatewayRepository.class.getName(), EventHandler.class.getName()
}, topic)
             .setImplementation(statefulGatewayRepositoryImpl)

Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java?rev=1084624&r1=1084623&r2=1084624&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
(original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
Wed Mar 23 16:16:07 2011
@@ -34,6 +34,7 @@ import java.util.concurrent.ConcurrentHa
 import org.apache.ace.client.repository.RepositoryAdmin;
 import org.apache.ace.client.repository.RepositoryObject;
 import org.apache.ace.client.repository.RepositoryUtil;
+import org.apache.ace.client.repository.SessionFactory;
 import org.apache.ace.client.repository.helper.bundle.BundleHelper;
 import org.apache.ace.client.repository.object.ArtifactObject;
 import org.apache.ace.client.repository.object.DeploymentArtifact;
@@ -73,6 +74,11 @@ public class StatefulGatewayRepositoryIm
     private BundleHelper m_bundleHelper; /*Injected by dependency manager*/
     //TODO: Make the concurrencyLevel of this concurrent hashmap settable?
     private Map<String, StatefulGatewayObjectImpl> m_repository = new ConcurrentHashMap<String,
StatefulGatewayObjectImpl>();
+    private final String m_sessionID;
+
+    public StatefulGatewayRepositoryImpl(String sessionID) {
+        m_sessionID = sessionID;
+    }
 
     public StatefulGatewayObject create(Map<String, String> attributes, Map<String,
String> tags) throws IllegalArgumentException {
         throw new UnsupportedOperationException("Creating StatefulGatewayObjects is not supported.");
@@ -324,6 +330,7 @@ public class StatefulGatewayRepositoryIm
      */
     void notifyChanged(StatefulGatewayObject sgoi, String topic, Properties additionalProperties)
{
         additionalProperties.put(RepositoryObject.EVENT_ENTITY, sgoi);
+        additionalProperties.put(SessionFactory.SERVICE_SID, m_sessionID);
         m_eventAdmin.postEvent(new Event(topic, (Dictionary) additionalProperties));
     }
 

Modified: incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java?rev=1084624&r1=1084623&r2=1084624&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java
(original)
+++ incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java
Wed Mar 23 16:16:07 2011
@@ -30,11 +30,12 @@ import org.apache.ace.webui.UIExtensionF
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
 import org.osgi.framework.BundleContext;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventConstants;
+import org.osgi.service.event.EventHandler;
 import org.osgi.service.http.HttpService;
 
-import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
-import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;