You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2011/01/06 23:58:36 UTC
svn commit: r1056111 - in /geronimo/server/trunk/plugins:
openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/
openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/
Author: dblevins
Date: Thu Jan 6 22:58:36 2011
New Revision: 1056111
URL: http://svn.apache.org/viewvc?rev=1056111&view=rev
Log:
minor changes relating to OWB-503
Modified:
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java
geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java
geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java
geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java?rev=1056111&r1=1056110&r2=1056111&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java Thu Jan 6 22:58:36 2011
@@ -53,7 +53,7 @@ public class ThreadSingletonServiceAdapt
//not embedded. Are we the first ejb module to try this?
if (startupObject.getAppContext().get(OWBContext.class) == null) {
startupObject.getAppContext().set(OWBContext.class, owbContext);
- setConfiguration(OpenWebBeansConfiguration.getInstance());
+ setConfiguration(WebBeansContext.getInstance().getOpenWebBeansConfiguration());
try {
ServiceLoader.getService(ContainerLifecycle.class).startApplication(startupObject);
} catch (Exception e) {
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java?rev=1056111&r1=1056110&r2=1056111&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java Thu Jan 6 22:58:36 2011
@@ -20,10 +20,14 @@
package org.apache.geronimo.openwebbeans;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
+import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.Produces;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -109,4 +113,18 @@ public class GeronimoResourceInjectionSe
@Override
public void clear() {
}
+
+ /**
+ * delegation of serialization behavior
+ */
+ public <T> void writeExternal(Bean<T> bean, T actualResource, ObjectOutput out) throws IOException{}
+
+ /**
+ * delegation of serialization behavior
+ */
+ public <T> T readExternal(Bean<T> bean, ObjectInput out) throws IOException,
+ ClassNotFoundException {
+ return null;
+ }
+
}
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java?rev=1056111&r1=1056110&r2=1056111&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java Thu Jan 6 22:58:36 2011
@@ -43,7 +43,7 @@ public class OpenWebBeansWebInitializer
GeronimoSingletonService.contextEntered(owbContext);
try {
- setConfiguration(OpenWebBeansConfiguration.getInstance());
+ setConfiguration(WebBeansContext.getInstance().getOpenWebBeansConfiguration());
//from OWB's WebBeansConfigurationListener
if (servletContext != null) {
ContainerLifecycle lifeCycle = LifecycleFactory.getInstance().getLifecycle();
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java?rev=1056111&r1=1056110&r2=1056111&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java Thu Jan 6 22:58:36 2011
@@ -19,6 +19,7 @@
package org.apache.geronimo.openwebbeans;
import org.apache.webbeans.config.OpenWebBeansConfiguration;
+import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.corespi.se.DefaultBDABeansXmlScanner;
import org.apache.webbeans.exception.WebBeansDeploymentException;
import org.apache.webbeans.logger.WebBeansLogger;
@@ -35,7 +36,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
-import javax.servlet.ServletContext;
import java.io.InputStream;
import java.net.URL;
import java.util.Enumeration;
@@ -76,7 +76,7 @@ public class OsgiMetaDataScannerService
// set per BDA beans.xml flag here because setting it in constructor
// occurs before
// properties are loaded.
- String usage = OpenWebBeansConfiguration.getInstance().getProperty(OpenWebBeansConfiguration.USE_BDA_BEANSXML_SCANNER);
+ String usage = WebBeansContext.getInstance().getOpenWebBeansConfiguration().getProperty(OpenWebBeansConfiguration.USE_BDA_BEANSXML_SCANNER);
this.isBDAScannerEnabled = Boolean.parseBoolean(usage);
if (isBDAScannerEnabled)
{
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java?rev=1056111&r1=1056110&r2=1056111&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java Thu Jan 6 22:58:36 2011
@@ -34,6 +34,7 @@ import javax.servlet.http.HttpSessionLis
import org.apache.webbeans.component.InjectionPointBean;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.OpenWebBeansConfiguration;
+import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.conversation.ConversationManager;
import org.apache.webbeans.corespi.ServiceLoader;
import org.apache.webbeans.el.ELContextStore;
@@ -206,7 +207,7 @@ public class WebBeansConfigurationListen
}
this.lifeCycle.getContextService().endContext(SessionScoped.class, event.getSession());
- ConversationManager conversationManager = ConversationManager.getInstance();
+ ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
conversationManager.destroyConversationContextWithSessionId(event.getSession().getId());
}