You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2007/12/27 13:10:25 UTC
svn commit: r607045 [1/3] - in /openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-core/src/main/java/org/apache/openejb/config/ ...
Author: jlaskowski
Date: Thu Dec 27 04:10:23 2007
New Revision: 607045
URL: http://svn.apache.org/viewvc?rev=607045&view=rev
Log:
Typo fixes
Use of logger "enhanced" methods (enhanced == accept keys as well as variable-length args)
Code warning cleanup
System.out.println removal
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulInterceptedBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessLocal.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedLocal.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedRemote.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/HsqldbTestDatabase.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessLocalBusinessIntfcTests.java
openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/SecondStatefulInterceptedBean.java
openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/StatefulInterceptedBean.java
openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateful/ThirdStatefulInterceptedBean.java
openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/SecondStatelessInterceptedBean.java
openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/StatelessInterceptedBean.java
openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/java/org/apache/openejb/test/stateless/ThirdStatelessInterceptedBean.java
openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/src/main/resources/META-INF/ejb-jar.xml
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java Thu Dec 27 04:10:23 2007
@@ -118,16 +118,16 @@
logger.warning("startup.deprecatedPropertyName", EnvProps.ASSEMBLER);
}
- logger.debug("startup.instantiatingAssemberClass", className);
+ logger.debug("startup.instantiatingAssemblerClass", className);
Assembler assembler = null;
try {
assembler = (Assembler) toolkit.newInstance(className);
} catch (OpenEJBException oe) {
- logger.fatal("startup.assemblerCannotBeInstanitated", oe);
+ logger.fatal("startup.assemblerCannotBeInstantiated", oe);
throw oe;
} catch (Throwable t) {
- String msg = messages.message("startup.openEjbEncounterUnexpectedError");
+ String msg = messages.message("startup.openejbEncounteredUnexpectedError");
logger.fatal(msg, t);
throw new OpenEJBException(msg, t);
}
@@ -140,7 +140,7 @@
logger.fatal("startup.assemblerFailedToInitialize", oe);
throw oe;
} catch (Throwable t) {
- String msg = messages.message("startup.assemblerEncounterUnexpectedError");
+ String msg = messages.message("startup.assemblerEncounteredUnexpectedError");
logger.fatal(msg, t);
throw new OpenEJBException(msg, t);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java Thu Dec 27 04:10:23 2007
@@ -75,7 +75,7 @@
try {
clazz = Class.forName(info.clazz, true, cl);
} catch (ClassNotFoundException e) {
- throw new OpenEJBException("Intercpetor class cannot be loaded: "+info.clazz);
+ throw new OpenEJBException("Interceptor class cannot be loaded: "+info.clazz);
}
InterceptorData interceptor = new InterceptorData(clazz);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Thu Dec 27 04:10:23 2007
@@ -264,7 +264,7 @@
Class<? extends ContainerInfo> infoClass = getContainerInfoType(declaration.getType());
if (infoClass == null) {
- throw new OpenEJBException("Unrecognized contianer type " + declaration.getType());
+ throw new OpenEJBException("Unrecognized container type " + declaration.getType());
}
ContainerInfo info = configureService(declaration, infoClass);
@@ -411,7 +411,7 @@
public AppInfo configureApplication(AppModule appModule) throws OpenEJBException {
- logger.info(messages.format("config.configApp", appModule.getJarLocation()));
+ logger.info("config.configApp", appModule.getJarLocation());
deployer.deploy(appModule);
AppInfoBuilder appInfoBuilder = new AppInfoBuilder(this);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Thu Dec 27 04:10:23 2007
@@ -43,6 +43,7 @@
import javax.ejb.Stateful;
import javax.ejb.Stateless;
+import javax.ejb.MessageDriven;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.io.IOException;
@@ -74,12 +75,12 @@
private static final Messages messages = new Messages("org.apache.openejb.util.resources");
- public AppModule load(File jarFile) throws OpenEJBException, UnsupportedModuleTypeException, UnknownModuleTypeException {
+ public AppModule load(File jarFile) throws OpenEJBException {
ClassLoader classLoader = getClassLoader(jarFile);
URL baseUrl = getFileUrl(jarFile);
- Class moduleClass = null;
+ Class moduleClass;
try {
moduleClass = discoverModuleType(baseUrl, classLoader, true);
} catch (Exception e) {
@@ -96,7 +97,7 @@
ResourceFinder finder = new ResourceFinder("", tmpClassLoader, appUrl);
- Map<String, URL> appDescriptors = null;
+ Map<String, URL> appDescriptors;
try {
appDescriptors = finder.getResourcesMap("META-INF");
} catch (IOException e) {
@@ -231,7 +232,7 @@
classPath.addAll(clientModules.values());
classPath.addAll(rarLibs.values());
classPath.addAll(extraLibs);
- URL[] urls = classPath.toArray(new URL[]{});
+ URL[] urls = classPath.toArray(new URL[classPath.size()]);
ClassLoader appClassLoader = new TemporaryClassLoader(urls, OpenEJB.class.getClassLoader());
//
@@ -404,7 +405,7 @@
warFile = unpack(warFile);
// read web.xml file
- Map<String, URL> descriptors = null;
+ Map<String, URL> descriptors;
try {
descriptors = getWebDescriptors(warFile);
} catch (IOException e) {
@@ -445,7 +446,7 @@
}
// create the class loader
- URL[] webUrls = webClassPath.toArray(new URL[]{});
+ URL[] webUrls = webClassPath.toArray(new URL[webClassPath.size()]);
ClassLoader warClassLoader = new TemporaryClassLoader(webUrls, parentClassLoader);
// create web module
@@ -469,13 +470,13 @@
private void addWebservices(WsModule wsModule) throws OpenEJBException {
// get location of webservices.xml file
Object webservicesObject = wsModule.getAltDDs().get("webservices.xml");
- if (!(webservicesObject instanceof URL)) {
+ if (webservicesObject == null || !(webservicesObject instanceof URL)) {
return;
}
URL webservicesUrl = (URL) webservicesObject;
// determine the base url for this module (either file: or jar:)
- URL moduleUrl = null;
+ URL moduleUrl;
try {
File jarFile = new File(wsModule.getJarLocation());
moduleUrl = jarFile.toURL();
@@ -491,7 +492,7 @@
Map<URL,JavaWsdlMapping> jaxrpcMappingCache = new HashMap<URL,JavaWsdlMapping>();
Webservices webservices = ReadDescriptors.readWebservices(webservicesUrl);
wsModule.setWebservices(webservices);
- if (webservicesUrl != null && "file".equals(webservicesUrl.getProtocol())) {
+ if ("file".equals(webservicesUrl.getProtocol())) {
wsModule.getWatchedResources().add(webservicesUrl.getPath());
}
@@ -499,7 +500,7 @@
for (WebserviceDescription webserviceDescription : webservices.getWebserviceDescription()) {
String jaxrpcMappingFile = webserviceDescription.getJaxrpcMappingFile();
if (jaxrpcMappingFile != null) {
- URL jaxrpcMappingUrl = null;
+ URL jaxrpcMappingUrl;
try {
jaxrpcMappingUrl = new URL(moduleUrl, jaxrpcMappingFile);
JavaWsdlMapping jaxrpcMapping = jaxrpcMappingCache.get(jaxrpcMappingUrl);
@@ -508,7 +509,7 @@
jaxrpcMappingCache.put(jaxrpcMappingUrl, jaxrpcMapping);
}
webserviceDescription.setJaxrpcMapping(jaxrpcMapping);
- if (jaxrpcMappingUrl != null && "file".equals(jaxrpcMappingUrl.getProtocol())) {
+ if ("file".equals(jaxrpcMappingUrl.getProtocol())) {
wsModule.getWatchedResources().add(jaxrpcMappingUrl.getPath());
}
} catch (MalformedURLException e) {
@@ -572,7 +573,7 @@
Set<URL> urls = new HashSet<URL>();
if (parentClassLoader == null) return urls;
- UrlSet urlSet = null;
+ UrlSet urlSet;
try {
urlSet = new UrlSet(parentClassLoader);
urlSet = urlSet.excludeJavaEndorsedDirs();
@@ -581,6 +582,7 @@
urlSet = urlSet.exclude(ClassLoader.getSystemClassLoader());
} catch (IOException e) {
logger.warning("Error scanning class loader for JSP tag libraries", e);
+ return urls;
}
for (URL url : urlSet.getUrls()) {
@@ -681,6 +683,7 @@
try {
jarFile.close();
} catch (IOException e) {
+ // exception ignored
}
}
}
@@ -716,7 +719,7 @@
// create the class loader
List<URL> classPath = new ArrayList<URL>();
classPath.addAll(rarLibs.values());
- URL[] urls = classPath.toArray(new URL[]{});
+ URL[] urls = classPath.toArray(new URL[classPath.size()]);
ClassLoader appClassLoader = new TemporaryClassLoader(urls, parentClassLoader);
// create the Resource Module
@@ -884,7 +887,7 @@
if (classFinder.isAnnotationPresent(Stateless.class) ||
classFinder.isAnnotationPresent(Stateful.class) ||
- classFinder.isAnnotationPresent(javax.ejb.MessageDriven.class)) {
+ classFinder.isAnnotationPresent(MessageDriven.class)) {
return EjbModule.class;
}
}
@@ -912,7 +915,7 @@
}
private URL getFileUrl(File jarFile) throws OpenEJBException {
- URL baseUrl = null;
+ URL baseUrl;
try {
baseUrl = jarFile.toURL();
} catch (MalformedURLException e) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Thu Dec 27 04:10:23 2007
@@ -174,11 +174,8 @@
*/
private static void loadFromClasspath(FileUtils base, List<String> jarList, ClassLoader classLoader) {
- String include = null;
- String exclude = null;
-
- include = SystemInstance.get().getProperty(CLASSPATH_INCLUDE, "");
- exclude = SystemInstance.get().getProperty(CLASSPATH_EXCLUDE, ".*");
+ String include = SystemInstance.get().getProperty(CLASSPATH_INCLUDE, "");
+ String exclude = SystemInstance.get().getProperty(CLASSPATH_EXCLUDE, ".*");
boolean requireDescriptors = SystemInstance.get().getProperty(CLASSPATH_REQUIRE_DESCRIPTOR, "false").equalsIgnoreCase("true");
boolean filterDescriptors = SystemInstance.get().getProperty(CLASSPATH_FILTER_DESCRIPTORS, "false").equalsIgnoreCase("true");
boolean filterSystemApps = SystemInstance.get().getProperty(CLASSPATH_FILTER_SYSTEMAPPS, "true").equalsIgnoreCase("true");
@@ -303,12 +300,12 @@
}
- private static void processUrls(List<URL> urls, ClassLoader classLoader, boolean desc, FileUtils base, List<String> jarList) {
+ private static void processUrls(List<URL> urls, ClassLoader classLoader, boolean searchForDescriptorlessApplications, FileUtils base, List<String> jarList) {
Deployments deployment;
String path;
for (URL url : urls) {
try {
- Class moduleType = DeploymentLoader.discoverModuleType(url, classLoader, desc);
+ Class moduleType = DeploymentLoader.discoverModuleType(url, classLoader, searchForDescriptorlessApplications);
if (AppModule.class.isAssignableFrom(moduleType) || EjbModule.class.isAssignableFrom(moduleType)) {
deployment = JaxbOpenejb.createDeployments();
if (url.getProtocol().equals("jar")) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/UsernamePasswordCallbackHandler.java Thu Dec 27 04:10:23 2007
@@ -24,7 +24,7 @@
import java.io.IOException;
/**
- * A JASS username password CallbackHandler.
+ * A JAAS username password CallbackHandler.
*/
public class UsernamePasswordCallbackHandler implements CallbackHandler {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties Thu Dec 27 04:10:23 2007
@@ -23,11 +23,11 @@
startup.noInitializationProperties=No initialization properties were passed in, using system properties instead.
startup.noApplicationServerSpecified=No ApplicationServer was specified! The container system will only be accessible by same-vm clients via the IntraVm Server.
startup.deprecatedPropertyName=Deprecated: The propery name "{0}" is deprecated and will be removed in a future version of OpenEJB, please use the property name "openejb.assembler" instead.
-startup.instantiatingAssemberClass=Instantiating assembler class {0}
-startup.assemblerCannotBeInstanitated=OpenEJB has encountered a fatal error and cannot be started: Assembler cannot be instantiated.
-startup.openEjbEncounterUnexpectedError=OpenEJB has encountered a fatal error and cannot be started: OpenEJB encountered an unexpected error while attempting to instantiate the assembler.
+startup.instantiatingAssemblerClass=Instantiating assembler class {0}
+startup.assemblerCannotBeInstantiated=OpenEJB has encountered a fatal error and cannot be started: Assembler cannot be instantiated.
+startup.openejbEncounteredUnexpectedError=OpenEJB has encountered a fatal error and cannot be started: OpenEJB encountered an unexpected error while attempting to instantiate the assembler.
startup.assemblerFailedToInitialize=OpenEJB has encountered a fatal error and cannot be started: Assembler failed to initialize.
-startup.assemblerEncounterUnexpectedError=OpenEJB has encountered a fatal error and cannot be started: The Assembler encountered an unexpected error while attempting to initialize.
+startup.assemblerEncounteredUnexpectedError=OpenEJB has encountered a fatal error and cannot be started: The Assembler encountered an unexpected error while attempting to initialize.
startup.assemblerFailedToBuild=OpenEJB has encountered a fatal error and cannot be started: Assembler failed to build the container system.
startup.assemblerEncounterUnexpectedBuildError=OpenEJB has encountered a fatal error and cannot be started: The Assembler encountered an unexpected error while attempting to build the container system.
startup.assemblerReturnedNullContainer=OpenEJB has encountered a fatal error and cannot be started: The Assembler returned a null container system.
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java Thu Dec 27 04:10:23 2007
@@ -121,7 +121,7 @@
private void assertCalls(Call... expectedCalls) {
List expected = Arrays.asList(expectedCalls);
- assertEquals(join("\n", expected) , join("\n", calls));
+ assertEquals("Interceptor call stack", join("\n", expected) , join("\n", calls));
}
public static enum Call {
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java Thu Dec 27 04:10:23 2007
@@ -41,6 +41,7 @@
OpenEJB.destroy();
TestManager.stop();
} catch (Exception e) {
+ // do nothing - exception ignored
}
// org.apache.log4j.BasicConfigurator.configure();
System.setProperty("openejb.test.server", org.apache.openejb.test.IvmTestServer.class.getName());
Modified: openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulInterceptedBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulInterceptedBean.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulInterceptedBean.java (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/BasicStatefulInterceptedBean.java Thu Dec 27 04:10:23 2007
@@ -36,8 +36,6 @@
import org.apache.openejb.test.interceptor.SecondClassInterceptor;
/**
- *
- *
* @version $Rev$ $Date$
*/
@Stateful(name="BasicStatefulIntercepted")
@@ -49,7 +47,7 @@
/**
* A simple dummy business method to concat 2 strings
- * @see org.apache.openejb.test.Stateful.BasicStatefulInterceptedLocal#concat(java.lang.String, java.lang.String)
+ * @see org.apache.openejb.test.stateful.BasicStatefulInterceptedLocal#concat(java.lang.String, java.lang.String)
*/
public String concat(String str1, String str2) {
return str1.concat(str2);
@@ -57,11 +55,10 @@
/**
* A simple dummy busines method to reverse a string
- * @see org.apache.openejb.test.Stateful.BasicStatefulInterceptedLocal#reverse(java.lang.String)
+ * @see org.apache.openejb.test.stateful.BasicStatefulInterceptedLocal#reverse(java.lang.String)
*/
@Interceptors({MethodInterceptor.class})
public String reverse(String str) {
- System.out.println("Reversing " + str);
StringBuffer b = new StringBuffer(str);
return b.reverse().toString();
}
@@ -77,7 +74,7 @@
}
/**
- * @param contextData the contextData to set
+ * @param ctxData the contextData to set
*/
private void setContextData(Map<String, Object> ctxData) {
BasicStatefulInterceptedBean.contextData.putAll(ctxData);
@@ -95,13 +92,12 @@
* the invocation of proceed in the last interceptor method in the chain is a no-op, and null is returned.
* If there is more than one such interceptor method, the invocation of proceed causes the container to execute those methods in order.
*
- * @throws runtime exceptions or application exceptions that are allowed in the throws clause of the business method.
+ * @throws Exception runtime exceptions or application exceptions that are allowed in the throws clause of the business method.
*/
@AroundInvoke
public Object inBeanInterceptor(InvocationContext ctx) throws Exception {
Map<String, Object> ctxData = Interceptor.profile(ctx, "inBeanInterceptor");
setContextData(ctxData);
-
return ctx.proceed();
}
@@ -109,13 +105,12 @@
* The interceptor method.
* This should intercept postConstruct of the bean
*
- * @throws runtime exceptions.
+ * @throws Exception runtime exceptions.
*/
@PostConstruct
public void inBeanInterceptorPostConstruct() throws Exception {
Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPostConstruct");
setContextData(ctxData);
- return;
}
@@ -123,39 +118,36 @@
* The interceptor method.
* This should intercept postActivate of the bean
*
- * @throws runtime exceptions.
+ * @throws Exception runtime exceptions.
*/
@PostActivate
public void inBeanInterceptorPostActivate() throws Exception {
Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPostActivate");
setContextData(ctxData);
- return;
}
/**
* The interceptor method.
* This should intercept prePassivate of the bean.
*
- * @throws runtime exceptions.
+ * @throws Exception runtime exceptions.
*/
@PrePassivate
public void inBeanInterceptorPrePassivate() throws Exception {
Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPrePassivate");
setContextData(ctxData);
- return;
}
/**
* The interceptor method.
* This should intercept preDestroy of the bean.
*
- * @throws runtime exceptions.
+ * @throws Exception runtime exceptions.
*/
@PreDestroy
public void inBeanInterceptorPreDestroy() throws Exception {
Map<String, Object> ctxData = Interceptor.profile(this, "inBeanInterceptorPreDestroy");
setContextData(ctxData);
- return;
}
Modified: openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessLocal.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessLocal.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessLocal.java (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBusinessLocal.java Thu Dec 27 04:10:23 2007
@@ -22,7 +22,6 @@
import java.util.Properties;
/**
- *
* @author <a href="mailto:david.blevins@visi.com">David Blevins</a>
* @author <a href="mailto:Richard@Monson-Haefel.com">Richard Monson-Haefel</a>
*/
Modified: openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedBean.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedBean.java (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedBean.java Thu Dec 27 04:10:23 2007
@@ -33,8 +33,6 @@
import org.apache.openejb.test.interceptor.MethodInterceptor;
/**
- *
- *
* @version $Rev$ $Date$
*/
@Stateless(name="BasicStatelessIntercepted")
@@ -46,7 +44,6 @@
/**
* A simple dummy business method to concat 2 strings
- * @see org.apache.openejb.test.stateless.BasicStatelessInterceptedLocal#concat(java.lang.String, java.lang.String)
*/
public String concat(String str1, String str2) {
return str1.concat(str2);
@@ -54,17 +51,15 @@
/**
* A simple dummy busines method to reverse a string
- * @see org.apache.openejb.test.stateless.BasicStatelessInterceptedLocal#reverse(java.lang.String)
*/
@Interceptors({MethodInterceptor.class})
public String reverse(String str) {
- System.out.println("Reversing " + str);
StringBuffer b = new StringBuffer(str);
return b.reverse().toString();
}
/**
- * @param contextData the contextData to set
+ * @param ctxData the contextData to set
*/
private void setContextData(Map<String, Object> ctxData) {
BasicStatelessInterceptedBean.contextData.putAll(ctxData);
@@ -92,13 +87,12 @@
* the invocation of proceed in the last interceptor method in the chain is a no-op, and null is returned.
* If there is more than one such interceptor method, the invocation of proceed causes the container to execute those methods in order.
*
- * @throws runtime exceptions or application exceptions that are allowed in the throws clause of the business method.
+ * @throws Exception runtime exceptions or application exceptions that are allowed in the throws clause of the business method.
*/
@AroundInvoke
public Object inBeanInterceptor(InvocationContext ctx) throws Exception {
Map<String, Object> ctxData = Interceptor.profile(ctx, "inBeanInterceptor");
setContextData(ctxData);
-
return ctx.proceed();
}
@@ -106,7 +100,7 @@
* The interceptor method.
* This should intercept postConstruct of the bean
*
- * @throws runtime exceptions.
+ * @throws Exception runtime exceptions.
*/
@PostConstruct
public void inBeanInterceptorPostConstruct() throws Exception {
@@ -119,7 +113,7 @@
* The interceptor method.
* This should intercept preDestroy of the bean.
*
- * @throws runtime exceptions.
+ * @throws Exception runtime exceptions.
*/
@PreDestroy
public void inBeanInterceptorPreDestroy() throws Exception {
Modified: openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedLocal.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedLocal.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedLocal.java (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedLocal.java Thu Dec 27 04:10:23 2007
@@ -20,7 +20,6 @@
import java.util.List;
/**
- *
* @author <a href="mailto:david.blevins@visi.com">David Blevins</a>
* @author <a href="mailto:goyathlay.geronimo@gmail.com">Prasad Kashyap</a>
*
Modified: openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedRemote.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedRemote.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedRemote.java (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessInterceptedRemote.java Thu Dec 27 04:10:23 2007
@@ -21,11 +21,8 @@
import javax.ejb.Remote;
/**
- *
- *
* @version $Rev$ $Date$
*/
-
@Remote
public interface BasicStatelessInterceptedRemote {
Modified: openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java?rev=607045&r1=607044&r2=607045&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessPojoBean.java Thu Dec 27 04:10:23 2007
@@ -96,7 +96,7 @@
}
public Object remove() {
- return new String("Executed remove() Method");
+ return "Executed remove() Method";
}
public String remove(String arg) {