From fd117f6f7baee0a3f70611c6ef2c9c2fc7e76b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@legacyworlds.com>
Date: Tue, 7 Feb 2012 19:40:57 +0100
Subject: [PATCH] Fixed consequences of Spring config clean-up
* While the server works fine, the tools - which use hardcoded paths to
specific parts of the Spring config - were not updated last time. They
should work now.
---
.../src/main/java/com/deepclone/lw/cli/CreateSuperuser.java | 2 +-
.../src/main/java/com/deepclone/lw/cli/CreateUser.java | 2 +-
.../src/main/java/com/deepclone/lw/cli/ImportBuildables.java | 2 +-
.../src/main/java/com/deepclone/lw/cli/ImportResources.java | 2 +-
.../src/main/java/com/deepclone/lw/cli/ImportTechs.java | 2 +-
.../src/main/java/com/deepclone/lw/cli/ImportText.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/CreateSuperuser.java b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/CreateSuperuser.java
index 4c92d2b..2446ae1 100644
--- a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/CreateSuperuser.java
+++ b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/CreateSuperuser.java
@@ -43,7 +43,7 @@ public class CreateSuperuser
// Load transaction manager bean
String[] cfg = {
- "configuration/transaction-bean.xml"
+ "configuration/transactions.xml"
};
return new ClassPathXmlApplicationContext( cfg , true , ctx );
}
diff --git a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/CreateUser.java b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/CreateUser.java
index 77bc8f5..b418617 100644
--- a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/CreateUser.java
+++ b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/CreateUser.java
@@ -48,7 +48,7 @@ public class CreateUser
// Load transaction manager bean
String[] cfg = {
- "configuration/transaction-bean.xml"
+ "configuration/transactions.xml"
};
return new ClassPathXmlApplicationContext( cfg , true , ctx );
}
diff --git a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportBuildables.java b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportBuildables.java
index ab27ed1..a0f4228 100644
--- a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportBuildables.java
+++ b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportBuildables.java
@@ -163,7 +163,7 @@ public class ImportBuildables
// Load Hibernate bean
String[] cfg = {
- "configuration/context-configuration.xml" , "configuration/transaction-bean.xml"
+ "configuration/transactions.xml"
};
return new ClassPathXmlApplicationContext( cfg , true , ctx );
}
diff --git a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportResources.java b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportResources.java
index b66063b..ab2bb0a 100644
--- a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportResources.java
+++ b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportResources.java
@@ -77,7 +77,7 @@ public class ImportResources
ctx.refresh( );
return new ClassPathXmlApplicationContext( new String[] {
- "configuration/transaction-bean.xml"
+ "configuration/transactions.xml"
} , true , ctx );
}
diff --git a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportTechs.java b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportTechs.java
index cd15b30..bc74f83 100644
--- a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportTechs.java
+++ b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportTechs.java
@@ -121,7 +121,7 @@ public class ImportTechs
// Load beans
String[] cfg = {
- "configuration/context-configuration.xml" , "configuration/transaction-bean.xml"
+ "configuration/transactions.xml"
};
return new ClassPathXmlApplicationContext( cfg , true , ctx );
}
diff --git a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportText.java b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportText.java
index 339182d..3dcf4ef 100644
--- a/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportText.java
+++ b/legacyworlds-server-main/src/main/java/com/deepclone/lw/cli/ImportText.java
@@ -70,7 +70,7 @@ public class ImportText
ctx.refresh( );
return new ClassPathXmlApplicationContext( new String[] {
- "configuration/transaction-bean.xml"
+ "configuration/transactions.xml"
} , true , ctx );
}