Updated Branches: refs/heads/4.1 53e58f050 -> 5d8883fde
CLOUDSTACK-1450. AWSAPI server fails to start. Missing annotation @Component in CloudStackUserDao implementation Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5d8883fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5d8883fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5d8883fd Branch: refs/heads/4.1 Commit: 5d8883fde7ea213731709b2813ad2180ff98c596 Parents: 53e58f0 Author: Likitha Shetty <[email protected]> Authored: Fri Mar 1 15:23:39 2013 +0530 Committer: Chip Childers <[email protected]> Committed: Fri Mar 1 09:52:28 2013 -0500 ---------------------------------------------------------------------- .../bridge/persist/dao/CloudStackUserDaoImpl.java | 2 ++ client/tomcatconf/components.xml.in | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5d8883fd/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java index 0613519..f108a20 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java @@ -20,6 +20,7 @@ import javax.ejb.Local; import org.apache.log4j.Logger; import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; +import org.springframework.stereotype.Component; import com.cloud.bridge.model.CloudStackUserVO; import com.cloud.bridge.util.EncryptionSecretKeyCheckerUtil; @@ -28,6 +29,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={CloudStackUserDao.class}) public class CloudStackUserDaoImpl extends GenericDaoBase<CloudStackUserVO, String> implements CloudStackUserDao { public static final Logger logger = Logger.getLogger(CloudStackUserDaoImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5d8883fd/client/tomcatconf/components.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in index c62abe8..d94eac6 100755 --- a/client/tomcatconf/components.xml.in +++ b/client/tomcatconf/components.xml.in @@ -286,6 +286,7 @@ under the License. <dao name="CloudStackSvcOfferingDao" class="com.cloud.bridge.persist.dao.CloudStackSvcOfferingDaoImpl" singleton="false"/> <dao name="OfferingDao" class="com.cloud.bridge.persist.dao.OfferingDaoImpl" singleton="false"/> <dao name="CloudStackAccountDao" class="com.cloud.bridge.persist.dao.CloudStackAccountDaoImpl" singleton="false"/> + <dao name="CloudStackUserDao" class="com.cloud.bridge.persist.dao.CloudStackUserDaoImpl" singleton="false"/> </awsapi-ec2server> <awsapi-s3server class="com.cloud.bridge.service.S3RestServlet">
