You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/12/08 00:21:42 UTC
[1/4] git commit: Figured out how to add annotations to jackson
Updated Branches:
refs/heads/javelin 9375ea0bb -> 57c9b4c6b
Figured out how to add annotations to jackson
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/57c9b4c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/57c9b4c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/57c9b4c6
Branch: refs/heads/javelin
Commit: 57c9b4c6b1456e4112829e6857e2079ce900042b
Parents: bdb5be6
Author: Alex Huang <al...@citrix.com>
Authored: Fri Dec 7 15:21:04 2012 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Fri Dec 7 15:21:22 2012 -0800
----------------------------------------------------------------------
framework/pom.xml | 3 +-
framework/rest/pom.xml | 44 +++++++
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 94 +++++++-------
3 files changed, 92 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/57c9b4c6/framework/pom.xml
----------------------------------------------------------------------
diff --git a/framework/pom.xml b/framework/pom.xml
index fcb4096..ca2a4f3 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -28,10 +28,9 @@
</parent>
<build>
<defaultGoal>install</defaultGoal>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
</build>
<modules>
<module>ipc</module>
+ <module>rest</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/57c9b4c6/framework/rest/pom.xml
----------------------------------------------------------------------
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
new file mode 100644
index 0000000..dc2a580
--- /dev/null
+++ b/framework/rest/pom.xml
@@ -0,0 +1,44 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloudstack-framework</artifactId>
+ <version>4.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>cloud-framework-rest</artifactId>
+ <name>CloudStack Framework for Providing REST</name>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/57c9b4c6/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
index 5067f39..90f9e17 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
@@ -26,58 +26,58 @@ import java.sql.Connection;
*/
public class Upgrade40to41 extends Upgrade30xBase implements DbUpgrade {
- /**
- *
- */
- public Upgrade40to41() {
- // TODO Auto-generated constructor stub
- }
+ /**
+ *
+ */
+ public Upgrade40to41() {
+ // TODO Auto-generated constructor stub
+ }
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradableVersionRange()
- */
- @Override
- public String[] getUpgradableVersionRange() {
- return new String[] { "4.0.0", "4.1.0" };
- }
+ /* (non-Javadoc)
+ * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradableVersionRange()
+ */
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] { "4.0.0", "4.1.0" };
+ }
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradedVersion()
- */
- @Override
- public String getUpgradedVersion() {
- return "4.1.0";
- }
+ /* (non-Javadoc)
+ * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradedVersion()
+ */
+ @Override
+ public String getUpgradedVersion() {
+ return "4.1.0";
+ }
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#supportsRollingUpgrade()
- */
- @Override
- public boolean supportsRollingUpgrade() {
- return false;
- }
+ /* (non-Javadoc)
+ * @see com.cloud.upgrade.dao.DbUpgrade#supportsRollingUpgrade()
+ */
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#getPrepareScripts()
- */
- @Override
- public File[] getPrepareScripts() {
- return new File[0];
- }
+ /* (non-Javadoc)
+ * @see com.cloud.upgrade.dao.DbUpgrade#getPrepareScripts()
+ */
+ @Override
+ public File[] getPrepareScripts() {
+ return new File[0];
+ }
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#performDataMigration(java.sql.Connection)
- */
- @Override
- public void performDataMigration(Connection conn) {
- }
+ /* (non-Javadoc)
+ * @see com.cloud.upgrade.dao.DbUpgrade#performDataMigration(java.sql.Connection)
+ */
+ @Override
+ public void performDataMigration(Connection conn) {
+ }
- /* (non-Javadoc)
- * @see com.cloud.upgrade.dao.DbUpgrade#getCleanupScripts()
- */
- @Override
- public File[] getCleanupScripts() {
- return new File[0];
- }
+ /* (non-Javadoc)
+ * @see com.cloud.upgrade.dao.DbUpgrade#getCleanupScripts()
+ */
+ @Override
+ public File[] getCleanupScripts() {
+ return new File[0];
+ }
}