You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/05/06 18:06:38 UTC
svn commit: r772339 - in
/incubator/openwebbeans/trunk/webbeans-impl/src/main:
java/org/apache/webbeans/config/ java/org/apache/webbeans/context/
java/org/apache/webbeans/spi/ resources/META-INF/openwebbeans/
Author: gerdogdu
Date: Wed May 6 16:06:36 2009
New Revision: 772339
URL: http://svn.apache.org/viewvc?rev=772339&view=rev
Log:
Update for M2 release.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/JNDIService.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java?rev=772339&r1=772338&r2=772339&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java Wed May 6 16:06:36 2009
@@ -185,8 +185,9 @@
rawType = (Class<?>)pt.getRawType();
}
- //Comment out while testing TCK Events Test --- WBTCK27 jira./////
- if(rawType.equals(Event.class))
+ //Comment out while testing TCK Events Test --- WBTCK27 jira./////
+ //Hack for EntityManager --> Solve in M3!!!!
+ if(rawType.equals(Event.class) || rawType.getSimpleName().equals("EntityManager"))
{
return;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java?rev=772339&r1=772338&r2=772339&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java Wed May 6 16:06:36 2009
@@ -124,6 +124,7 @@
}
requestContext.remove();
+
}
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/JNDIService.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/JNDIService.java?rev=772339&r1=772338&r2=772339&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/JNDIService.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/JNDIService.java Wed May 6 16:06:36 2009
@@ -25,6 +25,11 @@
*/
public interface JNDIService
{
+ /**JMS Connection Factory JNDI Name*/
+ public static final String JMS_CONNECTION_FACTORY_JNDI_KEY = "org.apache.webbeans.spi.JNDIService.jmsConnectionFactoryJndi";
+
+ /**Default value*/
+ public static final String JMS_CONNECTION_FACTORY_JNDI_DEFAULT_VALUE = "ConnectionFactory";
/**
* Bind the object with the given name to the JNDI environment
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties?rev=772339&r1=772338&r2=772339&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties Wed May 6 16:06:36 2009
@@ -15,9 +15,12 @@
#Use in Java EE Containers
#org.apache.webbeans.spi.JNDIService=org.apache.webbeans.spi.ee.JNDIServiceEnterpriseImpl
-use the static HashMap instead of storing objects in JNDI as default
+#use the static HashMap instead of storing objects in JNDI as default
org.apache.webbeans.spi.JNDIService=org.apache.webbeans.spi.se.JNDIServiceStaticImpl
+#JMS ConnectionFactory JNDI Name
+org.apache.webbeans.spi.JNDIService.jmsConnectionFactoryJndi=ConnectionFactory
+
# lookup the javax.transaction.TransactionManager via JNDI as default
org.apache.webbeans.spi.TransactionService=org.apache.webbeans.spi.ee.TransactionServiceJndiImpl