You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2011/01/28 03:15:30 UTC
svn commit: r1064426 - in /openejb/trunk/openejb3: ./
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-core/src/main/java/org/apache/openejb/cdi/
container/openejb-core/src/main/java/org/apache/openejb/config...
Author: djencks
Date: Fri Jan 28 02:15:29 2011
New Revision: 1064426
URL: http://svn.apache.org/viewvc?rev=1064426&view=rev
Log:
XBEAN-162 update to xbean 3.8-SNAPSHOT and update to genericized interfaces
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonService.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
openejb/trunk/openejb3/pom.xml
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1064426&r1=1064425&r2=1064426&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Fri Jan 28 02:15:29 2011
@@ -764,8 +764,8 @@ public class Assembler extends Assembler
String[] parts = ((String)value).split(":", 2);
ResourceFinder finder = new ResourceFinder("META-INF", classLoader);
- Map<String,Class> plugins = finder.mapAvailableImplementations(TransactionPolicyFactory.class);
- Class<? extends TransactionPolicyFactory> clazz = plugins.get(parts[0]).asSubclass(TransactionPolicyFactory.class);
+ Map<String,Class<? extends TransactionPolicyFactory>> plugins = finder.mapAvailableImplementations(TransactionPolicyFactory.class);
+ Class<? extends TransactionPolicyFactory> clazz = plugins.get(parts[0]);
if (clazz != null) {
if (parts.length == 1) {
factory = clazz.getConstructor(String.class).newInstance(parts[1]);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonService.java?rev=1064426&r1=1064425&r2=1064426&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonService.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonService.java Fri Jan 28 02:15:29 2011
@@ -31,7 +31,7 @@ import org.apache.webbeans.spi.Singleton
*/
public interface ThreadSingletonService extends SingletonService<WebBeansContext> {
void initialize(StartupObject startupObject);
- Object contextEntered(OWBContext newOWBContext);
+ Object contextEntered(WebBeansContext newOWBContext);
void contextExited(Object oldOWBContext);
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1064426&r1=1064425&r2=1064426&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Fri Jan 28 02:15:29 2011
@@ -554,7 +554,7 @@ public class AnnotationDeployer implemen
}
}
- List<Class> classes = finder.findAnnotatedClasses(MessageDriven.class);
+ List<Class<?>> classes = finder.findAnnotatedClasses(MessageDriven.class);
for (Class<?> beanClass : classes) {
MessageDriven mdb = beanClass.getAnnotation(MessageDriven.class);
String ejbName = getEjbName(mdb, beanClass);
@@ -580,7 +580,7 @@ public class AnnotationDeployer implemen
}
startupLogger.debug("Searching for annotated application exceptions (see OPENEJB-980)");
- List<Class> appExceptions = finder.findAnnotatedClasses(ApplicationException.class);
+ List<Class<?>> appExceptions = finder.findAnnotatedClasses(ApplicationException.class);
for (Class<?> exceptionClass : appExceptions) {
startupLogger.debug("...handling " + exceptionClass);
ApplicationException annotation = exceptionClass.getAnnotation(ApplicationException.class);
@@ -1020,7 +1020,7 @@ public class AnnotationDeployer implemen
for (Class<? extends Annotation> annotation : annotations) {
logger.debug("Scanning for @" + annotation.getName());
- List<Class> list = finder.findAnnotatedClasses(annotation);
+ List<Class<?>> list = finder.findAnnotatedClasses(annotation);
if (logger.isDebugEnabled()) for (Class clazz : list) {
logger.debug("Found " + clazz.getName());
}
@@ -1578,7 +1578,7 @@ public class AnnotationDeployer implemen
sessionBean.getAsyncMethod().add(new AsyncMethod(method));
}
- List<Class> clses = classFinder.findAnnotatedClasses(Asynchronous.class);
+ List<Class<?>> clses = classFinder.findAnnotatedClasses(Asynchronous.class);
//Spec 4.5.1 @Asynchronous could be used at the class level of a bean-class ( or superclass ).
//Seems that it should not be used on the any interface view
@@ -3600,7 +3600,7 @@ public class AnnotationDeployer implemen
* @return
*/
private ClassFinder createInheritedClassFinder(Class<?>... classes) {
- List<Class> parents = new ArrayList<Class>();
+ List<Class<?>> parents = new ArrayList<Class<?>>();
for (Class<?> clazz : classes) {
parents.addAll(ancestors(clazz));
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java?rev=1064426&r1=1064425&r2=1064426&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java Fri Jan 28 02:15:29 2011
@@ -18,7 +18,6 @@ package org.apache.openejb.config;
import java.sql.SQLException;
import java.util.Map;
-import java.io.IOException;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -107,7 +106,7 @@ public class Cipher {
private static void availableCiphers() {
try {
ResourceFinder finder = new ResourceFinder("META-INF/");
- Map<String, Class> impls = finder.mapAllImplementations(PasswordCipher.class);
+ Map<String, Class<? extends PasswordCipher>> impls = finder.mapAllImplementations(PasswordCipher.class);
System.out.println("Available ciphers are: "+ Join.join(", ", impls.keySet()));
} catch (Exception dontCare) {
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java?rev=1064426&r1=1064425&r2=1064426&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java Fri Jan 28 02:15:29 2011
@@ -85,21 +85,21 @@ public final class BasicDataSourceUtil {
/**
* Create a {@link PasswordCipher} instance from the
- * {@link #passwordCipherClass}.
+ * passwordCipher class name.
*
* @param passwordCipherClass the password cipher to look for
- * @return the password cipher from the {@link #passwordCipherClass}
+ * @return the password cipher from the passwordCipher class name
* optionally set.
* @throws SQLException
* if the driver can not be found.
*/
public static PasswordCipher getPasswordCipher(String passwordCipherClass) throws SQLException {
// Load the password cipher class
- Class pwdCipher = null;
+ Class<? extends PasswordCipher> pwdCipher = null;
// try looking for implementation in /META-INF/org.apache.openejb.resource.jdbc.PasswordCipher
ResourceFinder finder = new ResourceFinder("META-INF/");
- Map<String, Class> impls;
+ Map<String, Class<? extends PasswordCipher>> impls;
try {
impls = finder.mapAllImplementations(PasswordCipher.class);
@@ -116,10 +116,10 @@ public final class BasicDataSourceUtil {
if (null == pwdCipher) {
try {
try {
- pwdCipher = Class.forName(passwordCipherClass);
+ pwdCipher = Class.forName(passwordCipherClass).asSubclass(PasswordCipher.class);
} catch (ClassNotFoundException cnfe) {
- pwdCipher = Thread.currentThread().getContextClassLoader().loadClass(passwordCipherClass);
+ pwdCipher = Thread.currentThread().getContextClassLoader().loadClass(passwordCipherClass).asSubclass(PasswordCipher.class);
}
} catch (Throwable t) {
String message = "Cannot load password cipher class '" + passwordCipherClass + "'";
@@ -130,7 +130,7 @@ public final class BasicDataSourceUtil {
// Create an instance
PasswordCipher cipher = null;
try {
- cipher = (PasswordCipher) pwdCipher.newInstance();
+ cipher = pwdCipher.newInstance();
} catch (Throwable t) {
String message = "Cannot create password cipher instance";
Modified: openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java?rev=1064426&r1=1064425&r2=1064426&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java Fri Jan 28 02:15:29 2011
@@ -107,9 +107,9 @@ public abstract class TestClient extends
}
}
- private List<Class> getClassPath() {
- Class superClass = null;
- List<Class> classPath = new ArrayList<Class>();
+ private List<Class<?>> getClassPath() {
+ Class<?> superClass = null;
+ List<Class<?>> classPath = new ArrayList<Class<?>>();
classPath.add(getClass());
superClass = getClass().getSuperclass();
Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1064426&r1=1064425&r2=1064426&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Fri Jan 28 02:15:29 2011
@@ -95,7 +95,7 @@
<properties>
<!-- This is used by a manifest classpath entry -->
- <xbeanVersion>3.7</xbeanVersion>
+ <xbeanVersion>3.8-SNAPSHOT</xbeanVersion>
<!-- OSGi bundles properties -->
<openejb.osgi.import.pkg>*</openejb.osgi.import.pkg>