etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more change to fix awsapi deployment with maven and jetty and Spring

This commit is contained in:
Prachi Damle 2013-01-30 18:16:45 -08:00
parent 526bb01b04
commit 3c75d53f2f
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awsapi/pom.xml
View File

@ -302,6 +302,9 @@
<resource>
<directory>../utils/conf/</directory>
</resource>
<resource>
<directory>${basedir}/resource/AmazonEC2</directory>
</resource>
</resources>
<plugins>
<plugin>

2
awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
View File

@ -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();

2
awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
View File

@ -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 );
}
}

2
awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
View File

@ -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) {