Author: dblevins
Date: Thu Sep 6 18:28:46 2007
New Revision: 573422
URL: http://svn.apache.org/viewvc?rev=573422&view=rev
Log:
Moved "join" to a utility class and statically imported it.
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java?rev=573422&r1=573421&r2=573422&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
Thu Sep 6 18:28:46 2007
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.config.rules;
+import static org.apache.openejb.util.Join.join;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.jee.AssemblyDescriptor;
import org.apache.openejb.jee.ContainerTransaction;
@@ -23,6 +24,7 @@
import org.apache.openejb.jee.InterceptorBinding;
import org.apache.openejb.jee.Method;
import org.apache.openejb.jee.MethodPermission;
+import org.apache.openejb.util.Join;
import java.util.Map;
import java.util.List;
@@ -46,12 +48,12 @@
}
if (binding.getEjbName() != null &&
!binding.getEjbName().equals("*") &&
!ejbsByName.containsKey(binding.getEjbName())) {
- fail("InterceptorBinding", "interceptorBinding.noSuchEjbName",
binding.getEjbName(), join(interceptorClasses, ","));
+ fail("InterceptorBinding", "interceptorBinding.noSuchEjbName",
binding.getEjbName(), join(",", interceptorClasses));
}
if (binding.getMethod() != null) {
if (binding.getEjbName() == null) {
- fail("InterceptorBinding",
"interceptorBinding.ejbNameRequiredWithMethod",
binding.getMethod().getMethodName(), join(interceptorClasses, ","));
+ fail("InterceptorBinding",
"interceptorBinding.ejbNameRequiredWithMethod",
binding.getMethod().getMethodName(), join(",", interceptorClasses));
}
}
}
@@ -59,9 +61,9 @@
for (MethodPermission permission : assembly.getMethodPermission()) {
for (Method method : permission.getMethod()) {
if (method.getEjbName() == null) {
- fail("MethodPermission",
"methodPermission.ejbNameRequired", method.getMethodName(),
join(permission.getRoleName(), ","));
+ fail("MethodPermission",
"methodPermission.ejbNameRequired", method.getMethodName(), join(",",
permission.getRoleName()));
} else if (!ejbsByName.containsKey(method.getEjbName())){
- fail("MethodPermission", "methodPermission.noSuchEjbName",
method.getEjbName(), method.getMethodName(), join(permission.getRoleName(),
","));
+ fail("MethodPermission", "methodPermission.noSuchEjbName",
method.getEjbName(), method.getMethodName(), join(",",
permission.getRoleName()));
}
}
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java?rev=573422&r1=573421&r2=573422&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/ValidationBase.java
Thu Sep 6 18:28:46 2007
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.config.rules;
+import static org.apache.openejb.util.Join.join;
import org.apache.openejb.config.ValidationRule;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.EjbModule;
@@ -25,6 +26,7 @@
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.util.SafeToolkit;
+import org.apache.openejb.util.Join;
import java.lang.reflect.Method;
import java.util.List;
@@ -120,18 +122,5 @@
} catch (ClassNotFoundException cnfe) {
throw new OpenEJBException(SafeToolkit.messages.format("cl0007",
clazz, module.getJarLocation()), cnfe);
}
- }
-
- public String join(List list, String s) {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < list.size(); i++) {
- Object object = list.get(i);
- sb.append(object.toString());
- sb.append(s);
- }
- if (sb.length() > 0) {
- sb.delete(sb.length() - s.length(), sb.length());
- }
- return sb.toString();
}
}
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java?rev=573422&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java
(added)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Join.java
Thu Sep 6 18:28:46 2007
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.util;
+
+import java.util.Collection;
+import java.util.ArrayList;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Join {
+ public static String join(String delimiter, Collection collection) {
+ StringBuilder sb = new StringBuilder();
+ for (Object obj : collection) {
+ sb.append(obj).append(delimiter);
+ }
+ if (collection.size() > 0) sb.delete(sb.length()-delimiter.length(),
sb.length());
+ return sb.toString();
+ }
+
+ public static String join(String delimiter, Object... collection) {
+ StringBuilder sb = new StringBuilder();
+ for (Object obj : collection) {
+ sb.append(obj).append(delimiter);
+ }
+ if (collection.length > 0) sb.delete(sb.length()-delimiter.length(),
sb.length());
+ return sb.toString();
+ }
+}
