svn commit: r501322 - in /incubator/openejb/trunk/openejb3: assembly/openejb-standalone/try.sh server/openejb-server/src/main/java/org/apache/openejb/server/Main.java server/openejb-server/src/main/java/org/apache/openejb/server/Server.java

[db...@apache.org]

Author: dblevins
Date: Mon Jan 29 22:31:49 2007
New Revision: 501322

URL: http://svn.apache.org/viewvc?view=rev&rev=501322
Log:
fixes to get the server to boot after dain's spring changes a week or so ago

Modified:
    incubator/openejb/trunk/openejb3/assembly/openejb-standalone/try.sh
    incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
    incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/try.sh
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/try.sh?view=diff&rev=501322&r1=501321&r2=501322
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/try.sh (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/try.sh Mon Jan 29 22:31:49 2007
@@ -15,6 +15,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+cd "$(dirname "$0")"
+
 JAR=$PWD/../../itests/openejb-itests-app/target/openejb-itests-app-3.0-incubating-SNAPSHOT.ear
 
 cd target/

Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java?view=diff&rev=501322&r1=501321&r2=501322
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java Mon Jan 29 22:31:49 2007
@@ -113,7 +113,7 @@
             }
         }
 
-        props.setProperty("org/openejb/configuration_factory", "org.apache.openejb.alt.config.ConfigurationFactory");
+        props.setProperty("org/openejb/configuration_factory", "org.apache.openejb.config.ConfigurationFactory");
 
         return props;
     }

Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java?view=diff&rev=501322&r1=501321&r2=501322
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java Mon Jan 29 22:31:49 2007
@@ -51,12 +51,15 @@
     public void init(java.util.Properties props) throws Exception {
         this.props = props;
 
-        OpenEJB.init(propertiesService.getProperties(), new ServerFederation());
+        OpenEJB.init(props, new ServerFederation());
 
         if (System.getProperty("openejb.nobanner") == null) {
             System.out.println("[init] OpenEJB Remote Server");
         }
 
+        if (manager == null){
+            manager = ServiceManager.getManager();
+        }
         manager.init();
     }