You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/05/17 23:39:54 UTC
svn commit: r945400 - in /openejb/branches/openejb-3.1.x: ./
container/openejb-core/src/main/java/org/apache/openejb/monitoring/
container/openejb-core/src/test/java/org/apache/openejb/config/
examples/alternate-descriptors/src/main/resources/META-INF/
Author: dblevins
Date: Mon May 17 21:39:54 2010
New Revision: 945400
URL: http://svn.apache.org/viewvc?rev=945400&view=rev
Log:
svn merge -r 943964:943965 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=943965&view=rev
------------------------------------------------------------------------
r943965 | dblevins | 2010-05-13 11:20:01 -0700 (Thu, 13 May 2010) | 2 lines
Tweaked regexes so 'get()' methods aren't counted as operations
OPENEJB-1275 OPENEJB-1273 OPENEJB-1272
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.1.x/ (props changed)
openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
Propchange: openejb/branches/openejb-3.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 17 21:39:54 2010
@@ -1,2 +1,2 @@
/openejb/branches/openejb-3.1.1:779593
-/openejb/trunk/openejb3:943472,943862
+/openejb/trunk/openejb3:943472,943862,943965
Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java?rev=945400&r1=945399&r2=945400&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java Mon May 17 21:39:54 2010
@@ -133,7 +133,7 @@ public class ManagedMBean implements Dyn
List<Method> managed = finder.findAnnotatedMethods(Managed.class);
for (Method method : managed) {
MethodMember member = new MethodMember(method, target, prefix);
- if (!method.getName().matches("(get|is)[A-Z_].*")) {
+ if (!method.getName().matches("(get|is)([A-Z_].*|)")) {
operationsMap.put(member.getName(), member);
} else {
attribute(new MethodMember(method, target, prefix));
@@ -338,10 +338,10 @@ public class ManagedMBean implements Dyn
String method = getter.getName();
StringBuilder name = new StringBuilder(method);
-
+
// remove 'get'
- if (method.matches("get[A-Z].*")) name.delete(0, 3);
- if (method.matches("is[A-Z].*")) name.delete(0, 2);
+ if (method.matches("get([A-Z].*|)")) name.delete(0, 3);
+ if (method.matches("is([A-Z].*|)")) name.delete(0, 2);
if (!"".equals(prefix)) {
if (!"".equals(name.toString())) name.insert(0, ".");
Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 17 21:39:54 2010
@@ -1,2 +1,2 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862
+/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965
Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 17 21:39:54 2010
@@ -1,2 +1,2 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862
+/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965