Author: dblevins
Date: Mon Sep 5 02:07:54 2011
New Revision: 1165146
URL: http://svn.apache.org/viewvc?rev=1165146&view=rev
Log:
Cutting out dead 'util' code
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/FactoryFinder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/HtmlUtilities.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/IOExceptionSupport.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/MemoryClassLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/SerializableEnumeration.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/SerializationCallbacks.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/StringUtilities.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/TransactionUtils.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/VersionedSet.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/io/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/resources/
openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java?rev=1165146&r1=1165145&r2=1165146&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java
Mon Sep 5 02:07:54 2011
@@ -23,7 +23,7 @@ import org.apache.openejb.util.Base64;
import org.apache.openejb.util.HexConverter;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.StringUtilities;
+import org.apache.openejb.util.Strings;
import javax.naming.NamingException;
import javax.security.auth.Subject;
@@ -118,7 +118,7 @@ public class SQLLoginModule implements L
digest = optionsMap.get(Option.DIGEST);
encoding = optionsMap.get(Option.ENCODING);
- if (!StringUtilities.checkNullBlankString(digest)) {
+ if (!Strings.checkNullBlankString(digest)) {
// Check if the digest algorithm is available
try {
MessageDigest.getInstance(digest);
@@ -201,7 +201,7 @@ public class SQLLoginModule implements L
cbUsername = ((NameCallback) callbacks[0]).getName();
- if (StringUtilities.checkNullBlankString(cbUsername)) {
+ if (Strings.checkNullBlankString(cbUsername)) {
throw new FailedLoginException();
}
@@ -369,7 +369,7 @@ public class SQLLoginModule implements L
}
// Both are non-null
- if (StringUtilities.checkNullBlankString(digest)) {
+ if (Strings.checkNullBlankString(digest)) {
// No digest algorithm is used
return real.equals(provided);
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java?rev=1165146&r1=1165145&r2=1165146&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Exceptions.java
Mon Sep 5 02:07:54 2011
@@ -25,8 +25,6 @@ import javax.transaction.RollbackExcepti
import java.io.IOException;
import java.io.NotSerializableException;
-import static org.apache.openejb.util.StringUtilities.join;
-
/**
* @version $Rev$ $Date$
*/
@@ -97,13 +95,7 @@ public class Exceptions {
}
public static NoModulesFoundException newNoModulesFoundException() {
- return new NoModulesFoundException(join("No modules found to deploy.",
- "1)Maybe descriptors are placed in incorrect location.",
- "Descriptors could go under: ",
- "<base-dir>/META-INF or <base-dir>/WEB-INF", "but not directly
under <base-dir>",
- "Check 'Application Discovery via the Classpath' docs page for
more info",
- "2)Maybe no modules are present in the classpath.",
- "Is 'openejb.base' system property pointing to the intended
location?")
+ return new NoModulesFoundException(Join.join("\n", "No modules found
to deploy.", "1)Maybe descriptors are placed in incorrect location.",
"Descriptors could go under: ", "<base-dir>/META-INF or <base-dir>/WEB-INF",
"but not directly under <base-dir>", "Check 'Application Discovery via the
Classpath' docs page for more info", "2)Maybe no modules are present in the
classpath.", "Is 'openejb.base' system property pointing to the intended
location?")
);
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java?rev=1165146&r1=1165145&r2=1165146&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
Mon Sep 5 02:07:54 2011
@@ -81,4 +81,15 @@ public class Strings {
return sb.toString();
}
+ public static boolean checkNullBlankString(String stringToCheck) {
+ return (stringToCheck == null || "".equals(stringToCheck.trim()));
+ }
+
+ public static String replaceNullOrBlankStringWithNonBreakingSpace(String
stringToCheckForNull) {
+ if ((stringToCheckForNull == null) ||
(stringToCheckForNull.equals(""))) {
+ return " ";
+ } else {
+ return stringToCheckForNull;
+ }
+ }
}
Modified:
openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java?rev=1165146&r1=1165145&r2=1165146&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java
(original)
+++
openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java
Mon Sep 5 02:07:54 2011
@@ -24,6 +24,7 @@ import java.util.HashMap;
import org.apache.openejb.BeanContext;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.util.Strings;
import org.apache.openejb.webadmin.HttpRequest;
import org.apache.openejb.webadmin.HttpResponse;
import org.apache.openejb.webadmin.WebAdminBean;
@@ -41,7 +42,6 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.PersistenceUnitReferenceInfo;
import org.apache.openejb.assembler.classic.PersistenceContextReferenceInfo;
import org.apache.openejb.assembler.classic.ServiceReferenceInfo;
-import org.apache.openejb.util.StringUtilities;
import javax.ejb.Stateless;
import javax.ejb.RemoteHome;
@@ -135,7 +135,7 @@ public class DeploymentListBean extends
printRow("Name", bean.ejbName, body);
printRow(
"Description",
-
StringUtilities.replaceNullOrBlankStringWithNonBreakingSpace(bean.description),
+
Strings.replaceNullOrBlankStringWithNonBreakingSpace(bean.description),
body);
String type = null;
