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 2006/11/30 03:27:40 UTC
svn commit: r480809 - in /incubator/openejb/trunk/openejb3: ./
assembly/openejb-standalone/
container/openejb-core/src/main/java/org/apache/openejb/alt/config/
container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/
contain...
Author: dblevins
Date: Wed Nov 29 18:27:38 2006
New Revision: 480809
URL: http://svn.apache.org/viewvc?view=rev&rev=480809
Log:
Added PrintWriter for Derby logs. Hack for setting derby.system.home. Fixed derby network startup issue
Added:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DerbySystemHomeHack.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java
Modified:
incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/RemoteServer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java
incubator/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
incubator/openejb/trunk/openejb3/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java
incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?view=diff&rev=480809&r1=480808&r2=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Wed Nov 29 18:27:38 2006
@@ -168,6 +168,10 @@
<artifactId>derbynet</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>idb</groupId>
<artifactId>idb</artifactId>
</dependency>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/RemoteServer.java?view=diff&rev=480809&r1=480808&r2=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/RemoteServer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/RemoteServer.java Wed Nov 29 18:27:38 2006
@@ -43,6 +43,18 @@
props.put("java.naming.security.credentials", "testpassword");
}
+ public static void main(String[] args) {
+ assert args.length > 0 : "no arguments supplied: valid arguments are 'start' or 'stop'";
+ if (args[0].equalsIgnoreCase("start")){
+ new RemoteServer().start();
+ } else if (args[0].equalsIgnoreCase("stop")) {
+ RemoteServer remoteServer = new RemoteServer();
+ remoteServer.serverHasAlreadyBeenStarted = false;
+ remoteServer.stop();
+ } else {
+ throw new RuntimeException("valid arguments are 'start' or 'stop'");
+ }
+ }
public Properties getProperties() {
return properties;
}
@@ -110,7 +122,7 @@
serverErr.setDaemon(true);
serverErr.start();
} catch (Exception e) {
- throw (RuntimeException)new RuntimeException("Cannot start the server.").initCause(e);
+ throw (RuntimeException)new RuntimeException("Cannot start the server. Exception: "+e.getClass().getName()+": "+e.getMessage()).initCause(e);
}
connect(10);
} else {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java?view=diff&rev=480809&r1=480808&r2=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java Wed Nov 29 18:27:38 2006
@@ -21,6 +21,7 @@
import org.exolab.castor.jdo.OQLQuery;
import org.exolab.castor.jdo.QueryResults;
import org.exolab.castor.mapping.AccessMode;
+import org.exolab.castor.mapping.MappingException;
import org.exolab.castor.persist.spi.CallbackInterceptor;
import org.exolab.castor.persist.spi.Complex;
import org.exolab.castor.persist.spi.InstanceFactory;
@@ -241,14 +242,18 @@
jdoManagerBuilder.addMapping(url);
}
- globalJdoManager = jdoManagerBuilder.buildGlobalJDOManager("java:openejb/connector/"+resourceName);
- globalJdoManager.setDatabasePooling(true);
- globalJdoManager.setCallbackInterceptor(this);
- globalJdoManager.setInstanceFactory(this);
-
- localJdoManager = jdoManagerBuilder.buildLocalJDOManager(driverClassName, driverUrl, username, password);
- localJdoManager.setCallbackInterceptor(this);
- localJdoManager.setInstanceFactory(this);
+ try {
+ globalJdoManager = jdoManagerBuilder.buildGlobalJDOManager("java:openejb/connector/"+resourceName);
+ globalJdoManager.setDatabasePooling(true);
+ globalJdoManager.setCallbackInterceptor(this);
+ globalJdoManager.setInstanceFactory(this);
+
+ localJdoManager = jdoManagerBuilder.buildLocalJDOManager(driverClassName, driverUrl, username, password);
+ localJdoManager.setCallbackInterceptor(this);
+ localJdoManager.setInstanceFactory(this);
+ } catch (MappingException e) {
+ e.printStackTrace();
+ }
} catch (Exception e) {
e.printStackTrace();
throw new OpenEJBException("Unable to construct the Castor JDOManager objects: "+e.getClass().getName()+": "+e.getMessage(), e);
Added: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DerbySystemHomeHack.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DerbySystemHomeHack.java?view=auto&rev=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DerbySystemHomeHack.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DerbySystemHomeHack.java Wed Nov 29 18:27:38 2006
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.resource.jdbc;
+
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.xbean.finder.ResourceFinder;
+
+import javax.resource.spi.ManagedConnectionFactory;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class DerbySystemHomeHack extends ManagedConnectionFactoryAdapter {
+
+ public DerbySystemHomeHack(ManagedConnectionFactory factory) {
+ super(factory);
+ System.setProperty("derby.system.home", SystemInstance.get().getBase().getDirectory().getAbsolutePath());
+ }
+}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java?view=diff&rev=480809&r1=480808&r2=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java Wed Nov 29 18:27:38 2006
@@ -94,6 +94,7 @@
factory = new InstantdbPropertiesHack(factory, url);
factory = new ManagedConnectionFactoryPathHack(factory);
} else if (driver.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
+ factory = new DerbySystemHomeHack(factory);
factory = new ManagedConnectionFactoryPathHack(factory);
}
Added: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java?view=auto&rev=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java Wed Nov 29 18:27:38 2006
@@ -0,0 +1,138 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.util;
+
+import org.apache.log4j.*;
+
+import java.io.PrintWriter;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Log4jPrintWriter extends PrintWriter {
+ private final StringBuffer text = new StringBuffer("");
+ private final org.apache.log4j.Logger logger;
+ private final Priority priority;
+
+ public Log4jPrintWriter(String category, Priority priority) {
+ super(System.err);
+ logger = org.apache.log4j.Logger.getLogger(category);
+ this.priority = priority;
+ }
+
+ public void close() {
+ flush();
+ }
+
+ private void flushLine() {
+ logger.log(priority, text.toString());
+ text.setLength(0);
+ }
+
+ public void flush() {
+ if (!text.toString().equals("")) {
+ flushLine();
+ }
+ }
+
+ public void print(boolean b) {
+ text.append(b);
+ }
+
+ public void print(char c) {
+ text.append(c);
+ }
+
+ public void print(char[] s) {
+ text.append(s);
+ }
+
+ public void print(double d) {
+ text.append(d);
+ }
+
+ public void print(float f) {
+ text.append(f);
+ }
+
+ public void print(int i) {
+ text.append(i);
+ }
+
+ public void print(long l) {
+ text.append(l);
+ }
+
+ public void print(Object obj) {
+ text.append(obj);
+ }
+
+ public void print(String s) {
+ text.append(s);
+ }
+
+ public void println() {
+ if (!text.toString().equals("")) {
+ flushLine();
+ }
+ }
+
+ public void println(boolean x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(char x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(char[] x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(double x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(float x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(int x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(long x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(Object x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(String x) {
+ text.append(x);
+ flushLine();
+ }
+}
Modified: incubator/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java?view=diff&rev=480809&r1=480808&r2=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java Wed Nov 29 18:27:38 2006
@@ -67,6 +67,10 @@
this.internalProperties.setProperty("openejb.home", home.getDirectory().getCanonicalPath());
this.internalProperties.setProperty("openejb.base", base.getDirectory().getCanonicalPath());
+ System.setProperty("derby.system.home", base.getDirectory().getCanonicalPath());
+ // set the magic system property that causes derby to use explicity
+ // file sync instead of relying on vm support for file open rws
+ System.setProperty("derby.storage.fileSyncTransactionLog", "true");
}
public long getStartTime() {
Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=480809&r1=480808&r2=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Wed Nov 29 18:27:38 2006
@@ -353,6 +353,11 @@
<version>10.2.1.6</version>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>10.2.1.6</version>
+ </dependency>
+ <dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql</artifactId>
<version>1.4-SNAPSHOT</version>
Modified: incubator/openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java?view=diff&rev=480809&r1=480808&r2=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-derbynet/src/main/java/org/apache/openejb/server/derbynet/DerbyNetworkService.java Wed Nov 29 18:27:38 2006
@@ -17,13 +17,19 @@
package org.apache.openejb.server.derbynet;
import org.apache.derby.drda.NetworkServerControl;
+import org.apache.log4j.Category;
+import org.apache.log4j.Priority;
+import org.apache.log4j.Logger;
import org.apache.openejb.server.SelfManaging;
import org.apache.openejb.server.ServerService;
import org.apache.openejb.server.ServiceException;
+import org.apache.openejb.util.Log4jPrintWriter;
+import org.apache.openejb.loader.SystemInstance;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.PrintWriter;
import java.net.InetAddress;
import java.net.Socket;
import java.util.Properties;
@@ -59,7 +65,8 @@
this.threads = Integer.parseInt(threads);
this.port = Integer.parseInt(port);
this.disabled = Boolean.parseBoolean(disabled);
- host = InetAddress.getByName(bind);
+ host = InetAddress.getByName("0.0.0.0");
+ System.setProperty("derby.system.home", SystemInstance.get().getBase().getDirectory().getAbsolutePath());
}
public void service(InputStream inputStream, OutputStream outputStream) throws ServiceException, IOException {
@@ -72,10 +79,11 @@
if (disabled) return;
try {
serverControl = new NetworkServerControl(host, port);
- serverControl.setMaxThreads(threads);
- serverControl.start(null);
+ //serverControl.setMaxThreads(threads);
+
+ serverControl.start(new Log4jPrintWriter("Derby", Priority.INFO));
} catch (Exception e) {
- new ServiceException(e);
+ throw new ServiceException(e);
}
}
@@ -91,4 +99,5 @@
serverControl = null;
}
}
+
}
Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?view=diff&rev=480809&r1=480808&r2=480809
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java Wed Nov 29 18:27:38 2006
@@ -239,7 +239,7 @@
printRow(d.getName(), d.getIP(), d.getPort() + "");
}
} catch (Exception e) {
- logger.error(d.getName() + " " + d.getIP() + " " + d.getPort() + ": " + e.getMessage());
+ logger.fatal("Service Start Failed: "+d.getName() + " " + d.getIP() + " " + d.getPort() + ": " + e.getMessage());
if (display) {
printRow(d.getName(), "----", "FAILED");
}