ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1506153 - in /ace/trunk: org.apache.ace.client.repository.itest/ org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/ org.apache.ace.client.repository/src/org/apache/ace/client/repository/ org.apache.ace.client.rep...
Date Tue, 23 Jul 2013 16:51:39 GMT
Author: bramk
Date: Tue Jul 23 16:51:38 2013
New Revision: 1506153

URL: http://svn.apache.org/r1506153
Log:
ACE-366 Make StatefulTargetRepo listen to sync events

Modified:
    ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd
    ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/TemplateProcessorTest.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java
    ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java

Modified: ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd Tue Jul 23 16:51:38 2013
@@ -22,8 +22,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.log.server.store.api;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
 -runvm: -ea
--runbundles: \
-	osgi.cmpn,\
+-runbundles: osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.felix.configadmin,\
 	org.apache.felix.eventadmin,\
@@ -69,7 +68,11 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.client.repository.helper.base;version=latest,\
 	org.apache.ace.client.repository.helper.bundle;version=latest,\
 	org.apache.ace.client.repository.helper.configuration;version=latest,\
-	org.apache.ace.client.repository.impl;version=latest
+	org.apache.ace.client.repository.impl;version=latest,\
+	org.apache.felix.gogo.command,\
+	org.apache.felix.gogo.runtime,\
+	org.apache.felix.gogo.shell
+-runproperties: org.apache.felix.eventadmin.Timeout=0
 Private-Package: org.apache.ace.it.repositoryadmin
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Client Repository itest

Modified: ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/TemplateProcessorTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/TemplateProcessorTest.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/TemplateProcessorTest.java
(original)
+++ ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/TemplateProcessorTest.java
Tue Jul 23 16:51:38 2013
@@ -382,7 +382,7 @@ public class TemplateProcessorTest exten
                 m_distribution2targetRepository.create(lo, gwo);
                 return null;
             }
-        }, false, TOPIC_ADDED);
+        }, false, TOPIC_STATUS_CHANGED);
 
         StatefulTargetObject sgo = findStatefulTarget(targetId);
         assertNotNull("Failed to find our target in the repository?!", sgo);

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
Tue Jul 23 16:51:38 2013
@@ -42,24 +42,36 @@ public interface RepositoryAdmin
      * the Object's own Changed topic.
      */
     public static final String TOPIC_REFRESH = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REFRESH_SUFFIX;
+    
+    public static final String PRIVATE_TOPIC_REFRESH = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_REFRESH_SUFFIX;
     /**
      * Indicates a successful login; the model will now be filled, as signaled by the earlier
TOPIC_REFRESH.
      */
     public static final String TOPIC_LOGIN = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_LOGIN_SUFFIX;
+    
+    public static final String PRIVATE_TOPIC_LOGIN = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_LOGIN_SUFFIX;
     /**
      * Indicates a successful logout; the model will now be empty, as signaled by the earlier
TOPIC_REFRESH.
      */
     public static final String TOPIC_LOGOUT = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_LOGOUT_SUFFIX;
+    
+    public static final String PRIVATE_TOPIC_LOGOUT = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_LOGOUT_SUFFIX;
     /**
      * Signals that isCurrent or isModified have (potentially) changed.
      */
     public static final String TOPIC_STATUSCHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_STATUSCHANGED_SUFFIX;
+    
+    public static final String PRIVATE_TOPIC_STATUSCHANGED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_STATUSCHANGED_SUFFIX;
     /**
      * Signals that a flush() has been done.
      */
     public static final String TOPIC_FLUSHED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_FLUSHED_SUFFIX;
+    
+    public static final String PRIVATE_TOPIC_FLUSHED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_FLUSHED_SUFFIX;
 
     public static final String TOPIC_ALL = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ALL_SUFFIX;
+    
+    public static final String PRIVATE_TOPIC_ALL = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ALL_SUFFIX;
 
     /**
      * Checks out the most recent version of the repositories from <code>login</code>.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java
Tue Jul 23 16:51:38 2013
@@ -138,7 +138,7 @@ public class Activator extends Dependenc
             destroySessionServices(sessionData, sessionID);
         }
     }
-
+    
     /**
      * Creates all necessary session-related service for the given session.
      * 
@@ -163,16 +163,16 @@ public class Activator extends Dependenc
         topic.put(SessionFactory.SERVICE_SID, sessionID);
         topic.put(EventConstants.EVENT_FILTER, sessionFilter);
         topic.put(EventConstants.EVENT_TOPIC, new String[] {
-            ArtifactObject.TOPIC_ALL,
-            Artifact2FeatureAssociation.TOPIC_ALL,
-            FeatureObject.TOPIC_ALL,
-            Feature2DistributionAssociation.TOPIC_ALL,
-            DistributionObject.TOPIC_ALL,
-            Distribution2TargetAssociation.TOPIC_ALL,
-            TargetObject.TOPIC_ALL,
-            DeploymentVersionObject.TOPIC_ALL,
-            RepositoryAdmin.TOPIC_REFRESH, 
-            RepositoryAdmin.TOPIC_LOGIN 
+            ArtifactObject.PRIVATE_TOPIC_ALL,
+            Artifact2FeatureAssociation.PRIVATE_TOPIC_ALL,
+            FeatureObject.PRIVATE_TOPIC_ALL,
+            Feature2DistributionAssociation.PRIVATE_TOPIC_ALL,
+            DistributionObject.PRIVATE_TOPIC_ALL,
+            Distribution2TargetAssociation.PRIVATE_TOPIC_ALL,
+            TargetObject.PRIVATE_TOPIC_ALL,
+            DeploymentVersionObject.PRIVATE_TOPIC_ALL,
+            RepositoryAdmin.PRIVATE_TOPIC_REFRESH, 
+            RepositoryAdmin.PRIVATE_TOPIC_LOGIN 
         });
         
         StatefulTargetRepositoryImpl statefulTargetRepositoryImpl = new StatefulTargetRepositoryImpl(sessionID);

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
Tue Jul 23 16:51:38 2013
@@ -30,4 +30,10 @@ public interface Artifact2FeatureAssocia
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
     public static final String TOPIC_ALL = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ALL_SUFFIX;
+    
+    public static final String PRIVATE_TOPIC_ADDED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ADDED_SUFFIX;
+    public static final String PRIVATE_TOPIC_REMOVED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_REMOVED_SUFFIX;
+    public static final String PRIVATE_TOPIC_CHANGED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_CHANGED_SUFFIX;
+    public static final String PRIVATE_TOPIC_ALL = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ALL_SUFFIX;
+
 }

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
Tue Jul 23 16:51:38 2013
@@ -68,6 +68,11 @@ public interface ArtifactObject extends 
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
     public static final String TOPIC_ALL = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ALL_SUFFIX;
 
+    public static final String PRIVATE_TOPIC_ADDED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ADDED_SUFFIX;
+    public static final String PRIVATE_TOPIC_REMOVED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_REMOVED_SUFFIX;
+    public static final String PRIVATE_TOPIC_CHANGED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_CHANGED_SUFFIX;
+    public static final String PRIVATE_TOPIC_ALL = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ALL_SUFFIX;
+
     /**
      * Returns all <code>GroupObject</code>s this object is associated with.
If there
      * are none, an empty list will be returned.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
Tue Jul 23 16:51:38 2013
@@ -39,6 +39,11 @@ public interface DeploymentVersionObject
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
     public static final String TOPIC_ALL = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ALL_SUFFIX;
 
+    public static final String PRIVATE_TOPIC_ADDED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ADDED_SUFFIX;
+    public static final String PRIVATE_TOPIC_REMOVED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_REMOVED_SUFFIX;
+    public static final String PRIVATE_TOPIC_CHANGED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_CHANGED_SUFFIX;
+    public static final String PRIVATE_TOPIC_ALL = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ALL_SUFFIX;
+
     /**
      * Gets the target which is related to this version.
      */

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
Tue Jul 23 16:51:38 2013
@@ -30,4 +30,10 @@ public interface Distribution2TargetAsso
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
     public static final String TOPIC_ALL = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ALL_SUFFIX;
+    
+    public static final String PRIVATE_TOPIC_ADDED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ADDED_SUFFIX;
+    public static final String PRIVATE_TOPIC_REMOVED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_REMOVED_SUFFIX;
+    public static final String PRIVATE_TOPIC_CHANGED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_CHANGED_SUFFIX;
+    public static final String PRIVATE_TOPIC_ALL = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ALL_SUFFIX;
+
 }

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
Tue Jul 23 16:51:38 2013
@@ -34,6 +34,11 @@ public interface DistributionObject exte
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
     public static final String TOPIC_ALL = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ALL_SUFFIX;
 
+    public static final String PRIVATE_TOPIC_ADDED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ADDED_SUFFIX;
+    public static final String PRIVATE_TOPIC_REMOVED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_REMOVED_SUFFIX;
+    public static final String PRIVATE_TOPIC_CHANGED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_CHANGED_SUFFIX;
+    public static final String PRIVATE_TOPIC_ALL = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ALL_SUFFIX;
+
     public static final String KEY_DESCRIPTION = "description";
     public static final String KEY_NAME = "name";
 

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
Tue Jul 23 16:51:38 2013
@@ -30,4 +30,10 @@ public interface Feature2DistributionAss
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
     public static final String TOPIC_ALL = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ALL_SUFFIX;
+    
+    public static final String PRIVATE_TOPIC_ADDED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ADDED_SUFFIX;
+    public static final String PRIVATE_TOPIC_REMOVED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_REMOVED_SUFFIX;
+    public static final String PRIVATE_TOPIC_CHANGED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_CHANGED_SUFFIX;
+    public static final String PRIVATE_TOPIC_ALL = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ALL_SUFFIX;
+
 }

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
Tue Jul 23 16:51:38 2013
@@ -37,6 +37,11 @@ public interface FeatureObject extends R
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
     public static final String TOPIC_ALL = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ALL_SUFFIX;
 
+    public static final String PRIVATE_TOPIC_ADDED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ADDED_SUFFIX;
+    public static final String PRIVATE_TOPIC_REMOVED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_REMOVED_SUFFIX;
+    public static final String PRIVATE_TOPIC_CHANGED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_CHANGED_SUFFIX;
+    public static final String PRIVATE_TOPIC_ALL = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ALL_SUFFIX;
+
     /**
      * Returns all <code>ArtifactObject</code>s this object is associated with.
If there
      * are none, an empty list will be returned.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
Tue Jul 23 16:51:38 2013
@@ -33,6 +33,11 @@ public interface TargetObject extends Re
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
     public static final String TOPIC_ALL = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ALL_SUFFIX;
 
+    public static final String PRIVATE_TOPIC_ADDED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ADDED_SUFFIX;
+    public static final String PRIVATE_TOPIC_REMOVED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_REMOVED_SUFFIX;
+    public static final String PRIVATE_TOPIC_CHANGED = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_CHANGED_SUFFIX;
+    public static final String PRIVATE_TOPIC_ALL = PRIVATE_TOPIC_ROOT + TOPIC_ENTITY_ROOT
+ TOPIC_ALL_SUFFIX;
+
     /**
      * Returns all <code>DistributionObject</code>s this object is associated
with. If there
      * are none, an empty list will be returned.

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java
Tue Jul 23 16:51:38 2013
@@ -711,7 +711,7 @@ public class StatefulTargetRepositoryImp
 
     public void handleEvent(Event event) {
         String topic = event.getTopic();
-        if (TargetObject.TOPIC_ADDED.equals(topic)) {
+        if (TargetObject.PRIVATE_TOPIC_ADDED.equals(topic)) {
             synchronized (m_repository) {
                 String id = ((TargetObject) event.getProperty(RepositoryObject.EVENT_ENTITY)).getID();
                 StatefulTargetObjectImpl stoi = getStatefulTargetObject(id);
@@ -723,7 +723,7 @@ public class StatefulTargetRepositoryImp
                 }
             }
         }
-        else if (TargetObject.TOPIC_REMOVED.equals(topic)) {
+        else if (TargetObject.PRIVATE_TOPIC_REMOVED.equals(topic)) {
             synchronized (m_repository) {
                 String id = ((TargetObject) event.getProperty(RepositoryObject.EVENT_ENTITY)).getID();
                 StatefulTargetObjectImpl stoi = getStatefulTargetObject(id);
@@ -733,7 +733,7 @@ public class StatefulTargetRepositoryImp
                 }
             }
         }
-        else if (DeploymentVersionObject.TOPIC_ADDED.equals(topic) || DeploymentVersionObject.TOPIC_REMOVED.equals(topic))
{
+        else if (DeploymentVersionObject.PRIVATE_TOPIC_ADDED.equals(topic) || DeploymentVersionObject.PRIVATE_TOPIC_REMOVED.equals(topic))
{
             synchronized (m_repository) {
                 DeploymentVersionObject deploymentVersionObject = ((DeploymentVersionObject)
event.getProperty(RepositoryObject.EVENT_ENTITY));
                 String id = deploymentVersionObject.getTargetID();
@@ -746,7 +746,7 @@ public class StatefulTargetRepositoryImp
                 }
             }
         }
-        else if (RepositoryAdmin.TOPIC_LOGIN.equals(topic) || RepositoryAdmin.TOPIC_REFRESH.equals(topic))
{
+        else if (RepositoryAdmin.PRIVATE_TOPIC_LOGIN.equals(topic) || RepositoryAdmin.PRIVATE_TOPIC_REFRESH.equals(topic))
{
             synchronized (m_repository) {
                 populate();
             }

Modified: ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java?rev=1506153&r1=1506152&r2=1506153&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java (original)
+++ ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java Tue Jul 23
16:51:38 2013
@@ -345,7 +345,7 @@ public class IntegrationTestBase extends
         	
             // Wait for CM to settle or we may get "socket closed" due to HTTP service restarts
             // TODO fix this, it slows down all tests
-            Thread.sleep(2000);
+            Thread.sleep(500);
         }
         catch (InterruptedException e) {
             fail("Interrupted while waiting for services to get started.");



Mime
View raw message