directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r583220 - in /directory/installers/branches/bigbang: apacheds-noarch/src/main/java/org/apache/directory/server/Service.java pom.xml
Date Tue, 09 Oct 2007 16:46:46 GMT
Author: djencks
Date: Tue Oct  9 09:46:44 2007
New Revision: 583220

URL: http://svn.apache.org/viewvc?rev=583220&view=rev
Log:
fix xbean-spring version, fix which ApplicationContext we will use

Modified:
    directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
    directory/installers/branches/bigbang/pom.xml

Modified: directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java?rev=583220&r1=583219&r2=583220&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
(original)
+++ directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
Tue Oct  9 09:46:44 2007
@@ -24,10 +24,10 @@
 import org.apache.directory.daemon.InstallationLayout;
 import org.apache.directory.server.configuration.ApacheDS;
 import org.apache.directory.server.jndi.ServerContextFactory;
+import org.apache.xbean.spring.context.FileSystemXmlApplicationContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import javax.naming.Context;
 import javax.naming.directory.InitialDirContext;
@@ -57,7 +57,7 @@
         if ( args.length > 0 && new File( args[0] ).exists() ) // hack that takes
server.xml file argument
         {
             LOG.info( "server: loading settings from ", args[0] );
-            ApplicationContext factory = new ClassPathXmlApplicationContext( new File( args[0]
).toURI().toURL().toString() );
+            ApplicationContext factory = new FileSystemXmlApplicationContext( new File( args[0]
).toURI().toURL().toString() );
             apacheDS = ( ApacheDS ) factory.getBean( "apacheDS" );
         }
         else

Modified: directory/installers/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/pom.xml?rev=583220&r1=583219&r2=583220&view=diff
==============================================================================
--- directory/installers/branches/bigbang/pom.xml (original)
+++ directory/installers/branches/bigbang/pom.xml Tue Oct  9 09:46:44 2007
@@ -290,7 +290,7 @@
       <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-spring</artifactId>
-        <version>3.1</version>
+        <version>3.2</version>
       </dependency>
 
       <dependency>



Mime
View raw message