tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject svn commit: r1200611 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java pom.xml utils/ utils/pom.xml utils/webdeployer/ utils/webdeployer/pom.xml
Date Thu, 10 Nov 2011 22:54:41 GMT
Author: jgallimore
Date: Thu Nov 10 22:54:40 2011
New Revision: 1200611

URL: http://svn.apache.org/viewvc?rev=1200611&view=rev
Log:
TOMEE-37 move deployer to utils. Allow VmDeploymentManager to select a different implementation
of Deployer by specifying a different JNDI name as a system property

Added:
    openejb/trunk/openejb/utils/
    openejb/trunk/openejb/utils/pom.xml
    openejb/trunk/openejb/utils/webdeployer/
      - copied from r1200545, openejb/trunk/sandbox/webdeployer/
Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
    openejb/trunk/openejb/pom.xml
    openejb/trunk/openejb/utils/webdeployer/pom.xml

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java?rev=1200611&r1=1200610&r2=1200611&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
(original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/VmDeploymentManager.java
Thu Nov 10 22:54:40 2011
@@ -103,6 +103,8 @@ public class VmDeploymentManager impleme
     }
 
     private Deployer getDeployer() {
+    	String deployerJndi = System.getProperty("openejb.deployer.jndiname", "openejb/DeployerBusinessRemote");
+    	
         if (deployer == null) {
             try {
                 Properties p = new Properties();
@@ -110,7 +112,7 @@ public class VmDeploymentManager impleme
                 p.put("java.naming.provider.url", openejbUri);
 
                 InitialContext ctx = new InitialContext(p);
-                deployer = (Deployer) ctx.lookup("openejb/DeployerBusinessRemote");
+                deployer = (Deployer) ctx.lookup(deployerJndi);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }

Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1200611&r1=1200610&r2=1200611&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Thu Nov 10 22:54:40 2011
@@ -271,6 +271,7 @@
     <module>assembly</module>
     <module>arquillian-tomee</module>
     <module>tck</module>
+    <module>utils</module>
   </modules>
 
   <profiles>
@@ -284,6 +285,7 @@
         <module>examples</module>
         <module>arquillian-tomee</module>
         <module>assembly</module>
+        <module>utils</module>
       </modules>
       <build>
         <plugins>

Added: openejb/trunk/openejb/utils/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/pom.xml?rev=1200611&view=auto
==============================================================================
--- openejb/trunk/openejb/utils/pom.xml (added)
+++ openejb/trunk/openejb/utils/pom.xml Thu Nov 10 22:54:40 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>openejb</artifactId>
+    <groupId>org.apache.openejb</groupId>
+    <version>4.0.0-beta-2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>utils</artifactId>
+  <packaging>pom</packaging>
+  <name>OpenEJB :: Utils</name>
+
+  <modules>
+    <module>webdeployer</module>
+  </modules>
+</project>

Modified: openejb/trunk/openejb/utils/webdeployer/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/webdeployer/pom.xml?rev=1200611&r1=1200545&r2=1200611&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/webdeployer/pom.xml (original)
+++ openejb/trunk/openejb/utils/webdeployer/pom.xml Thu Nov 10 22:54:40 2011
@@ -23,21 +23,20 @@
   <groupId>org.apache.openejb</groupId>
   <artifactId>webdeployer</artifactId>
   <version>4.0.0-beta-2-SNAPSHOT</version>
+  <name>OpenEJB :: Utils :: TomEE Webapps-based Deployer EJB</name>
+  <parent>
+    <artifactId>utils</artifactId>
+    <groupId>org.apache.openejb</groupId>
+    <version>4.0.0-beta-2-SNAPSHOT</version>
+  </parent>
   <packaging>jar</packaging>
-
-  <name>webdeployer</name>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
   <dependencies>
-  	<dependency>
-  		<groupId>org.apache.openejb</groupId>
-  		<artifactId>tomee-catalina</artifactId>
-  		<version>4.0.0-beta-2-SNAPSHOT</version>
-  		<type>jar</type>
-  		<scope>provided</scope>
-  	</dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>tomee-catalina</artifactId>
+      <version>4.0.0-beta-2-SNAPSHOT</version>
+      <type>jar</type>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>



Mime
View raw message