You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/03/29 23:21:36 UTC
svn commit: r523842 [2/2] - in
/incubator/servicemix/trunk/core/servicemix-core: ./
src/main/java/org/apache/servicemix/jbi/container/
src/main/java/org/apache/servicemix/jbi/framework/
src/main/java/org/apache/servicemix/jbi/framework/support/ src/mai...
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java Thu Mar 29 14:21:34 2007
@@ -94,9 +94,9 @@
private ConnectionFactory managedConnectionFactory;
private String broadcastDestinationName = "org.apache.servicemix.JCAFlow";
private ActiveMQTopic broadcastTopic;
- private Map connectorMap = new ConcurrentHashMap();
+ private Map<String, Connector> connectorMap = new ConcurrentHashMap<String, Connector>();
private AtomicBoolean started = new AtomicBoolean(false);
- private Set subscriberSet = new CopyOnWriteArraySet();
+ private Set<String> subscriberSet = new CopyOnWriteArraySet<String>();
private ConnectionManager connectionManager;
private Connector containerConnector;
private Connector broadcastConnector;
@@ -315,7 +315,7 @@
broker.getContainer().removeListener(componentListener);
// Destroy connectors
while (!connectorMap.isEmpty()) {
- Connector connector = (Connector) connectorMap.remove(connectorMap.keySet().iterator().next());
+ Connector connector = connectorMap.remove(connectorMap.keySet().iterator().next());
try {
connector.stop();
} catch (Exception e) {
@@ -375,7 +375,7 @@
public void onInternalEndpointUnregistered(EndpointEvent event, boolean broadcast) {
try{
String key = EndpointSupport.getKey(event.getEndpoint());
- Connector connector = (Connector) connectorMap.remove(key);
+ Connector connector = connectorMap.remove(key);
if (connector != null) {
connector.stop();
}
@@ -409,7 +409,7 @@
public void onComponentStopped(ComponentEvent event) {
try {
String key = event.getComponent().getName();
- Connector connector = (Connector) connectorMap.remove(key);
+ Connector connector = connectorMap.remove(key);
if (connector != null){
connector.stop();
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/AbstractJMSFlow.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/AbstractJMSFlow.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/AbstractJMSFlow.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/AbstractJMSFlow.java Thu Mar 29 14:21:34 2007
@@ -16,7 +16,6 @@
*/
package org.apache.servicemix.jbi.nmr.flow.jms;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -77,9 +76,9 @@
private MessageConsumer broadcastConsumer;
- protected Set subscriberSet = new CopyOnWriteArraySet();
+ protected Set<String> subscriberSet = new CopyOnWriteArraySet<String>();
- private Map consumerMap = new ConcurrentHashMap();
+ private Map<String, MessageConsumer> consumerMap = new ConcurrentHashMap<String, MessageConsumer>();
AtomicBoolean started = new AtomicBoolean(false);
@@ -281,8 +280,7 @@
});
// Start queue consumers for all components
- for (Iterator it = broker.getContainer().getRegistry().getComponents().iterator(); it.hasNext();) {
- ComponentMBeanImpl cmp = (ComponentMBeanImpl) it.next();
+ for (ComponentMBeanImpl cmp : broker.getContainer().getRegistry().getComponents()) {
if (cmp.isStarted()) {
onComponentStarted(new ComponentEvent(cmp, ComponentEvent.COMPONENT_STARTED));
}
@@ -313,8 +311,7 @@
if (started.compareAndSet(true, false)) {
log.debug(broker.getContainer().getName() + ": Stopping jms flow");
super.stop();
- for (Iterator it = subscriberSet.iterator(); it.hasNext();) {
- String id = (String) it.next();
+ for (String id : subscriberSet) {
removeAllPackets(id);
}
subscriberSet.clear();
@@ -376,7 +373,7 @@
public void onInternalEndpointUnregistered(EndpointEvent event, boolean broadcast) {
try {
String key = EndpointSupport.getKey(event.getEndpoint());
- MessageConsumer consumer = (MessageConsumer) consumerMap.remove(key);
+ MessageConsumer consumer = consumerMap.remove(key);
if (consumer != null) {
consumer.close();
}
@@ -425,7 +422,7 @@
public void onComponentStopped(ComponentEvent event) {
try {
String key = event.getComponent().getName();
- MessageConsumer consumer = (MessageConsumer) consumerMap.remove(key);
+ MessageConsumer consumer = consumerMap.remove(key);
if (consumer != null) {
consumer.close();
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java Thu Mar 29 14:21:34 2007
@@ -16,7 +16,6 @@
*/
package org.apache.servicemix.jbi.nmr.flow.seda;
-import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -53,7 +52,7 @@
*/
public class SedaFlow extends AbstractFlow {
- protected Map queueMap = new ConcurrentHashMap();
+ protected Map<ComponentNameSpace, SedaQueue> queueMap = new ConcurrentHashMap<ComponentNameSpace, SedaQueue>();
protected AtomicBoolean started = new AtomicBoolean(false);
protected ComponentListener listener;
@@ -112,8 +111,7 @@
*/
public void start() throws JBIException {
if (started.compareAndSet(false, true)) {
- for (Iterator i = queueMap.values().iterator();i.hasNext();) {
- SedaQueue queue = (SedaQueue) i.next();
+ for (SedaQueue queue : queueMap.values()) {
queue.start();
}
}
@@ -127,8 +125,7 @@
*/
public void stop() throws JBIException {
if (started.compareAndSet(true, false)) {
- for (Iterator i = queueMap.values().iterator();i.hasNext();) {
- SedaQueue queue = (SedaQueue) i.next();
+ for (SedaQueue queue : queueMap.values()) {
queue.stop();
}
}
@@ -142,8 +139,7 @@
*/
public void shutDown() throws JBIException {
broker.getContainer().removeListener(listener);
- for (Iterator i = queueMap.values().iterator(); i.hasNext();) {
- SedaQueue queue = (SedaQueue) i.next();
+ for (SedaQueue queue : queueMap.values()) {
queue.shutDown();
unregisterQueue(queue);
}
@@ -182,7 +178,7 @@
*/
protected void enqueuePacket(MessageExchangeImpl me) throws JBIException {
ComponentNameSpace cns = me.getDestinationId();
- SedaQueue queue = (SedaQueue) queueMap.get(cns);
+ SedaQueue queue = queueMap.get(cns);
if (queue == null) {
queue = createQueue(cns);
}
@@ -195,7 +191,7 @@
}
protected synchronized SedaQueue createQueue(ComponentNameSpace cns) throws JBIException {
- SedaQueue queue = (SedaQueue) queueMap.get(cns);
+ SedaQueue queue = queueMap.get(cns);
if (queue == null) {
queue = new SedaQueue(cns);
queue.init(this);
@@ -214,7 +210,7 @@
* @param event
*/
public synchronized void onComponentShutdown(ComponentNameSpace cns) {
- SedaQueue queue = (SedaQueue) queueMap.remove(cns);
+ SedaQueue queue = queueMap.remove(cns);
if (queue != null) {
try {
queue.shutDown();
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/SecuredBroker.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/SecuredBroker.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/SecuredBroker.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/SecuredBroker.java Thu Mar 29 14:21:34 2007
@@ -16,6 +16,7 @@
*/
package org.apache.servicemix.jbi.security;
+import java.security.Principal;
import java.util.Set;
import javax.jbi.JBIException;
@@ -64,7 +65,7 @@
resolveAddress(exchange);
ServiceEndpoint se = exchange.getEndpoint();
if (se != null) {
- Set acls = authorizationMap.getAcls(se, me.getOperation());
+ Set<Principal> acls = authorizationMap.getAcls(se, me.getOperation());
if (!acls.contains(GroupPrincipal.ANY)) {
Subject subject = exchange.getMessage("in").getSecuritySubject();
if (subject == null) {
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/AuthorizationMap.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/AuthorizationMap.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/AuthorizationMap.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/AuthorizationMap.java Thu Mar 29 14:21:34 2007
@@ -16,6 +16,7 @@
*/
package org.apache.servicemix.jbi.security.acl;
+import java.security.Principal;
import java.util.Set;
import javax.jbi.servicedesc.ServiceEndpoint;
@@ -23,6 +24,6 @@
public interface AuthorizationMap {
- Set getAcls(ServiceEndpoint endpoint, QName operation);
+ Set<Principal> getAcls(ServiceEndpoint endpoint, QName operation);
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/AuthorizationEntry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/AuthorizationEntry.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/AuthorizationEntry.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/AuthorizationEntry.java Thu Mar 29 14:21:34 2007
@@ -46,7 +46,7 @@
*/
public static final String TYPE_REM = "rem";
- private Set acls;
+ private Set<GroupPrincipal> acls;
private QName service;
private String endpoint;
private QName operation;
@@ -135,19 +135,19 @@
/**
* @return the acls
*/
- public Set getAcls() {
+ public Set<GroupPrincipal> getAcls() {
return acls;
}
/**
* @param acls the acls to set
*/
- public void setAcls(Set acls) {
+ public void setAcls(Set<GroupPrincipal> acls) {
this.acls = acls;
}
public void setRoles(String roles) {
- this.acls = new HashSet();
+ this.acls = new HashSet<GroupPrincipal>();
StringTokenizer iter = new StringTokenizer(roles, ",");
while (iter.hasMoreTokens()) {
String name = iter.nextToken().trim();
@@ -158,8 +158,8 @@
public String getRoles() {
StringBuffer sb = new StringBuffer();
if (this.acls != null) {
- for (Iterator iter = this.acls.iterator(); iter.hasNext();) {
- GroupPrincipal p = (GroupPrincipal) iter.next();
+ for (Iterator<GroupPrincipal> iter = this.acls.iterator(); iter.hasNext();) {
+ GroupPrincipal p = iter.next();
sb.append(p);
if (iter.hasNext()) {
sb.append(",");
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/DefaultAuthorizationMap.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/DefaultAuthorizationMap.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/DefaultAuthorizationMap.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/DefaultAuthorizationMap.java Thu Mar 29 14:21:34 2007
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.jbi.security.acl.impl;
+import java.security.Principal;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
@@ -36,19 +36,19 @@
public class DefaultAuthorizationMap implements AuthorizationMap {
private AuthorizationEntry defaultEntry;
- private List authorizationEntries;
+ private List<AuthorizationEntry> authorizationEntries;
public DefaultAuthorizationMap() {
}
- public DefaultAuthorizationMap(List authorizationEntries) {
+ public DefaultAuthorizationMap(List<AuthorizationEntry> authorizationEntries) {
this.authorizationEntries = authorizationEntries;
}
/**
* @return the authorizationEntries
*/
- public List getAuthorizationEntries() {
+ public List<AuthorizationEntry> getAuthorizationEntries() {
return authorizationEntries;
}
@@ -56,7 +56,7 @@
* @param authorizationEntries the authorizationEntries to set
* @org.apache.xbean.ElementType class="org.apache.servicemix.jbi.security.AuthorizationEntry"
*/
- public void setAuthorizationEntries(List authorizationEntries) {
+ public void setAuthorizationEntries(List<AuthorizationEntry> authorizationEntries) {
this.authorizationEntries = authorizationEntries;
}
@@ -74,13 +74,12 @@
this.defaultEntry = defaultEntry;
}
- public Set getAcls(ServiceEndpoint endpoint, QName operation) {
- Set acls = new HashSet();
+ public Set<Principal> getAcls(ServiceEndpoint endpoint, QName operation) {
+ Set<Principal> acls = new HashSet<Principal>();
if (defaultEntry != null) {
- acls.add(defaultEntry);
+ acls.addAll(defaultEntry.getAcls());
}
- for (Iterator iter = authorizationEntries.iterator(); iter.hasNext();) {
- AuthorizationEntry entry = (AuthorizationEntry) iter.next();
+ for (AuthorizationEntry entry : authorizationEntries) {
if (match(entry, endpoint, operation)) {
if (AuthorizationEntry.TYPE_ADD.equalsIgnoreCase(entry.getType())) {
acls.addAll(entry.getAcls());
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/InternalEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/InternalEndpoint.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/InternalEndpoint.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/InternalEndpoint.java Thu Mar 29 14:21:34 2007
@@ -40,8 +40,8 @@
private String endpointName;
private QName serviceName;
- private Set interfaces = new HashSet();
- private transient Map remotes = new HashMap();
+ private Set<QName> interfaces = new HashSet<QName>();
+ private transient Map<ComponentNameSpace, InternalEndpoint> remotes = new HashMap<ComponentNameSpace, InternalEndpoint>();
/**
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FastStack.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FastStack.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FastStack.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FastStack.java Thu Mar 29 14:21:34 2007
@@ -18,13 +18,13 @@
import java.util.ArrayList;
-public class FastStack extends ArrayList {
+public class FastStack<T> extends ArrayList<T> {
- public void push(Object o) {
+ public void push(T o) {
add(o);
}
- public Object pop() {
+ public T pop() {
return remove(size() - 1);
}
@@ -32,7 +32,7 @@
return size() == 0;
}
- public Object peek() {
+ public T peek() {
return get(size() - 1);
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/DotViewEndpointListener.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/DotViewEndpointListener.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/DotViewEndpointListener.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/DotViewEndpointListener.java Thu Mar 29 14:21:34 2007
@@ -28,7 +28,6 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
/**
@@ -88,11 +87,10 @@
writer.println("jbi [ fillcolor = \"#FFFF99\", label=\"Apache ServiceMix: " + container.getName() + "\" ];");
writer.println();
- List brokerLinks = new ArrayList();
+ List<String> brokerLinks = new ArrayList<String>();
Registry registry = container.getRegistry();
- Collection components = registry.getComponents();
- for (Iterator iter = components.iterator(); iter.hasNext();) {
- ComponentMBeanImpl component = (ComponentMBeanImpl) iter.next();
+ Collection<ComponentMBeanImpl> components = registry.getComponents();
+ for (ComponentMBeanImpl component : components) {
String name = component.getName();
String id = encode(name);
@@ -108,10 +106,9 @@
writer.println();
- List componentEndpointLinks = new ArrayList();
- Collection endpointMBeans = registry.getEndpointRegistry().getEndpointMBeans();
- for (Iterator iter = endpointMBeans.iterator(); iter.hasNext();) {
- Endpoint endpoint = (Endpoint) iter.next();
+ List<String> componentEndpointLinks = new ArrayList<String>();
+ Collection<Endpoint> endpointMBeans = registry.getEndpointRegistry().getEndpointMBeans();
+ for (Endpoint endpoint : endpointMBeans) {
String key = endpoint.getSubType().toLowerCase() + ":{" +
endpoint.getServiceName().getNamespaceURI() + "}" +
endpoint.getServiceName().getLocalPart() + ":" +
@@ -162,9 +159,9 @@
}
}
- protected void generateLinks(PrintWriter writer, Collection lines, String style) {
- for (Iterator iter = lines.iterator(); iter.hasNext();) {
- writer.print(iter.next().toString());
+ protected void generateLinks(PrintWriter writer, Collection<String> lines, String style) {
+ for (String line : lines) {
+ writer.print(line);
if (style != null) {
writer.print(" [" + style + "]");
}
@@ -173,7 +170,7 @@
writer.println();
}
- protected void generateLinks(PrintWriter writer, Collection lines) {
+ protected void generateLinks(PrintWriter writer, Collection<String> lines) {
generateLinks(writer, lines, null);
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/DotViewFlowListener.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/DotViewFlowListener.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/DotViewFlowListener.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/DotViewFlowListener.java Thu Mar 29 14:21:34 2007
@@ -19,7 +19,6 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -53,18 +52,18 @@
public class DotViewFlowListener extends DotViewEndpointListener
implements ExchangeListener, ComponentListener {
- private Map flow;
- private Set flowLinks;
- private Set usedComponents;
- private Set componentsAsConsumer;
+ private Map<String, Map<String, Boolean>> flow;
+ private Set<String> flowLinks;
+ private Set<String> usedComponents;
+ private Set<String> componentsAsConsumer;
private boolean displayComponents = true;
public DotViewFlowListener() {
setFile("ServiceMixFlow.dot");
- flow = new ConcurrentHashMap();
- flowLinks = new CopyOnWriteArraySet();
- usedComponents = new CopyOnWriteArraySet();
- componentsAsConsumer = new CopyOnWriteArraySet();
+ flow = new ConcurrentHashMap<String, Map<String, Boolean>>();
+ flowLinks = new CopyOnWriteArraySet<String>();
+ usedComponents = new CopyOnWriteArraySet<String>();
+ componentsAsConsumer = new CopyOnWriteArraySet<String>();
}
// Implementation methods
@@ -77,11 +76,10 @@
writer.println("node [ shape = box, style = \"rounded,filled\", fontname = \"Helvetica-Oblique\", fontsize = 8 ];");
writer.println();
- List brokerLinks = new ArrayList();
+ List<String> brokerLinks = new ArrayList<String>();
Registry registry = getContainer().getRegistry();
- Collection components = registry.getComponents();
- for (Iterator iter = components.iterator(); iter.hasNext();) {
- ComponentMBeanImpl component = (ComponentMBeanImpl) iter.next();
+ Collection<ComponentMBeanImpl> components = registry.getComponents();
+ for (ComponentMBeanImpl component : components) {
ServiceEndpoint[] ses = registry.getEndpointRegistry().getAllEndpointsForComponent(component.getComponentNameSpace());
String name = component.getName();
if (!usedComponents.contains(name)) {
@@ -159,7 +157,7 @@
usedComponents.add(((AbstractServiceEndpoint) mei.getEndpoint()).getComponentNameSpace().getName());
}
String dest = EndpointSupport.getUniqueKey(mei.getEndpoint());
- Map componentFlow = createSource(source);
+ Map<String, Boolean> componentFlow = createSource(source);
if (componentFlow.put(dest, Boolean.TRUE) == null) {
flowLinks.add(encode(source) + " -> " + encode(dest));
viewIsDirty(mei.getEndpoint());
@@ -170,11 +168,11 @@
public void exchangeAccepted(ExchangeEvent event) {
}
- protected Map createSource(String name) {
+ protected Map<String, Boolean> createSource(String name) {
synchronized (flow) {
- Map componentFlow = (Map) flow.get(name);
+ Map<String, Boolean> componentFlow = flow.get(name);
if (componentFlow == null) {
- componentFlow = new ConcurrentHashMap();
+ componentFlow = new ConcurrentHashMap<String, Boolean>();
flow.put(name, componentFlow);
}
return componentFlow;
Modified: incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java?view=diff&rev=523842&r1=523841&r2=523842
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java Thu Mar 29 14:21:34 2007
@@ -30,7 +30,6 @@
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SenderComponent;
public class DeliveryChannelImplTest extends TestCase {