svn commit: r1243924 - in /openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl: Activator.java Deployer.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Feb 14 14:05:09 2012
New Revision: 1243924

URL: http://svn.apache.org/viewvc?rev=1243924&view=rev
Log:
fixing openejb.nobanner property and managing a bit equinox

Modified:
    openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
    openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java

Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java?rev=1243924&r1=1243923&r2=1243924&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java Tue Feb 14 14:05:09 2012
@@ -54,7 +54,7 @@ public class Activator implements Bundle
         // default, but to remember that the setting exists
         env.setProperty("openejb.loader", "context");
         env.setProperty("openejb.deployments.classpath", "false");
-        env.setProperty("openejb.nobanner", "false"); // is this property really inverted?
+        env.setProperty("openejb.nobanner", "true");
 
         SystemInstance.init(env);
         // OptionsLog.install();

Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java?rev=1243924&r1=1243923&r2=1243924&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java Tue Feb 14 14:05:09 2012
@@ -20,7 +20,6 @@ import org.apache.openejb.AppContext;
 import org.apache.openejb.BeanContext;
 import org.apache.openejb.BeanType;
 import org.apache.openejb.NoSuchApplicationException;
-import org.apache.openejb.RpcContainer;
 import org.apache.openejb.UndeployException;
 import org.apache.openejb.assembler.classic.AppInfo;
 import org.apache.openejb.assembler.classic.Assembler;
@@ -29,7 +28,6 @@ import org.apache.openejb.config.Configu
 import org.apache.openejb.config.DeploymentLoader;
 import org.apache.openejb.config.UnknownModuleTypeException;
 import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
 import org.apache.openejb.util.proxy.ProxyEJB;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -41,9 +39,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -129,6 +124,9 @@ public class Deployer implements BundleL
                     if (!bundleDump.exists() && bundle.getBundleContext().getDataFile("") != null) { // felix. TODO: maybe find something better
                         bundleDump = findFelixJar(bundle.getBundleContext());
                     }
+                    if (bundleDump == null || !bundleDump.exists()) {
+                        bundleDump = findEquinoxJar(bundle.getBundleContext());
+                    }
 
                     if (bundleDump == null || !bundleDump.exists()) {
                         LOGGER.warn("can't find bundle {}", bundle.getBundleId());
@@ -164,6 +162,19 @@ public class Deployer implements BundleL
         }
     }
 
+    private static File findEquinoxJar(BundleContext bundleContext) {
+        final File root = bundleContext.getDataFile("").getParentFile();
+        int idx = 0;
+        File out;
+        File f = null;
+        do {
+            out = f;
+            idx++;
+            f = new File(root, idx + "/bundlefile");
+        } while (f.exists());
+        return out;
+    }
+
     private static File findFelixJar(BundleContext bundleContext) {
         final File root = bundleContext.getDataFile("").getParentFile();
         int min = 0;