geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r487505 - in /geronimo/server/trunk/modules: geronimo-kernel/src/main/java/org/apache/geronimo/gbean/ geronimo-kernel/src/test/java/org/apache/geronimo/gbean/ geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ geronimo-kernel/src/tes...
Date Fri, 15 Dec 2006 10:00:37 GMT
Author: akulshreshtha
Date: Fri Dec 15 02:00:35 2006
New Revision: 487505

URL: http://svn.apache.org/viewvc?view=rev&rev=487505
Log:
Geronimo-2607 Added serialVersionUID to GOpearationInfo to maintain compatibility of GBeanInfo
              Enable compatibility test
              Changed Log4jService to use old addOperation

Modified:
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GOperationInfo.java
    geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/GBeanInfoTest.java
    geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/MockGBean.java
    geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MyGBean.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GOperationInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GOperationInfo.java?view=diff&rev=487505&r1=487504&r2=487505
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GOperationInfo.java
(original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GOperationInfo.java
Fri Dec 15 02:00:35 2006
@@ -29,6 +29,7 @@
  * @version $Rev$ $Date$
  */
 public class GOperationInfo implements Serializable {
+    private static final long serialVersionUID = -5593225815559931812L;
     /**
      * The name of this method.
      */

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/GBeanInfoTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/GBeanInfoTest.java?view=diff&rev=487505&r1=487504&r2=487505
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/GBeanInfoTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/GBeanInfoTest.java
Fri Dec 15 02:00:35 2006
@@ -101,7 +101,7 @@
         assertEquals(gbeanInfo.toString(), MockGBean.getGBeanInfo().toString());
     }
 
-    public void xtestBackwardCompatibility() throws Exception {
+    public void testBackwardCompatibility() throws Exception {
         FileInputStream fis = new FileInputStream(resolveFile("src/test/data/gbeaninfo/SERIALIZATION_-6198804067155550221.ser"));
         ObjectInputStream is = new ObjectInputStream(fis);
         GBeanInfo beanInfo = (GBeanInfo) is.readObject();

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/MockGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/MockGBean.java?view=diff&rev=487505&r1=487504&r2=487505
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/MockGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/MockGBean.java
Fri Dec 15 02:00:35 2006
@@ -74,11 +74,11 @@
         infoFactory.addAttribute("endpointMutableInt", Integer.TYPE, false);
         infoFactory.addAttribute("someObject", Object.class, true);
 
-        infoFactory.addOperation("echo", new Class[]{String.class}, "java.lang.Object");
-        infoFactory.addOperation("checkEndpoint", "java.lang.Object");
-        infoFactory.addOperation("checkEndpointCollection", "java.lang.Object");
-        infoFactory.addOperation("doSomething", new Class[]{String.class}, "java.lang.Object");
-        infoFactory.addOperation("fetchValue", "java.lang.Object");
+        infoFactory.addOperation("echo", new Class[]{String.class});
+        infoFactory.addOperation("checkEndpoint");
+        infoFactory.addOperation("checkEndpointCollection");
+        infoFactory.addOperation("doSomething", new Class[]{String.class});
+        infoFactory.addOperation("fetchValue");
 
         infoFactory.addInterface(MockEndpoint.class, new String[]{"mutableInt"});
         infoFactory.addInterface(MockParentInterface1.class, new String[]{"value"});

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MyGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MyGBean.java?view=diff&rev=487505&r1=487504&r2=487505
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MyGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/MyGBean.java
Fri Dec 15 02:00:35 2006
@@ -32,7 +32,7 @@
 
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(MyGBean.class);
-        infoFactory.addOperation("main", new Class[]{String[].class}, "void");
+        infoFactory.addOperation("main", new Class[]{String[].class});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java?view=diff&rev=487505&r1=487504&r2=487505
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
Fri Dec 15 02:00:35 2006
@@ -712,10 +712,10 @@
 
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
 
-        infoFactory.addOperation("reconfigure", "void");
-        infoFactory.addOperation("setLoggerLevel", new Class[]{String.class, String.class},
"void");
-        infoFactory.addOperation("getLoggerLevel", new Class[]{String.class}, "java.lang.String");
-        infoFactory.addOperation("getLoggerEffectiveLevel", new Class[]{String.class}, "java.lang.String");
+        infoFactory.addOperation("reconfigure");
+        infoFactory.addOperation("setLoggerLevel", new Class[]{String.class, String.class});
+        infoFactory.addOperation("getLoggerLevel", new Class[]{String.class});
+        infoFactory.addOperation("getLoggerEffectiveLevel", new Class[]{String.class});
         infoFactory.addInterface(SystemLog.class);
 
         infoFactory.setConstructor(new String[]{"configFileName", "refreshPeriodSeconds",
"ServerInfo"});



Mime
View raw message