svn commit: r963343 - in /servicemix/smx4/features/trunk: camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ camel/servicemix-camel/src/test/java/org/apache/servic...

[dk...@apache.org]

Author: dkulp
Date: Mon Jul 12 16:46:15 2010
New Revision: 963343

URL: http://svn.apache.org/viewvc?rev=963343&view=rev
Log:
Fix warnings in eclipse

Modified:
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java
    servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRTransportFactory.java

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java?rev=963343&r1=963342&r2=963343&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java Mon Jul 12 16:46:15 2010
@@ -93,7 +93,6 @@ public class ServiceMixBinding {
     
     
     
-    @SuppressWarnings("unchecked")
     protected void addNmrHeaders(org.apache.servicemix.nmr.api.Message nmrMessage, Message camelMessage) {
         // get headers from the Camel in message
         Set<Map.Entry<String, Object>> entries = camelMessage.getHeaders().entrySet();

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java?rev=963343&r1=963342&r2=963343&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java Mon Jul 12 16:46:15 2010
@@ -55,7 +55,6 @@ public class ServiceMixComponent extends
         this.nmr = nmr;
     }
 
-    @SuppressWarnings("unchecked")
     protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
         return new ServiceMixEndpoint(this, uri, remaining);
     }

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java?rev=963343&r1=963342&r2=963343&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java Mon Jul 12 16:46:15 2010
@@ -72,14 +72,14 @@ public abstract class AbstractComponentT
         super.tearDown();
     }
 
-    private<E extends Endpoint> List<E> findEndpoints(Class<E> type) {
-        List result = new LinkedList();
+    private <E extends Endpoint> List<E> findEndpoints(Class<E> type) {
+        List<E> result = new LinkedList<E>();
 
         for (Endpoint endpoint : nmr.getEndpointRegistry().getServices()) {
             if (endpoint instanceof InternalEndpointWrapper) {
                 InternalEndpointWrapper wrapper = (InternalEndpointWrapper) endpoint;
                 if (type.isAssignableFrom(wrapper.getEndpoint().getClass())) {
-                    result.add(wrapper.getEndpoint());
+                    result.add(type.cast(wrapper.getEndpoint()));
                 }
             }
         }

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java?rev=963343&r1=963342&r2=963343&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java Mon Jul 12 16:46:15 2010
@@ -58,9 +58,9 @@ public class SmxToCxfTest extends CamelS
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/camel/spring/DummyBean.xml") {
             @Override
-            public Object getBean(String name, Class requiredType) throws BeansException {
+            public <T> T getBean(String name, Class<T> requiredType) throws BeansException {
                 if (BUS_BEAN_NAME.equals(name)) {
-                    return bus;
+                    return requiredType.cast(bus);
                 }                
                 return super.getBean(name, requiredType);    //To change body of overridden methods use File | Settings | File Templates.
             }

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java?rev=963343&r1=963342&r2=963343&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java Mon Jul 12 16:46:15 2010
@@ -92,7 +92,6 @@ public class WSAddressingTest extends Ca
     private CamelContext camelContext;
     private ServiceMixComponent smxComponent;
     private NMR nmr;
-    private Bus bus;
     private Endpoint endpoint;
 
     static {

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java?rev=963343&r1=963342&r2=963343&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java Mon Jul 12 16:46:15 2010
@@ -44,7 +44,7 @@ public class KeystorePasswordCallback im
         for (int i = 0; i < callbacks.length; i++) {
             WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
 
-            String pass = passwords.get(pc.getIdentifer());
+            String pass = passwords.get(pc.getIdentifier());
             if (pass != null) {
                 pc.setPassword(pass);
                 return;

Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRTransportFactory.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRTransportFactory.java?rev=963343&r1=963342&r2=963343&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRTransportFactory.java (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRTransportFactory.java Mon Jul 12 16:46:15 2010
@@ -49,13 +49,9 @@ public class NMRTransportFactory extends
     
     public static final String TRANSPORT_ID = "http://cxf.servicemix.apache.org/transport/nmr";
     
-    private static final Logger LOG = LogUtils.getL7dLogger(NMRTransportFactory.class);
-
-
     private NMR nmr;
     private Bus bus;
     private final Map<String, NMRDestination> destinationMap =  new HashMap<String, NMRDestination>();
-    
 
     private Collection<String> activationNamespaces;