activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1153425 - in /activemq/trunk: activemq-core/src/main/java/org/apache/activemq/kaha/MapContainer.java activemq-core/src/main/java/org/apache/activemq/usage/Usage.java pom.xml
Date Wed, 03 Aug 2011 10:53:13 GMT
Author: dejanb
Date: Wed Aug  3 10:53:12 2011
New Revision: 1153425

URL: http://svn.apache.org/viewvc?rev=1153425&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3427 - compile on jdk7

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/MapContainer.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/MapContainer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/MapContainer.java?rev=1153425&r1=1153424&r2=1153425&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/MapContainer.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/MapContainer.java
Wed Aug  3 10:53:12 2011
@@ -82,7 +82,7 @@ public interface MapContainer<K, V> exte
      * @param key
      * @return true if the container contains the key
      */
-    boolean containsKey(K key);
+    boolean containsKey(Object key);
 
     /**
      * Get the value associated with the key
@@ -90,20 +90,20 @@ public interface MapContainer<K, V> exte
      * @param key
      * @return the value associated with the key from the store
      */
-    V get(K key);
+    V get(Object key);
 
     /**
      * @param o
      * @return true if the MapContainer contains the value o
      */
-    boolean containsValue(K o);
+    boolean containsValue(Object o);
 
     /**
      * Add add entries in the supplied Map
      * 
      * @param map
      */
-    void putAll(Map<K, V> map);
+    void putAll(Map<? extends K, ? extends V> map);
 
     /**
      * @return a Set of all the keys
@@ -137,7 +137,7 @@ public interface MapContainer<K, V> exte
      * @param key
      * @return the old value assocaited with the key or null
      */
-    V remove(K key);
+    V remove(Object key);
 
     /**
      * empty the container

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java?rev=1153425&r1=1153424&r2=1153425&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java Wed Aug
 3 10:53:12 2011
@@ -45,7 +45,7 @@ public abstract class Usage<T extends Us
     private int percentUsageMinDelta = 1;
     private final List<UsageListener> listeners = new CopyOnWriteArrayList<UsageListener>();
     private final boolean debug = LOG.isDebugEnabled();
-    private String name;
+    protected String name;
     private float usagePortion = 1.0f;
     private final List<T> children = new CopyOnWriteArrayList<T>();
     private final List<Runnable> callbacks = new LinkedList<Runnable>();
@@ -324,14 +324,14 @@ public abstract class Usage<T extends Us
         }
     }
 
-    private void addChild(T child) {
+    protected void addChild(T child) {
         children.add(child);
         if (started.get()) {
             child.start();
         }
     }
 
-    private void removeChild(T child) {
+    protected void removeChild(T child) {
         children.remove(child);
     }
 

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1153425&r1=1153424&r2=1153425&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Wed Aug  3 10:53:12 2011
@@ -1039,7 +1039,12 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
           <version>2.1.1</version>
-        </plugin>
+        </plugin> 
+	<plugin>
+	  <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>		   
+	</plugin>
       </plugins>
     </pluginManagement>
     <plugins>



Mime
View raw message