Author: jgallimore
Date: Tue Feb 17 16:13:32 2009
New Revision: 745131
URL: http://svn.apache.org/viewvc?rev=745131&view=rev
Log:
OEP-24 Mavenized openejb.server plugin build
Added:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/pom.xml
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbApplication.java
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbDeploymentService.java
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbPlugin.java
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbServer.java
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/resources/
Removed:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/org/
Modified:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/META-INF/MANIFEST.MF
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/pom.xml
Modified:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/META-INF/MANIFEST.MF?rev=745131&r1=745130&r2=745131&view=diff
==============================================================================
---
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/META-INF/MANIFEST.MF
(original)
+++
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/META-INF/MANIFEST.MF
Tue Feb 17 16:13:32 2009
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: OpenEJB Server Bundle
Bundle-SymbolicName: openejb.server;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.2
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-BuddyPolicy: registered
@@ -650,56 +650,57 @@
serp.bytecode.visitor,
serp.util
Bundle-ClassPath: .,
- lib/activeio-core-3.0.0-incubator.jar,
- lib/activemq-core-4.1.1.jar,
- lib/activemq-ra-4.1.1.jar,
- lib/asm-finder-3.1.jar,
- lib/backport-util-concurrent-2.1.jar,
- lib/commons-cli-1.1.jar,
- lib/commons-collections-3.2.jar,
- lib/commons-dbcp-all-1.3-r699049.jar,
- lib/commons-lang-2.1.jar,
- lib/commons-logging-1.1.jar,
- lib/commons-logging-api-1.1.jar,
- lib/commons-pool-1.3.jar,
- lib/cxf-bundle-2.0.4-incubator.jar,
- lib/ejb31-api-experimental-3.1.jar,
- lib/geronimo-connector-2.1.jar,
- lib/geronimo-javamail_1.4_mail-1.2.jar,
- lib/geronimo-transaction-2.1.jar,
- lib/howl-1.0.1-1.jar,
- lib/hsqldb-1.8.0.7.jar,
- lib/javaee-api-5.0-1.jar,
- lib/jaxb-impl-2.0.5.jar,
- lib/log4j-1.2.12.jar,
- lib/neethi-2.0.2.jar,
- lib/openejb-client-3.1.jar,
- lib/openejb-core-3.1.jar,
- lib/openejb-cxf-3.1.jar,
- lib/openejb-ejbd-3.1.jar,
- lib/openejb-hsql-3.1.jar,
- lib/openejb-http-3.1.jar,
- lib/openejb-javaagent-3.1.jar,
- lib/openejb-jee-3.1.jar,
- lib/openejb-loader-3.1.jar,
- lib/openejb-multicast-3.1.jar,
- lib/openejb-server-3.1.jar,
- lib/openejb-telnet-3.1.jar,
- lib/openejb-webservices-3.1.jar,
- lib/openjpa-1.1.0.jar,
- lib/saaj-impl-1.3.jar,
- lib/serp-1.13.1.jar,
- lib/slf4j-api-1.3.1.jar,
- lib/slf4j-jdk14-1.3.1.jar,
- lib/stax-api-1.0.1.jar,
- lib/swizzle-stream-1.0.1.jar,
- lib/wsdl4j-1.6.1.jar,
- lib/wstx-asl-3.2.0.jar,
- lib/xbean-naming-3.4.1.jar,
- lib/xbean-reflect-3.4.1.jar,
- lib/xml-resolver-1.2.jar,
- lib/XmlSchema-1.3.2.jar
-Require-Bundle: system.bundle,
- org.eclipse.core.runtime,
- org.eclipse.core.variables;bundle-version="3.2.100"
+ target/classes,
+ lib/activeio-core-3.0.0-incubator.jar,
+ lib/activemq-core-4.1.1.jar,
+ lib/activemq-ra-4.1.1.jar,
+ lib/asm-finder-3.1.jar,
+ lib/backport-util-concurrent-2.1.jar,
+ lib/commons-cli-1.1.jar,
+ lib/commons-collections-3.2.jar,
+ lib/commons-dbcp-all-1.3-r699049.jar,
+ lib/commons-lang-2.1.jar,
+ lib/commons-logging-1.1.jar,
+ lib/commons-logging-api-1.1.jar,
+ lib/commons-pool-1.3.jar,
+ lib/cxf-bundle-2.0.4-incubator.jar,
+ lib/ejb31-api-experimental-3.1.1-SNAPSHOT.jar,
+ lib/geronimo-connector-2.1.jar,
+ lib/geronimo-javamail_1.4_mail-1.2.jar,
+ lib/geronimo-transaction-2.1.jar,
+ lib/howl-1.0.1-1.jar,
+ lib/hsqldb-1.8.0.7.jar,
+ lib/javaee-api-5.0-1.jar,
+ lib/jaxb-impl-2.0.5.jar,
+ lib/log4j-1.2.12.jar,
+ lib/neethi-2.0.2.jar,
+ lib/openejb-client-3.1.1-SNAPSHOT.jar,
+ lib/openejb-core-3.1.1-SNAPSHOT.jar,
+ lib/openejb-cxf-3.1.1-SNAPSHOT.jar,
+ lib/openejb-ejbd-3.1.1-SNAPSHOT.jar,
+ lib/openejb-hsql-3.1.1-SNAPSHOT.jar,
+ lib/openejb-http-3.1.1-SNAPSHOT.jar,
+ lib/openejb-javaagent-3.1.1-SNAPSHOT.jar,
+ lib/openejb-jee-3.1.1-SNAPSHOT.jar,
+ lib/openejb-loader-3.1.1-SNAPSHOT.jar,
+ lib/openejb-multicast-3.1.1-SNAPSHOT.jar,
+ lib/openejb-server-3.1.1-SNAPSHOT.jar,
+ lib/openejb-telnet-3.1.1-SNAPSHOT.jar,
+ lib/openejb-webservices-3.1.1-SNAPSHOT.jar,
+ lib/openjpa-1.2.0.jar,
+ lib/quartz-1.5.2.jar,
+ lib/saaj-impl-1.3.jar,
+ lib/serp-1.13.1.jar,
+ lib/slf4j-api-1.3.1.jar,
+ lib/slf4j-jdk14-1.3.1.jar,
+ lib/stax-api-1.0.1.jar,
+ lib/swizzle-stream-1.0.1.jar,
+ lib/wsdl4j-1.6.1.jar,
+ lib/wstx-asl-3.2.0.jar,
+ lib/xbean-naming-3.4.1.jar,
+ lib/xbean-reflect-3.4.1.jar,
+ lib/xml-resolver-1.2.jar,
+ lib/XmlSchema-1.3.2.jar
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.variables
Bundle-Activator: org.apache.openejb.eclipse.OpenEjbPlugin
Added:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/pom.xml?rev=745131&view=auto
==============================================================================
--- openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/pom.xml
(added)
+++ openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/pom.xml
Tue Feb 17 16:13:32 2009
@@ -0,0 +1,344 @@
+<!--
+ ~ 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.
+-->
+<!-- $Rev: 577554 $ $Date: 2007-09-20 06:35:12 +0100 (Thu, 20 Sep 2007) $ -->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb.server</artifactId>
+ <version>1.0.2</version>
+ <packaging>jar</packaging>
+ <name>${artifactId}</name>
+ <parent>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>eclipse-plugins-parent</artifactId>
+ <version>1.0.2</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <build>
+ <resources>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>META-INF</directory>
+ <includes>
+ <include>MANIFEST.MF</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>lib</directory>
+ <targetPath>lib</targetPath>
+ <includes>
+ <include>*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-eclipsepde-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>lib</outputDirectory>
+ <overWriteSnapshots>
+ true
+ </overWriteSnapshots>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-loader</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-core</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>log4j</groupId>
+
<artifactId>log4j</artifactId>
+
<version>1.2.12</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>ejb31-api-experimental</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-javaagent</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-jee</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.codehaus.woodstox</groupId>
+
<artifactId>wstx-asl</artifactId>
+
<version>3.2.0</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>stax</groupId>
+
<artifactId>stax-api</artifactId>
+
<version>1.0.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>com.sun.xml.bind</groupId>
+
<artifactId>jaxb-impl</artifactId>
+
<version>2.0.5</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>commons-cli</groupId>
+
<artifactId>commons-cli</artifactId>
+
<version>1.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.activemq</groupId>
+
<artifactId>activemq-ra</artifactId>
+
<version>4.1.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.activemq</groupId>
+
<artifactId>activemq-core</artifactId>
+
<version>4.1.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>backport-util-concurrent</groupId>
+
<artifactId>backport-util-concurrent</artifactId>
+
<version>2.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.activemq</groupId>
+
<artifactId>activeio-core</artifactId>
+
<version>3.0.0-incubator</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openjpa</groupId>
+
<artifactId>openjpa</artifactId>
+
<version>1.2.0</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>commons-pool</groupId>
+
<artifactId>commons-pool</artifactId>
+
<version>1.3</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>net.sourceforge.serp</groupId>
+
<artifactId>serp</artifactId>
+
<version>1.13.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>commons-lang</groupId>
+
<artifactId>commons-lang</artifactId>
+
<version>2.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>commons-collections</groupId>
+
<artifactId>commons-collections</artifactId>
+
<version>3.2</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.geronimo.components</groupId>
+
<artifactId>geronimo-connector</artifactId>
+
<version>2.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.geronimo.components</groupId>
+
<artifactId>geronimo-transaction</artifactId>
+
<version>2.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.objectweb.howl</groupId>
+
<artifactId>howl</artifactId>
+
<version>1.0.1-1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.xbean</groupId>
+
<artifactId>xbean-reflect</artifactId>
+
<version>3.4.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging-api</artifactId>
+
<version>1.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>asm-finder</artifactId>
+
<version>3.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.xbean</groupId>
+
<artifactId>xbean-naming</artifactId>
+
<version>3.4.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>hsqldb</groupId>
+
<artifactId>hsqldb</artifactId>
+
<version>1.8.0.7</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>commons-dbcp-all</artifactId>
+
<version>1.3-r699049</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.codehaus.swizzle</groupId>
+
<artifactId>swizzle-stream</artifactId>
+
<version>1.0.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+
<version>1.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>wsdl4j</groupId>
+
<artifactId>wsdl4j</artifactId>
+
<version>1.6.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>quartz</groupId>
+
<artifactId>quartz</artifactId>
+
<version>1.5.2</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>javaee-api</artifactId>
+
<version>5.0-1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.geronimo.javamail</groupId>
+
<artifactId>geronimo-javamail_1.4_mail</artifactId>
+
<version>1.2</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-client</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-server</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-ejbd</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-multicast</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-hsql</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-http</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-telnet</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-cxf</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-webservices</artifactId>
+
<version>3.1.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.cxf</groupId>
+
<artifactId>cxf-bundle</artifactId>
+
<version>2.0.4-incubator</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.slf4j</groupId>
+
<artifactId>slf4j-api</artifactId>
+
<version>1.3.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>com.sun.xml.messaging.saaj</groupId>
+
<artifactId>saaj-impl</artifactId>
+
<version>1.3</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.neethi</groupId>
+
<artifactId>neethi</artifactId>
+
<version>2.0.2</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.slf4j</groupId>
+
<artifactId>slf4j-jdk14</artifactId>
+
<version>1.3.1</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.ws.commons.schema</groupId>
+
<artifactId>XmlSchema</artifactId>
+
<version>1.3.2</version>
+ </artifactItem>
+ <artifactItem>
+
<groupId>xml-resolver</groupId>
+
<artifactId>xml-resolver</artifactId>
+
<version>1.2</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>3.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
Added:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbApplication.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbApplication.java?rev=745131&view=auto
==============================================================================
---
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbApplication.java
(added)
+++
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbApplication.java
Tue Feb 17 16:13:32 2009
@@ -0,0 +1,104 @@
+package org.apache.openejb.eclipse;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Properties;
+
+import org.apache.openejb.NoSuchApplicationException;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.UndeployException;
+import org.apache.openejb.assembler.Deployer;
+import org.apache.openejb.assembler.DeployerEjb;
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ResourceInfo;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.sys.Openejb;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.loader.SystemInstance;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.variables.IStringVariableManager;
+import org.eclipse.core.variables.VariablesPlugin;
+import org.osgi.framework.Bundle;
+
+public class OpenEjbApplication {
+
+ private AppInfo appInfo;
+ private URL rootUrl;
+
+ public OpenEjbApplication(Bundle bundle) throws IOException {
+ this.rootUrl = bundle.getEntry("/");
+ this.rootUrl = FileLocator.toFileURL(this.rootUrl);
+ this.appInfo = null;
+ }
+
+ public OpenEjbApplication(URL rootUrl) {
+ this.appInfo = null;
+ this.rootUrl = rootUrl;
+ }
+
+ public AppInfo getAppInfo() {
+ return appInfo;
+ }
+
+ public URL getRootUrl() {
+ return rootUrl;
+ }
+
+ public void deploy(Properties properties) throws OpenEJBException {
+
+ ConfigurationFactory factory = new ConfigurationFactory();
+
+ String url = rootUrl.getPath();
+ Assembler assembler = SystemInstance.get()
+ .getComponent(Assembler.class);
+ Openejb openejb = storeProperties(properties, factory);
+
+ for (Resource resource : openejb.getResource()) {
+ ResourceInfo serviceInfo = factory.configureService(resource,
+ ResourceInfo.class);
+ assembler.createResource(serviceInfo);
+ }
+
+ Deployer deployer = new DeployerEjb();
+ this.appInfo = deployer.deploy(url, properties);
+ }
+
+ public void undeploy() throws NoSuchApplicationException,
UndeployException {
+ Assembler assembler = SystemInstance.get()
+ .getComponent(Assembler.class);
+ assembler.destroyApplication(this.appInfo.jarPath);
+ }
+
+ private Openejb storeProperties(Properties properties,
+ ConfigurationFactory factory) {
+
+ IStringVariableManager manager = VariablesPlugin.getDefault()
+ .getStringVariableManager();
+ Openejb openejb = new Openejb();
+ for (Object k : properties.keySet()) {
+ Object v = properties.get(k);
+ if (v instanceof String) {
+ String key = (String) k;
+ String value = (String) v;
+ try {
+ value = manager.performStringSubstitution(value, false);
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ SystemInstance.get().setProperty(key, value);
+ if (value.startsWith("new://")) {
+ try {
+ URI uri = new URI(value);
+ openejb.add(factory.toConfigDeclaration(key, uri));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ return openejb;
+ }
+}
Added:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbDeploymentService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbDeploymentService.java?rev=745131&view=auto
==============================================================================
---
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbDeploymentService.java
(added)
+++
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbDeploymentService.java
Tue Feb 17 16:13:32 2009
@@ -0,0 +1,118 @@
+package org.apache.openejb.eclipse;
+
+import java.io.File;
+import java.net.URL;
+import java.util.Properties;
+
+import org.apache.openejb.OpenEJBException;
+import org.eclipse.core.runtime.FileLocator;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+
+public class OpenEjbDeploymentService {
+
+ private ServiceTracker deploymentTracker;
+ private BundleContext bundleContext;
+ private OpenEjbServer ejbServer;
+
+ public OpenEjbDeploymentService(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ this.deploymentTracker = null;
+ this.ejbServer = null;
+ }
+
+ public void open() {
+
+ try {
+ if (ejbServer == null) {
+ Bundle bundle = bundleContext.getBundle();
+ URL baseUrl = bundle.getEntry("/");
+ baseUrl = FileLocator.toFileURL(baseUrl);
+ File baseDir = new File(baseUrl.getPath());
+
+ ejbServer = new OpenEjbServer();
+ ejbServer.init(baseDir);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return;
+ }
+
+ deploymentTracker = new ServiceTracker(bundleContext,
+ OpenEjbApplication.class.getName(), null);
+ deploymentTracker.open();
+
+ ServiceListener sl = new ServiceListener() {
+
+ public void serviceChanged(ServiceEvent ev) {
+ ServiceReference sr = ev.getServiceReference();
+ switch (ev.getType()) {
+
+ case ServiceEvent.REGISTERED:
+ deployApplication(sr);
+ break;
+
+ case ServiceEvent.UNREGISTERING:
+ undeployApplication(sr);
+ break;
+ }
+ }
+ };
+
+ // Generate a ServiceEvent for any existing OpenEJbApplication services.
+
+ String filter = "(objectclass=" + OpenEjbApplication.class.getName()
+ + ")";
+ try {
+ bundleContext.addServiceListener(sl, filter);
+ ServiceReference[] srl = bundleContext.getServiceReferences(null,
+ filter);
+ if (srl != null) {
+ for (ServiceReference sr : srl) {
+ sl.serviceChanged(new ServiceEvent(ServiceEvent.REGISTERED,
+ sr));
+ }
+ }
+ } catch (InvalidSyntaxException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void close() throws Exception {
+ deploymentTracker.close();
+ ejbServer.destroy();
+ }
+
+ private void deployApplication(ServiceReference sr) {
+ OpenEjbApplication application = (OpenEjbApplication) bundleContext
+ .getService(sr);
+ Properties properties = new Properties();
+ for (String key : sr.getPropertyKeys()) {
+ Object value = sr.getProperty(key);
+ if (value instanceof String) {
+ properties.put(key, value);
+ }
+ }
+ try {
+ application.deploy(properties);
+ } catch (OpenEJBException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void undeployApplication(ServiceReference sr) {
+ try {
+ OpenEjbApplication application = (OpenEjbApplication) bundleContext
+ .getService(sr);
+ application.undeploy();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
Added:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbPlugin.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbPlugin.java?rev=745131&view=auto
==============================================================================
---
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbPlugin.java
(added)
+++
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbPlugin.java
Tue Feb 17 16:13:32 2009
@@ -0,0 +1,84 @@
+package org.apache.openejb.eclipse;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Properties;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.variables.IStringVariableManager;
+import org.eclipse.core.variables.IValueVariable;
+import org.eclipse.core.variables.VariablesPlugin;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+public class OpenEjbPlugin extends Plugin {
+
+ private OpenEjbDeploymentService service = null;
+ private IStringVariableManager manager = null;
+
+ private static OpenEjbPlugin plugin;
+
+ public OpenEjbPlugin () {
+ super();
+ manager = VariablesPlugin.getDefault().getStringVariableManager();
+ addPropertyVariables(System.getProperties());
+ plugin = this;
+ }
+
+ public static OpenEjbPlugin getDefault() {
+ return plugin;
+ }
+
+ public void start(BundleContext aContext) throws Exception {
+ super.start(aContext);
+ service = new OpenEjbDeploymentService(aContext);
+ service.open();
+ }
+
+ public void stop(BundleContext aContext) throws Exception {
+ service.close();
+ super.stop(aContext);
+ }
+
+ public Properties loadProperties(Bundle bundle, Path path) {
+ Properties properties = new Properties();
+ URL[] urls = FileLocator.findEntries(bundle, path);
+ for (URL url : urls) {
+ Properties p = new Properties();
+ try {
+ InputStream is = url.openStream();
+ p.load(is);
+ is.close();
+ } catch (IOException ioe) {
+ // Ignore any properties partially loaded from a bad file.
+ p.clear();
+ }
+ addPropertyVariables(p);
+ properties.putAll(p);
+ }
+ return properties;
+ }
+
+ private void addPropertyVariables(Properties properties) {
+ for (Object k : properties.keySet()) {
+ String key = (String) k;
+ String value = properties.getProperty(key);
+ IValueVariable variable = manager.getValueVariable(key);
+ if (variable == null) {
+ variable = manager.newValueVariable(key, "", false, value);
+ try {
+ manager.addVariables(new IValueVariable[] {variable});
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ } else {
+ variable.setValue(value);
+ }
+ }
+ }
+
+}
Added:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbServer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbServer.java?rev=745131&view=auto
==============================================================================
---
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbServer.java
(added)
+++
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/openejb.server/src/main/java/org/apache/openejb/eclipse/OpenEjbServer.java
Tue Feb 17 16:13:32 2009
@@ -0,0 +1,50 @@
+package org.apache.openejb.eclipse;
+
+import java.io.File;
+import java.util.Properties;
+
+import javax.naming.Context;
+
+import org.apache.openejb.NoSuchApplicationException;
+import org.apache.openejb.OpenEJB;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.UndeployException;
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.loader.SystemInstance;
+
+public class OpenEjbServer {
+
+ public void init(File baseDir) throws OpenEJBException {
+
+ File homeDir = new File(System.getProperty("user.home"));
+ homeDir = new File(homeDir, "openejb");
+ if (!homeDir.exists()) {
+ homeDir.mkdir();
+ }
+
+ File metaInfDir = new File(baseDir, "META-INF");
+ File configFile = new File(metaInfDir, "openejb.xml");
+
+ // Setup environment
+ Properties properties = new Properties();
+ properties.put(Context.INITIAL_CONTEXT_FACTORY,
+ "org.apache.openejb.client.LocalInitialContextFactory");
+
+ properties.put("openejb.home", homeDir.getAbsolutePath());
+ properties.put("openejb.base", baseDir.getAbsolutePath());
+ properties.put("openejb.configuration", configFile.getAbsolutePath());
+ properties.put("openejb.deployments.classpath", "false");
+
+ OpenEJB.init(properties);
+ }
+
+ public void destroy() throws NoSuchApplicationException, UndeployException
{
+ Assembler assembler = SystemInstance.get()
+ .getComponent(Assembler.class);
+ for (AppInfo appInfo : assembler.getDeployedApplications()) {
+ assembler.destroyApplication(appInfo.jarPath);
+ }
+ OpenEJB.destroy();
+ }
+}
Modified:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml?rev=745131&r1=745130&r2=745131&view=diff
==============================================================================
---
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml
(original)
+++
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml
Tue Feb 17 16:13:32 2009
@@ -82,89 +82,71 @@
<goal>copy</goal>
</goals>
<configuration>
+
+ <!--
+ lib/activeio-core-3.0.0-incubator.jar,
+ lib/activemq-core-4.1.1.jar,
+ lib/activemq-ra-4.1.1.jar,
+ lib/asm-finder-3.1.jar,
+ lib/backport-util-concurrent-2.1.jar,
+ lib/commons-cli-1.1.jar,
+ lib/commons-collections-3.2.jar,
+ lib/commons-dbcp-all-1.3-r699049.jar,
+ lib/commons-lang-2.1.jar,
+ lib/commons-logging-1.1.jar,
+ lib/commons-logging-api-1.1.jar,
+ lib/commons-pool-1.3.jar,
+ lib/cxf-bundle-2.0.4-incubator.jar,
+ lib/ejb31-api-experimental-3.1.jar,
+ lib/geronimo-connector-2.1.jar,
+ lib/geronimo-javamail_1.4_mail-1.2.jar,
+ lib/geronimo-transaction-2.1.jar,
+ lib/howl-1.0.1-1.jar,
+ lib/hsqldb-1.8.0.7.jar,
+ lib/javaee-api-5.0-1.jar,
+ lib/jaxb-impl-2.0.5.jar,
+ lib/log4j-1.2.12.jar,
+ lib/neethi-2.0.2.jar,
+ lib/openejb-client-3.1.jar,
+ lib/openejb-core-3.1.jar,
+ lib/openejb-cxf-3.1.jar,
+ lib/openejb-ejbd-3.1.jar,
+ lib/openejb-hsql-3.1.jar,
+ lib/openejb-http-3.1.jar,
+ lib/openejb-javaagent-3.1.jar,
+ lib/openejb-jee-3.1.jar,
+ lib/openejb-loader-3.1.jar,
+ lib/openejb-multicast-3.1.jar,
+ lib/openejb-server-3.1.jar,
+ lib/openejb-telnet-3.1.jar,
+ lib/openejb-webservices-3.1.jar,
+ lib/openjpa-1.1.0.jar,
+ lib/saaj-impl-1.3.jar,
+ lib/serp-1.13.1.jar,
+ lib/slf4j-api-1.3.1.jar,
+ lib/slf4j-jdk14-1.3.1.jar,
+ lib/stax-api-1.0.1.jar,
+ lib/swizzle-stream-1.0.1.jar,
+ lib/wsdl4j-1.6.1.jar,
+ lib/wstx-asl-3.2.0.jar,
+ lib/xbean-naming-3.4.1.jar,
+ lib/xbean-reflect-3.4.1.jar,
+ lib/xml-resolver-1.2.jar,
+ lib/XmlSchema-1.3.2.jar
+
+ -->
+
+
+
<outputDirectory>lib</outputDirectory>
<overWriteSnapshots>
true
</overWriteSnapshots>
<artifactItems>
<artifactItem>
-
<groupId>
-
org.apache.openejb
-
</groupId>
-
<artifactId>
-
plugins-common
-
</artifactId>
-
<version>1.0.2</version>
- </artifactItem>
- <artifactItem>
-
<groupId>
-
com.envoisolutions.sxc
-
</groupId>
-
<artifactId>sxc-jaxb</artifactId>
-
<version>0.7-SNAPSHOT</version>
- </artifactItem>
- <artifactItem>
-
<groupId>
-
com.envoisolutions.sxc
-
</groupId>
-
<artifactId>sxc-runtime</artifactId>
-
<version>0.7-SNAPSHOT</version>
- </artifactItem>
- <artifactItem>
-
<groupId>
-
org.apache.openejb
-
</groupId>
-
<artifactId>openejb-jee</artifactId>
-
<version>3.1-SNAPSHOT</version>
- </artifactItem>
- <artifactItem>
-
<groupId>
-
org.apache.openejb
-
</groupId>
-
<artifactId>
-
openejb-core
-
</artifactId>
-
<version>3.1-SNAPSHOT</version>
- </artifactItem>
- <artifactItem>
-
<groupId>
-
org.apache.openejb
-
</groupId>
-
<artifactId>
-
openejb-loader
-
</artifactId>
-
<version>3.1-SNAPSHOT</version>
- </artifactItem>
- <artifactItem>
-
<groupId>
-
org.apache.openejb
-
</groupId>
-
<artifactId>javaee-api</artifactId>
-
<version>5.0-1</version>
- </artifactItem>
- <artifactItem>
-
<groupId>
-
log4j
-
</groupId>
-
<artifactId>
-
log4j
-
</artifactId>
-
<version>1.2.12</version>
- </artifactItem>
- <artifactItem>
-
<groupId>javax.xml.bind</groupId>
-
<artifactId>jaxb-api</artifactId>
-
<version>2.0</version>
- </artifactItem>
- <artifactItem>
-
<groupId>com.sun.xml.bind</groupId>
-
<artifactId>jaxb-impl</artifactId>
-
<version>2.0.3</version>
- </artifactItem>
- <artifactItem>
-
<groupId>org.codehaus.swizzle</groupId>
-
<artifactId>swizzle-stream</artifactId>
-
<version>1.0.1</version>
+
<groupId></groupId>
+
<artifactId></artifactId>
+
<version></version>
</artifactItem>
</artifactItems>
</configuration>
Modified: openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/pom.xml?rev=745131&r1=745130&r2=745131&view=diff
==============================================================================
--- openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/pom.xml (original)
+++ openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/pom.xml Tue Feb 17
16:13:32 2009
@@ -154,5 +154,6 @@
<module>org.apache.openejb.help.nl2</module>
<module>org.apache.openejb.help.nl2a</module>
<module>org.apache.openejb.help.nlBidi</module>
+ <module>openejb.server</module>
</modules>
</project>
