You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2009/10/28 17:06:46 UTC
svn commit: r830658 - in
/openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi: pom.xml
src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
Author: jlaskowski
Date: Wed Oct 28 16:06:46 2009
New Revision: 830658
URL: http://svn.apache.org/viewvc?rev=830658&view=rev
Log:
Deployer to deploy EJBs onto OpenEJB and register them as OSGi services
Added:
openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java (with props)
Modified:
openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/pom.xml
openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
Modified: openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/pom.xml?rev=830658&r1=830657&r2=830658&view=diff
==============================================================================
--- openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/pom.xml (original)
+++ openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/pom.xml Wed Oct 28 16:06:46 2009
@@ -55,9 +55,9 @@
<configuration>
<instructions>
<Bundle-Activator>org.apache.openejb.core.osgi.impl.Activator</Bundle-Activator>
- <Require-Bundle>org.apache.openejb.core</Require-Bundle>
+ <Require-Bundle>org.apache.openejb.core, org.apache.openejb.loader, org.apache.openejb.jee</Require-Bundle>
<Export-Package>org.apache.openejb.core.osgi.*</Export-Package>
- <Import-Package>org.apache.openejb.resource.activemq,org.apache.activemq.ra,javax.jms,org.apache.commons.logging,org.apache.openejb;version="3.1",org.apache.openejb.core.osgi.impl,org.apache.openejb.loader;version="3.1",org.apache.openejb.util;version="3.1",org.osgi.framework;version="1.4",javax.transaction;version="[1.1,1.2)",javax.transaction.xa;version="[1.1,1.2)",javax.naming,org.apache.openejb.client</Import-Package>
+ <Import-Package>org.apache.openejb.assembler.classic,org.apache.openejb.config,org.apache.openejb.spi,org.apache.openejb.resource.activemq,org.apache.activemq.ra,javax.jms,org.apache.commons.logging,org.apache.openejb;version="3.1",org.apache.openejb.core.osgi.impl,org.apache.openejb.loader;version="3.1",org.apache.openejb.util;version="3.1",org.osgi.framework;version="1.4",javax.transaction;version="[1.1,1.2)",javax.transaction.xa;version="[1.1,1.2)",javax.naming,org.apache.openejb.client</Import-Package>
</instructions>
</configuration>
</plugin>
Modified: openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java?rev=830658&r1=830657&r2=830658&view=diff
==============================================================================
--- openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java (original)
+++ openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java Wed Oct 28 16:06:46 2009
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -31,34 +30,37 @@
public class Activator implements BundleActivator {
private OpenEJBInstance openejb;
-
- public void start(BundleContext ctx) throws Exception {
- System.out.println("Activator started");
-
+ public void start(BundleContext context) throws Exception {
+
+ System.out.println("Starting OpenEJB...");
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
openejb = new OpenEJBInstance();
-
+
Properties env = new Properties();
- //env.setProperty("openejb.embedded", "true");
+ // env.setProperty("openejb.embedded", "true");
// default, but to remember that the setting exists
env.setProperty("openejb.loader", "context");
// NPE
env.setProperty("openejb.deployments.classpath", "false");
// Else it doesn't work - ClassNotFoundException: org.apache.log4j.Layout
env.setProperty("openejb.log.factory", "org.apache.openejb.util.JuliLogStreamFactory");
-
+
SystemInstance.init(env);
// OptionsLog.install();
// OpenEJB.init(env);
openejb.init(env);
+
+ System.out.println("Registering OSGified OpenEJB Deployer...");
+ context.addBundleListener(new Deployer());
}
- public void stop(BundleContext ctx) throws Exception {
+ public void stop(BundleContext context) throws Exception {
+ System.out.println("Stopping OpenEJB; openejb.isInitialized(): " + openejb.isInitialized());
openejb = null;
OpenEJB.destroy();
}
-
}
Added: openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java?rev=830658&view=auto
==============================================================================
--- openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java (added)
+++ openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java Wed Oct 28 16:06:46 2009
@@ -0,0 +1,108 @@
+/**
+ * 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.core.osgi.impl;
+
+import java.io.File;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.DeploymentLoader;
+import org.apache.openejb.loader.SystemInstance;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Deployer implements BundleListener {
+
+ public void bundleChanged(BundleEvent event) {
+ int type = event.getType();
+ if (type == BundleEvent.STARTED) {
+ Bundle bundle = event.getBundle();
+ System.out.println(String.format("[Deployer] Bundle %s has been started", bundle.getSymbolicName()));
+
+ System.out.println(String.format("[Deployer] Checking whether it's an EJB module"));
+ Enumeration<?> e = bundle.findEntries("META-INF", "ejb-jar.xml", false);
+ if (e.hasMoreElements()) {
+ URL ejbJarUrl = (URL) e.nextElement();
+
+ System.out.println("[Deployer] It's an EJB module: " + ejbJarUrl);
+
+ System.out.println("[Deployer] Deploying onto OpenEJB");
+
+ String location = bundle.getLocation();
+ System.out.println("[Deployer] bundle location: " + location);
+ try {
+ File file = new File(new URL(location).getFile());
+ try {
+ DeploymentLoader deploymentLoader = new DeploymentLoader();
+ AppModule appModule = deploymentLoader.load(file);
+
+ ConfigurationFactory configurationFactory = new ConfigurationFactory();
+ AppInfo appInfo = configurationFactory.configureApplication(appModule);
+
+ Assembler assembler = (Assembler) SystemInstance.get().getComponent(Assembler.class);
+ System.out.println(assembler);
+ System.out.println(appInfo);
+ assembler.createApplication(appInfo);
+
+ System.out.println("[Deployer] Application deployed: " + appInfo.jarPath);
+
+ registerService(event.getBundle(), appInfo);
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ } catch (Exception ex1) {
+ ex1.printStackTrace();
+ }
+
+ }
+ }
+ }
+
+ /**
+ * Register OSGi Service for EJB so calling the service will actually call the EJB
+ *
+ * @param bundle
+ * @param appInfo
+ */
+ private void registerService(Bundle bundle, AppInfo appInfo) {
+ System.out.println("[Deployer] Registering a service for the EJB");
+ BundleContext context = bundle.getBundleContext();
+ for (EjbJarInfo ejbJarInfo : appInfo.ejbJars) {
+ for (EnterpriseBeanInfo ejbInfo : ejbJarInfo.enterpriseBeans) {
+ try {
+ context.registerService(ejbInfo.businessRemote.toArray(new String[0]), bundle.loadClass(ejbInfo.ejbClass).newInstance(), new Properties());
+ System.out.println(String.format("[Deployer] Service object %s registered under the class names: %s", ejbInfo.ejbClass, ejbInfo.businessRemote));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
Propchange: openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: openejb/trunk/sandbox/openejb-osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain