You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/04/26 08:12:36 UTC
svn commit: r1330667 - in
/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell:
ObrAddUrlCommand.java ObrRemoveUrlCommand.java
Author: jbonofre
Date: Thu Apr 26 06:12:36 2012
New Revision: 1330667
URL: http://svn.apache.org/viewvc?rev=1330667&view=rev
Log:
[KARAF-1399] Apply consistent cinematic in Cellar OBR
Modified:
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java?rev=1330667&r1=1330666&r2=1330667&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrAddUrlCommand.java Thu Apr 26 06:12:36 2012
@@ -42,12 +42,7 @@ public class ObrAddUrlCommand extends Ob
System.err.println("Cluster group " + groupName + " doesn't exist.");
return null;
}
- // create an event and produce it
- EventProducer producer = eventTransportFactory.getEventProducer(groupName, true);
- ObrUrlEvent event = new ObrUrlEvent(url, Constants.URL_ADD_EVENT_TYPE);
- event.setForce(true);
- event.setSourceGroup(group);
- producer.produce(event);
+
// push the OBR URLs in the distributed set
Set<String> urls = clusterManager.getSet(Constants.URLS_DISTRIBUTED_SET_NAME + Configurations.SEPARATOR + groupName);
urls.add(url);
@@ -62,6 +57,13 @@ public class ObrAddUrlCommand extends Ob
}
obrService.removeRepository(url);
}
+
+ // create an event and produce it
+ EventProducer producer = eventTransportFactory.getEventProducer(groupName, true);
+ ObrUrlEvent event = new ObrUrlEvent(url, Constants.URL_ADD_EVENT_TYPE);
+ event.setForce(true);
+ event.setSourceGroup(group);
+ producer.produce(event);
return null;
}
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java?rev=1330667&r1=1330666&r2=1330667&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/shell/ObrRemoveUrlCommand.java Thu Apr 26 06:12:36 2012
@@ -42,12 +42,7 @@ public class ObrRemoveUrlCommand extends
System.err.println("Cluster group " + groupName + " doesn't exist.");
return null;
}
- // create an event and produce it
- EventProducer producer = eventTransportFactory.getEventProducer(groupName, true);
- ObrUrlEvent event = new ObrUrlEvent(url, Constants.URL_REMOVE_EVENT_TYPE);
- event.setForce(true);
- event.setSourceGroup(group);
- producer.produce(event);
+
// remove URLS_DISTRIBUTED_SET_NAME from the distributed map
Set<String> urls = clusterManager.getSet(Constants.URLS_DISTRIBUTED_SET_NAME + Configurations.SEPARATOR + groupName);
urls.remove(url);
@@ -62,6 +57,13 @@ public class ObrRemoveUrlCommand extends
}
obrService.removeRepository(url);
}
+
+ // create an event and produce it
+ EventProducer producer = eventTransportFactory.getEventProducer(groupName, true);
+ ObrUrlEvent event = new ObrUrlEvent(url, Constants.URL_REMOVE_EVENT_TYPE);
+ event.setForce(true);
+ event.setSourceGroup(group);
+ producer.produce(event);
return null;
}