You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/01/31 22:58:42 UTC
svn commit: r617255 - in /openejb/trunk/openejb3:
assembly/openejb-tomcat/openejb-tomcat-webapp/
assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/java/org/apache/openejb/tomcat/
container/openejb-core/src/main/java/org/apache/openejb/resource/act...
Author: dblevins
Date: Thu Jan 31 13:58:36 2008
New Revision: 617255
URL: http://svn.apache.org/viewvc?rev=617255&view=rev
Log:
fix for openejb.home not getting set correctly in tomcat
fixed the broker factory to go to our jndi guaranteed
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/project.properties
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderServlet.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/project.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/project.properties?rev=617255&r1=617254&r2=617255&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/project.properties (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/project.properties Thu Jan 31 13:58:36 2008
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-openejb.version=3.0.0-SNAPSHOT
+openejb.version=3.0-SNAPSHOT
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java?rev=617255&r1=617254&r2=617255&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java Thu Jan 31 13:58:36 2008
@@ -61,6 +61,10 @@
protected ServiceManager manager;
public void init(Properties props) throws Exception {
+ // Loader maybe the first thing executed in a new classloader
+ // so we must attempt to initialize the system instance.
+ SystemInstance.init(props);
+
installConfigFiles();
// Not thread safe
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java?rev=617255&r1=617254&r2=617255&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactory.java Thu Jan 31 13:58:36 2008
@@ -21,6 +21,8 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -56,7 +58,8 @@
String resouceId = (String) value;
try {
- Context context = new InitialContext();
+ ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+ Context context = containerSystem.getJNDIContext();
Object obj = context.lookup("java:openejb/Resource/" + resouceId);
if (!(obj instanceof DataSource)) {
throw new IllegalArgumentException("Resource with id " + resouceId +
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf?rev=617255&r1=617254&r2=617255&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf Thu Jan 31 13:58:36 2008
@@ -174,10 +174,6 @@
ServerUrl vm://localhost?async=true
- # Specifies the size of the thread pool available to AciveMQ.
-
- ThreadPoolSize 30
-
# DataSource for persistence messages
DataSource My Unmanaged DataSource
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties?rev=617255&r1=617254&r2=617255&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties Thu Jan 31 13:58:36 2008
@@ -19,7 +19,7 @@
log4j.category.OpenEJB = warn,R
log4j.category.OpenEJB.server = info
log4j.category.OpenEJB.startup = info
-log4j.category.OpenEJB.startup.service = warn
+log4j.category.OpenEJB.startup.service = info
log4j.category.OpenEJB.startup.config = info
log4j.category.OpenEJB.hsql = info
log4j.category.OpenEJB.ws = info
Modified: openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderServlet.java?rev=617255&r1=617254&r2=617255&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderServlet.java (original)
+++ openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderServlet.java Thu Jan 31 13:58:36 2008
@@ -47,16 +47,16 @@
String webappPath = getWebappPath(config);
File webappDir = new File(webappPath);
+ System.setProperty("openejb.war", webappDir.getAbsolutePath());
+
File libDir = new File(webappDir, "lib");
+ p.setProperty("openejb.libs", libDir.getAbsolutePath());
String catalinaHome = System.getProperty("catalina.home");
p.setProperty("openejb.home", catalinaHome);
String catalinaBase = System.getProperty("catalina.base");
p.setProperty("openejb.base", catalinaBase);
-
- String libPath = libDir.getAbsolutePath();
- p.setProperty("openejb.libs", libPath);
try {
SystemInstance.init(p);