Title: [2561] trunk/openejb3: First draft of slightly updated integration
Revision
2561
Author
dblevins
Date
2006-03-16 19:49:34 -0500 (Thu, 16 Mar 2006)

Log Message

First draft of slightly updated integration

Modified Paths


Added Paths

Removed Paths

Diff

Copied: trunk/openejb3/openejb-tomcat (from rev 2557, trunk/openejb3/openejb-assembly) ( => )

Modified: trunk/openejb3/openejb-tomcat/maven.xml
===================================================================
--- trunk/openejb3/openejb-assembly/maven.xml	2006-03-14 21:21:35 UTC (rev 2557)
+++ trunk/openejb3/openejb-tomcat/maven.xml	2006-03-17 00:49:34 UTC (rev 2561)
@@ -153,9 +153,11 @@
 
     <goal name="setup:loader-webapp">
       <!-- Unzip webapp and set openejb.home -->
-      <mkdir dir="${tomcat.home}/webapps/openejb"/>
-      <unjar src="" dest="${tomcat.home}/webapps/openejb"/>
-      <replace file="${tomcat.home}/webapps/openejb/WEB-INF/web.xml" token="@OPENEJB_HOME@" value="${openejb.home}"/>
+      <unjar src="" dest="${tomcat.home}/server/webapps"/>
+      <u:file var="fileAsFile" name="${tomcat.dist}/conf/Catalina/localhost"/>
+      <j:if test="${!(fileAsFile.exists())}">
+        <move file="${tomcat.home}/server/webapps/openejb/openejb.xml" todir="${tomcat.home}/conf/Catalina/localhost"/>
+      </j:if>
     </goal>
 
     <goal name="setup:itests-webapp">

Modified: trunk/openejb3/openejb-tomcat/pom.xml (2557 => 2561)

--- trunk/openejb3/openejb-assembly/pom.xml	2006-03-14 21:21:35 UTC (rev 2557)
+++ trunk/openejb3/openejb-tomcat/pom.xml	2006-03-17 00:49:34 UTC (rev 2561)
@@ -6,10 +6,10 @@
     <version>3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>openejb-assembly</artifactId>
+  <artifactId>openejb-tomcat</artifactId>
   <packaging>jar</packaging>
   <version>3.0-SNAPSHOT</version>
-  <name>OpenEJB :: Assembly</name>
+  <name>OpenEJB :: Assembly :: Tomcat</name>
   <build>
     <plugins>
       <plugin>
@@ -41,15 +41,7 @@
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/bin.xml</descriptor>
-            <descriptor>src/main/assembly/test.xml</descriptor>
           </descriptors>
-          <finalName>openejb-itest-application</finalName>
-          <archive>
-            <manifest>
-              <mainClass>org.openejb.test.Main</mainClass>
-            </manifest>
-          </archive>
-          <finalName>openejb-3.0-SNAPSHOT</finalName>
         </configuration>
       </plugin>
     </plugins>
@@ -57,6 +49,11 @@
   <dependencies>
     <dependency>
       <groupId>org.openejb</groupId>
+      <artifactId>openejb-loader</artifactId>
+      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.openejb</groupId>
       <artifactId>openejb-core</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
@@ -77,15 +74,10 @@
     </dependency>
     <dependency>
       <groupId>org.openejb</groupId>
-      <artifactId>openejb-http</artifactId>
+      <artifactId>openejb-loader</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.openejb</groupId>
-      <artifactId>openejb-telnet</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>

Modified: trunk/openejb3/openejb-tomcat/src/main/assembly/bin.xml (2557 => 2561)

--- trunk/openejb3/openejb-assembly/src/main/assembly/bin.xml	2006-03-14 21:21:35 UTC (rev 2557)
+++ trunk/openejb3/openejb-tomcat/src/main/assembly/bin.xml	2006-03-17 00:49:34 UTC (rev 2561)
@@ -2,56 +2,31 @@
   <id>bin</id>
   <formats>
     <format>tar.gz</format>
-    <!--<format>tar.bz2</format>-->
     <format>zip</format>
   </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-      </includes>
+      <directory>target/classes</directory>
+      <outputDirectory>openejb</outputDirectory>
     </fileSet>
-    <fileSet>
-      <directory>target/classes/</directory>
-      <outputDirectory>bin/</outputDirectory>
-      <includes>
-        <include>*.bat</include>
-      </includes>
-      <fileMode>0755</fileMode>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-    <fileSet>
-      <directory>target/classes/</directory>
-      <outputDirectory>bin/</outputDirectory>
-      <includes>
-        <include>openejb</include>
-      </includes>
-      <lineEnding>unix</lineEnding>
-      <fileMode>0755</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/conf</directory>
-      <outputDirectory>conf/</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/classes/empty</directory>
-      <outputDirectory>logs/</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/classes/empty</directory>
-      <outputDirectory>beans/</outputDirectory>
-    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>lib</outputDirectory>
+      <outputDirectory>openejb/lib</outputDirectory>
       <scope>runtime</scope>
       <excludes>
           <exclude>junit:junit</exclude>
+          <exclude>org.apache.geronimo.specs:geronimo-servlet_2.4_spec</exclude>
       </excludes>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>openejb/WEB-INF/lib</outputDirectory>
+      <scope>runtime</scope>
+      <includes>
+          <include>org.openejb:openejb-loader</include>
+      </includes>
+    </dependencySet>
   </dependencySets>
 </assembly>
 

Deleted: trunk/openejb3/openejb-tomcat/src/main/assembly/test.xml (2557 => 2561)

--- trunk/openejb3/openejb-assembly/src/main/assembly/test.xml	2006-03-14 21:21:35 UTC (rev 2557)
+++ trunk/openejb3/openejb-tomcat/src/main/assembly/test.xml	2006-03-17 00:49:34 UTC (rev 2561)
@@ -1,22 +0,0 @@
-<assembly>
-  <id>test</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <unpack>true</unpack>
-      <includes>
-          <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
-          <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
-          <include>junit:junit</include>
-          <include>org.openejb:openejb-itests</include>
-          <include>org.openejb:openejb-client</include>
-      </includes>
-      <scope>test</scope>
-    </dependencySet>
-  </dependencySets>
-</assembly>
-

Added: trunk/openejb3/openejb-tomcat/src/main/resources/WEB-INF/web.xml (2557 => 2561)

--- trunk/openejb3/openejb-assembly/src/main/resources/WEB-INF/web.xml	2006-03-14 21:21:35 UTC (rev 2557)
+++ trunk/openejb3/openejb-tomcat/src/main/resources/WEB-INF/web.xml	2006-03-17 00:49:34 UTC (rev 2561)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+  <display-name>OpenEJB Loader Application</display-name>
+
+  <servlet>
+    <servlet-name>loader</servlet-name>
+    <servlet-class>org.openejb.loader.LoaderServlet</servlet-class>
+
+    <init-param>
+        <param-name>openejb.loader</param-name>
+        <param-value>tomcat-system</param-value>
+    </init-param>
+
+    <load-on-startup>0</load-on-startup>
+
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>loader</servlet-name>
+    <url-pattern>/*</url-pattern>
+  </servlet-mapping>
+
+</web-app>

Deleted: trunk/openejb3/openejb-tomcat/src/main/resources/openejb (2557 => 2561)

--- trunk/openejb3/openejb-assembly/src/main/resources/openejb	2006-03-14 21:21:35 UTC (rev 2557)
+++ trunk/openejb3/openejb-tomcat/src/main/resources/openejb	2006-03-17 00:49:34 UTC (rev 2561)
@@ -1,189 +0,0 @@
-#!/bin/sh
-#============================================================
-#   Control script for OpenEJB
-#   --------------------------
-#    
-#   This script is the central entry point to 
-#   all of OpenEJB's functions.
-#  
-#   Contributed by:
-#
-#    - David Blevins <[EMAIL PROTECTED]>
-#    - Daniel S. Haischt <[EMAIL PROTECTED]>
-#             
-#               
-# ___________________________________________________________
-# $Id: openejb,v 1.6 2005/10/11 17:18:58 jcscoobyrs Exp $
-#============================================================
-
-cygwin=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-esac
-
-if [ -z "$OPENEJB_HOME" -o ! -d "$OPENEJB_HOME" ] ; then
-  # find OpenEJB
-  if [ -d /opt/openejb ] ; then
-    OPENEJB_HOME=/opt/openejb
-  fi
-
-  if [ -d "${HOME}/opt/openejb" ] ; then
-    OPENEJB_HOME="${HOME}/opt/openejb"
-  fi
-
-  ## resolve links - $0 may be a link to openejb's home
-  PRG="$0"
-  progname=`basename "$0"`
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG=`dirname "$PRG"`"/$link"
-    fi
-  done
-
-
-  OPENEJB_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  OPENEJB_HOME=`cd "$OPENEJB_HOME" && pwd`
-fi
-
-if $cygwin; then
-  OPENEJB_HOME=`cygpath --path --windows "$OPENEJB_HOME"`
-fi
-
-echo OPENEJB_HOME = $OPENEJB_HOME
-
-OPTIONS="-Dopenejb.home=$OPENEJB_HOME"
-
-#============================================================
-_command_help()
-{
-    case $2 in
-        "validate")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar validate --help
-        ;;
-        "deploy")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar deploy --help
-        ;;
-        "start")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar start --help
-        ;;
-        "stop")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar stop --help
-        ;;
-        "test")
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test --help
-        ;;
-        *)
-            java -jar $OPENEJB_HOME/lib/openejb-core-*.jar
-        ;;
-    esac
-}
-#============================================================
-_command_deploy()
-{
-   shift
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar deploy $@
-}
-#============================================================
-_command_validate()
-{
-   shift
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar validate $@
-}
-#============================================================
-_command_start()
-{
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar start $@
-}
-#============================================================
-_command_stop()
-{
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar stop $@
-}
-#============================================================
-_test_intravm()
-{
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test local
-}
-#============================================================
-_test_server()
-{
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test remote
-}
-#============================================================
-_command_test()
-{
-case $2 in
-    "local")
-        _test_intravm
-    ;;
-    "remote")
-        _test_server
-    ;;
-    "--help")
-        _test_help
-    ;;
-    *)
-        _test_noargs
-    ;;
-esac
-}
-#============================================================
-_test_help()
-{
-   java -jar $OPENEJB_HOME/lib/openejb-core-*.jar test --help
-}
-#============================================================
-_test_noargs()
-{
-   _test_intravm
-   _test_server
-}
-#============================================================
-case $1 in
-    "build")
-        _command_build $@
-    ;;
-    "test")
-        _command_test $@
-    ;;
-    "validate")
-        _command_validate $@
-    ;;
-    "deploy")
-        _command_deploy $@
-    ;;
-    "start")
-        _command_start $@
-    ;;
-    "stop")
-        _command_stop $@
-    ;;
-    "corba")
-        _start_corba $@
-    ;;
-    "create_stubs")
-        _create_stubs $@
-    ;;
-    "help")
-        _command_help $@
-    ;;
-    "-help")
-        _command_help $@
-    ;;
-    "--help")
-        _command_help $@
-    ;;
-    *)  _command_help $@
-    ;;
-esac
-
-
-

Deleted: trunk/openejb3/openejb-tomcat/src/main/resources/openejb.bat (2557 => 2561)

--- trunk/openejb3/openejb-assembly/src/main/resources/openejb.bat	2006-03-14 21:21:35 UTC (rev 2557)
+++ trunk/openejb3/openejb-tomcat/src/main/resources/openejb.bat	2006-03-17 00:49:34 UTC (rev 2561)
@@ -1,134 +0,0 @@
[EMAIL PROTECTED] off
-REM================================================
-REM   Control script for OpenEJB
-REM   --------------------------
-REM    
-REM   This script is the central entry point to 
-REM   all of OpenEJB's functions.
-REM  
-REM   Tested on Windows 2000
-REM
-REM
-REM   Created by David Blevins 
-REM             <[EMAIL PROTECTED]>
-REM _______________________________________________
-REM $Id: openejb.bat,v 1.4 2005/10/11 17:18:58 jcscoobyrs Exp $
-REM================================================
-
-SETLOCAL
-
-rem find OPENEJB_HOME if it does not exist due to either an invalid value passed
-rem by the user or the %0 problem on Windows 9x
-if exist "%OPENEJB_HOME%\lib\openejb-core-*.jar" goto openejbHomeSet
-
-:noOpenEJBHome
-echo OPENEJB_HOME is set incorrectly or OpenEJB could not be located. Please set OPENEJB_HOME.
-goto EOF
-
-:openejbHomeSet
-set OPTIONS=-Dopenejb.home=%OPENEJB_HOME%
-
-set P1=_%1
-set P2=_%2
-
-if /I %P1% EQU _TEST         goto TEST
-if /I %P1% EQU _VALIDATE     goto VALIDATE 
-if /I %P1% EQU _DEPLOY       goto DEPLOY 
-if /I %P1% EQU _START        goto START_SERVER
-if /I %P1% EQU _STOP         goto STOP_SERVER
-
-echo Unknown option: %1
-goto HELP
-
-goto EOF
-REM================================================
-:HELP
-   
-	java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar
-
-goto EOF
-REM================================================
-:TEST
-   if /I %P2% EQU _LOCAL     goto TEST_INTRAVM
-   if /I %P2% EQU _REMOTE    goto TEST_SERVER
-   if /I %P2% EQU _--HELP    goto HELP_TEST
-   if /I %P2% EQU _          goto TEST_NOARGS
-
-   echo Unknown option: %2
-   goto HELP_TEST                                   
-
-goto EOF
-REM================================================
-:VALIDATE 
-   shift
-   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar validate %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-goto EOF
-REM================================================
-:DEPLOY 
-   shift
-   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar deploy %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-goto EOF
-REM================================================
-:START_SERVER
-   shift
-   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar start %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-goto EOF
-REM================================================
-:STOP_SERVER
-   shift
-   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar stop %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-goto EOF
-REM================================================
-:TEST_NOARGS
-   goto TEST_INTRAVM
-goto EOF
-REM================================================
-:TEST_INTRAVM
-
-   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar test local
-         
-if /I %P2% EQU _ goto TEST_SERVER
-goto EOF
-REM================================================
-:TEST_SERVER
-
-   java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar test remote
-   
-goto EOF
-REM================================================
-:HELP_TEST
-   
-	java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar test --help
-
-goto EOF
-REM================================================
-:HELP_DEPLOY
-   
-	java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar deploy --help
-	
-goto EOF
-REM================================================
-:HELP_VALIDATE
-   
-	java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar validate --help
-
-goto EOF
-REM================================================
-:HELP_START
-   
-	java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar start --help
-
-goto EOF
-REM================================================
-:HELP_STOP
-   
-	java -jar %OPENEJB_HOME%/lib/[EMAIL PROTECTED]@.jar stop --help
-
-goto EOF
-
-:EOF
-ENDLOCAL

Deleted: trunk/openejb3/openejb-tomcat/src/main/resources/openejb.conf (2557 => 2561)

--- trunk/openejb3/openejb-assembly/src/main/resources/openejb.conf	2006-03-14 21:21:35 UTC (rev 2557)
+++ trunk/openejb3/openejb-tomcat/src/main/resources/openejb.conf	2006-03-17 00:49:34 UTC (rev 2561)
@@ -1,207 +0,0 @@
-<openejb>
-
-<Container id="Default CMP Container" ctype="CMP_ENTITY">
-#
-#  The default size of the method ready bean pools. 
-#  Every bean class gets its own pool of this size.
-#
-
-    PoolSize 100
-
-#  The name of the database.xml file that is used for global or 
-#  container managed transactions.  This will be used when the 
-#  TransactionManager is managing the transaction, such as when 
-#  the tx attribute is Supports (client has tx), RequiresNew, 
-#  Required or Manditory.
-#  
-#  Specifies the configuration for obtaining database connections
-#  and the mapping.xml schema which describes how beans map to 
-#  the database.
-#
-
-    Global_TX_Database  conf/default.cmp_global_tx_database.xml
-    
-#  The name of the database.xml file that is used for local or 
-#  unspecified transaction contexts.  This will be used when 
-#  the TransactionManager is not managing the transaction, such 
-#  as when the tx attribute is Supports (no client tx), 
-#  NotSupported, or Never.
-#  
-#  Specifies the configuration for obtaining database connections 
-#  and the mapping.xml schema which describes how beans map to 
-#  the database.
-#
-
-    Local_TX_Database   conf/default.cmp_local_tx_database.xml
-
-</Container>
-
-
-
-<!--
-<Container id="InstantDB CMP Container" ctype="CMP_ENTITY">
-    # InstantDB example
-    Global_TX_Database  conf/instantdb.cmp.global-database.xml
-    Local_TX_Database   conf/instantdb.cmp.local-database.xml
-</Container>
--->
-
-
-
-<!--   
-<Container id="PostgreSQL CMP Container" ctype="CMP_ENTITY">
-    # PostgreSQL example
-    Global_TX_Database  conf/postgresql.cmp.global-database.xml
-    Local_TX_Database   conf/postgresql.cmp.local-database.xml
-</Container>
--->
-
-
-
-<Container id="Default BMP Container" ctype="BMP_ENTITY">
-#  --------------------------------------------------------------
-#  The Default BMP Container has no customizable properties to  
-#  override.                                             
-#  --------------------------------------------------------------
-</Container>
-
-
-
-<Container id="Default Stateful Container" ctype="STATEFUL">
-#  The passivator is responsible for writing beans to disk 
-#  at passivation time. Different passivators can be used 
-#  by setting this property to the fully qualified class name
-#  of the PassivationStrategy implementation. The passivator
-#  is not responsible for invoking any callbacks or other 
-#  processing, its only responsibly is to write the bean state
-#  to disk.
-#
-#  Known implementations:
-#     org.openejb.core.stateful.RAFPassivater
-#     org.openejb.core.stateful.SimplePassivater
-
-    Passivator   org.openejb.core.stateful.SimplePassivater
-    
-#  Specifies the time to wait between invocations. This 
-#  value is measured in minutes.  A value of 5 would 
-#  result in a time-out of 5 minutes between invocations.
-
-    TimeOut  20
-
-#  Specifies the size of the bean pools for this 
-#  stateful SessionBean container.
-
-    PoolSize  100
-
-#  Property name that specifies the number of instances
-#  to passivate at one time when doing bulk passivation.
-#  Must be less than the PoolSize.
-
-    BulkPassivate  50
-
-</Container>    
-
-
-
-<Container id="Default Stateless Container" ctype="STATELESS">
-#  Specifies the time to wait between invocations. This 
-#  value is measured in milliseconds.  A value of 5 would 
-#  result in a time-out of 5 milliseconds between invocations.
-#  A value of zero would mean no timeout.
-
-    TimeOut  0
-   
-#  Specifies the size of the bean pools for this 
-#  stateless SessionBean container.
-
-    PoolSize  10
-
-#  StrictPooling tells the container what to do when the pool 
-#  reaches it's maximum size and there are incoming requests
-#  that need instances.
-#
-#  With strict pooling, requests will have to wait for instances
-#  to become available.  The pool size will never grow beyond the  
-#  the set PoolSize value.
-#  
-#  Without strict pooling, the container will create temporary 
-#  instances to meet demand.  The instances will last for just one
-#  method invocation and then are removed.
-
-    StrictPooling  true
-
-</Container>
-
-<Connector id="Default JDBC Database" />
-
-<!-- 
-<Connector id="InstantDB Database">            
-    #  InstantDB example
-    #
-    #  This connector does work as is, the drivers are shipped
-    #  with every OpenEJB distribution and should be in the 
-    #  OPENEJB_HOME/lib directory.
-    #
-    #  Information on InstantDB can be found at:
-    #  http://www.openejb.org/InstantDB/docs/
-    
-    JdbcDriver   org.enhydra.instantdb.jdbc.idbDriver
-    JdbcUrl      jdbc:idb:conf/default.idb_database.conf
-    UserName     Admin
-    Password     pass
-</Connector>
--->
-
-<!-- 
-<Connector id="MySQL Database">            
-    #  MySQL example
-    #
-    #  This connector will not work until you download the driver at:
-    #  http://www.mysql.com/downloads/api-jdbc-stable.html
-    
-    JdbcDriver  com.mysql.jdbc.Driver
-    JdbcUrl     jdbc:mysql://localhost/test
-    UserName    test
-</Connector>
--->
-
-<!-- 
-<Connector id="Oracle Database">            
-    #  Oracle example
-    #
-    #  This connector will not work until you download the driver at:
-    #  http://otn.oracle.com/software/tech/java/sqlj_jdbc/content.html
-    JdbcDriver  com.mysql.jdbc.Driver
-    JdbcUrl     jdbc:oracle:thin:@localhost:1521:orcl
-    UserName    scott
-    Password    tiger
-</Connector>
--->
-
-<!-- 
-<Connector id="PostgreSQL Database">            
-    #  PostgreSQL example
-    #
-    #  This connector will not work until you download the driver at:
-    #  http://jdbc.postgresql.org/download.html
-    JdbcDriver   org.postgresql.Driver
-    JdbcUrl      jdbc:postgresql://localhost/test
-    UserName     postgres
-    Password     pass
-</Connector>
--->
-
-<!--
-#
-#  A registry listing of all the jars
-#  deployed with OpenEJB.
-#
-#  Jars in this path must contain an 
-#  openejb-jar.xml in the jar to be loaded
-#  
-#  You can create this file yourself or
-#  use the deploy tool.
--->
-<Deployments dir="beans/" />
-
-</openejb>

Added: trunk/openejb3/openejb-tomcat/src/main/resources/openejb.xml (2557 => 2561)

--- trunk/openejb3/openejb-assembly/src/main/resources/openejb.xml	2006-03-14 21:21:35 UTC (rev 2557)
+++ trunk/openejb3/openejb-tomcat/src/main/resources/openejb.xml	2006-03-17 00:49:34 UTC (rev 2561)
@@ -0,0 +1,4 @@
+<Context docBase="${catalina.home}/server/webapps/openejb"
+         privileged="false" antiResourceLocking="false" antiJARLocking="false">
+
+</Context>

Reply via email to