more change to fix awsapi deployment with maven and jetty and Spring
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3c75d53f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3c75d53f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3c75d53f Branch: refs/heads/master Commit: 3c75d53f2fef5c78876bbd76f018c411f916c148 Parents: 526bb01 Author: Prachi Damle <[email protected]> Authored: Wed Jan 30 18:16:45 2013 -0800 Committer: Prachi Damle <[email protected]> Committed: Wed Jan 30 18:16:45 2013 -0800 ---------------------------------------------------------------------- awsapi/pom.xml | 3 +++ .../dao/CloudStackConfigurationDaoImpl.java | 2 +- .../com/cloud/bridge/service/EC2RestServlet.java | 2 +- .../service/controller/s3/ServiceProvider.java | 2 -- 4 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3c75d53f/awsapi/pom.xml ---------------------------------------------------------------------- diff --git a/awsapi/pom.xml b/awsapi/pom.xml index c040379..5a0ad7b 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -302,6 +302,9 @@ <resource> <directory>../utils/conf/</directory> </resource> + <resource> + <directory>${basedir}/resource/AmazonEC2</directory> + </resource> </resources> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3c75d53f/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java index e770611..6770a9c 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java @@ -42,7 +42,7 @@ public class CloudStackConfigurationDaoImpl extends GenericDaoBase<CloudStackCon @DB public String getConfigValue(String name) { NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.EQ); - Transaction txn = Transaction.currentTxn(); + Transaction txn = Transaction.open("cloud", Transaction.CLOUD_DB, true); try { txn.start(); SearchCriteria<CloudStackConfigurationVO> sc = NameSearch.create(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3c75d53f/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java index 67028f8..15df24e 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java +++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java @@ -199,7 +199,7 @@ public class EC2RestServlet extends HttpServlet { if (installedPath == null) installedPath = System.getProperty("catalina.home"); String webappPath = config.getServletContext().getRealPath("/"); //pathToKeystore = new String( installedPath + File.separator + "webapps" + File.separator + webappName + File.separator + "WEB-INF" + File.separator + "classes" + File.separator + keystore ); - pathToKeystore = new String( webappPath + "WEB-INF" + File.separator + "classes" + File.separator + keystore ); + pathToKeystore = new String( webappPath + File.separator + "\\WEB-INF" + File.separator + "classes" + File.separator + keystore ); } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3c75d53f/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java index 593e849..0f98518 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java @@ -206,8 +206,6 @@ public class ServiceProvider extends ManagerBase { if(logger.isInfoEnabled()) logger.info("Initializing ServiceProvider..."); - Transaction txn = Transaction.open(Transaction.AWSAPI_DB); - //txn.close(); File file = ConfigurationHelper.findConfigurationFile("log4j-cloud.xml"); if(file != null) {
