cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [05/10] git commit: updated refs/heads/master to b798c45
Date Tue, 02 Apr 2013 14:27:06 GMT
removing unused commented dependencies

removing the spring related dependencies that were commented out.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e917b1a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e917b1a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e917b1a

Branch: refs/heads/master
Commit: 8e917b1ad3c0d3076b0c6425ea3318a6d6dd5c25
Parents: 009749f
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Tue Mar 5 11:48:16 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue Apr 2 18:31:29 2013 +0530

----------------------------------------------------------------------
 plugins/pom.xml |    3 +-
 pom.xml         |  354 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 215 insertions(+), 142 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e917b1a/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d7e8deb..348ffa2 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -16,7 +16,8 @@
   KIND, either express or implied. See the License for the
   specific language governing permissions and limitations
   under the License.
---><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">
+-->
+<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>
   <artifactId>cloudstack-plugins</artifactId>
   <name>Apache CloudStack Plugin POM</name>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e917b1a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dab3db2..0393d0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,23 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-  license agreements. See the NOTICE file distributed with this work for additional 
-  information regarding copyright ownership. The ASF licenses this file to 
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
-  this file except in compliance with the License. You may obtain a copy of 
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-  by applicable law or agreed to in writing, software distributed under the 
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific 
-  language governing permissions and limitations under the License. -->
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <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/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -26,8 +34,8 @@
   <description>Apache CloudStack is an IaaS (“Infrastracture as a Service”) cloud
orchestration platform.</description>
   <url>http://www.cloudstack.org</url>
   <scm>
-    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</developerConnection>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</developerConnection>
   </scm>
   <issueManagement>
     <system>jira</system>
@@ -35,7 +43,7 @@
   </issueManagement>
 
   <properties>
-    <!--skipTests>true</skipTests -->
+    <!--skipTests>true</skipTests-->
     <cs.jdk.version>1.6</cs.jdk.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
@@ -84,7 +92,6 @@
     <cs.java-ipv6.version>0.10</cs.java-ipv6.version>
     <cs.replace.properties>build/replace.properties</cs.replace.properties>
     <cs.libvirt-java.version>0.4.9</cs.libvirt-java.version>
-    <cs.target.dir>target</cs.target.dir>
   </properties>
 
   <distributionManagement>
@@ -99,49 +106,40 @@
   <mailingLists>
     <mailingList>
       <name>Apache CloudStack User List</name>
-      <subscribe>users-subscribe@cloudstack.apache.org</subscribe>
-      <unsubscribe>users-unsubscribe@cloudstack.apache.org</unsubscribe>
-      <post>users@cloudstack.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/cloudstack-users</archive>
-      <otherArchives>
-        <otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</otherArchive>
-      </otherArchives>
+      <subscribe>cloudstack-users-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>cloudstack-users-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>cloudstack-users@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</archive>
     </mailingList>
     <mailingList>
       <name>Apache CloudStack Developer List</name>
-      <subscribe>dev-subscribe@cloudstack.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@cloudstack.apache.org</unsubscribe>
-      <post>dev@cloudstack.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/cloudstack-dev</archive>
-      <otherArchives>
-        <otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</otherArchive>
-      </otherArchives>
+      <subscribe>cloudstack-dev-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>cloudstack-dev-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>cloudstack-dev@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</archive>
     </mailingList>
     <mailingList>
       <name>Apache CloudStack Commits List</name>
-      <subscribe>commits-subscribe@cloudstack.apache.org</subscribe>
-      <unsubscribe>commits-unsubscribe@cloudstack.apache.org</unsubscribe>
-      <post>commits@cloudstack.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/cloudstack-commits</archive>
-      <otherArchives>
-        <otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</otherArchive>
-      </otherArchives>
+      <subscribe>cloudstack-commits-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>cloudstack-commits-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>cloudstack-commits@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</archive>
     </mailingList>
   </mailingLists>
 
   <developers>
     <developer>
       <name>The Apache CloudStack Team</name>
-      <email>dev@cloudstack.apache.org</email>
-      <url>http://cloudstack.apache.org/</url>
+      <email>cloudstack-dev@incubator.apache.org</email>
+      <url>http://incubator.apache.org/projects/cloudstack.html</url>
       <organization>Apache Software Foundation</organization>
       <organizationUrl>http://apache.org/</organizationUrl>
     </developer>
   </developers>
 
   <ciManagement>
-    <system>Jenkins</system>
-    <url>http://builds.apache.org/</url>
+    <system>Jenkin</system>
+    <url>http://jenkins.cloudstack.org/</url>
   </ciManagement>
 
   <licenses>
@@ -176,11 +174,11 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>mysql</groupId>
-        <artifactId>mysql-connector-java</artifactId>
-        <version>${cs.mysql.version}</version>
-      </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${cs.mysql.version}</version>
+        </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -190,12 +188,12 @@
       <artifactId>junit</artifactId>
       <version>${cs.junit.version}</version>
       <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
+	</dependency>
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-core</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -206,36 +204,18 @@
       <artifactId>spring-web</artifactId>
       <version>${org.springframework.version}</version>
     </dependency>
-    <!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId>

-      <version>${org.springframework.version}</version> </dependency> <dependency>

-      <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId>

-      <version>${org.springframework.version}</version> </dependency> <dependency>

-      <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId>

-      <version>${org.springframework.version}</version> </dependency> <dependency>

-      <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId>

-      <version>${org.springframework.version}</version> </dependency> <dependency>

-      <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>

-      <version>${org.springframework.version}</version> </dependency> <dependency>

-      <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId>

-      <version>${org.springframework.version}</version> </dependency> <dependency>

-      <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId>

-      <version>${org.springframework.version}</version> </dependency> <dependency>

-      <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId>

-      <version>${org.springframework.version}</version> </dependency> <dependency>

-      <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId>

-      <version>${org.springframework.version}</version> </dependency> -->
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${org.springframework.version}</version>
-      <scope>test</scope>
+	<groupId>org.mockito</groupId>
+	<artifactId>mockito-all</artifactId>
+	<version>1.9.5</version>
+        <scope>test</scope>
     </dependency>
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-test</artifactId>
+	  <version>${org.springframework.version}</version>
+	  <scope>test</scope>
+	</dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
@@ -247,19 +227,17 @@
       <version>1.7.1</version>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
     </dependency>
   </dependencies>
 
   <build>
     <defaultGoal>install</defaultGoal>
-    <outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory>
-    <testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory>
     <pluginManagement>
       <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings 
+        <!--This plugin's configuration is used to store Eclipse m2e settings
           only. It has no influence on the Maven build itself. -->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
@@ -282,7 +260,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -340,9 +318,11 @@
               <exclude>dist/console-proxy/js/jquery.js</exclude>
               <exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
               <exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
-              <exclude>tools/appliance/definitions/devcloud/*</exclude>
-              <exclude>tools/appliance/definitions/systemvmtemplate/*</exclude>
-              <exclude>tools/appliance/definitions/systemvmtemplate64/*</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/base.sh</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/cleanup.sh</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/definition.rb</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/preseed.cfg</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/zerodisk.sh</exclude>
               <exclude>tools/cli/cloudmonkey.egg-info/*</exclude>
               <exclude>tools/devcloud/src/deps/boxes/basebox-build/definition.rb</exclude>
               <exclude>tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg</exclude>
@@ -410,41 +390,41 @@
           <configuration>
             <source>${cs.jdk.version}</source>
             <target>${cs.jdk.version}</target>
-            <fork>true</fork>
-            <meminitial>128m</meminitial>
-            <maxmem>512m</maxmem>
-            <compilerArgument>-XDignore.symbol.file=true</compilerArgument>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.4</version>
-          <configuration>
-            <archive>
-              <manifest>
-                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              </manifest>
-            </archive>
+			<fork>true</fork>
+		<meminitial>128m</meminitial>
+		<maxmem>512m</maxmem>
+		<compilerArgument>-XDignore.symbol.file=true</compilerArgument>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.7</version>
-          <executions>
-            <execution>
-              <id>remove-old-installers</id>
-              <goals>
-                <goal>remove-project-artifact</goal>
-              </goals>
-              <configuration>
-                <removeAll>true</removeAll>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <id>remove-old-installers</id>
+            <goals>
+              <goal>remove-project-artifact</goal>
+            </goals>
+            <configuration>
+              <removeAll>true</removeAll>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -472,32 +452,16 @@
       </modules>
     </profile>
     <profile>
-      <id>eclipse</id>
-      <properties>
-        <cs.target.dir>target-eclipse</cs.target.dir>
-      </properties>
-    </profile>
-    <profile> 
       <id>developer</id>
-      <properties>
-        <marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
-      </properties>
+        <properties>
+            <marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
+        </properties>
       <modules>
         <module>developer</module>
         <module>tools</module>
       </modules>
     </profile>
     <profile>
-      <id>impatient</id>
-      <properties>
-        <marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
-      </properties>
-      <modules>
-        <module>developer</module>
-        <!--module>tools/devcloud</module-->
-      </modules>
-    </profile>
-    <profile>
       <id>vmware</id>
       <activation>
         <property>
@@ -508,5 +472,113 @@
         <module>vmware-base</module>
       </modules>
     </profile>
+    <profile>
+          <id>simulator</id>
+          <activation>
+              <property>
+                  <name>deploydb-simulator</name>
+              </property>
+          </activation>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <artifactId>properties-maven-plugin</artifactId>
+                      <version>1.0-alpha-2</version>
+                      <executions>
+                          <execution>
+                              <phase>initialize</phase>
+                              <goals>
+                                  <goal>read-project-properties</goal>
+                              </goals>
+                              <configuration>
+                                  <files>
+                                      <file>${project.basedir}/utils/conf/db.properties</file>
+                                      <file>${project.basedir}/utils/conf/db.properties.override</file>
+                                  </files>
+                                  <quiet>true</quiet>
+                              </configuration>
+                          </execution>
+                      </executions>
+                  </plugin>
+                  <!-- DatabaseCreator driver here -->
+                  <plugin>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <artifactId>exec-maven-plugin</artifactId>
+                      <version>1.2.1</version>
+                      <dependencies>
+                          <!-- specify the dependent jdbc driver here -->
+                          <dependency>
+                              <groupId>mysql</groupId>
+                              <artifactId>mysql-connector-java</artifactId>
+                              <version>${cs.mysql.version}</version>
+                          </dependency>
+                          <dependency>
+                              <groupId>commons-dbcp</groupId>
+                              <artifactId>commons-dbcp</artifactId>
+                              <version>${cs.dbcp.version}</version>
+                          </dependency>
+                          <dependency>
+                              <groupId>commons-pool</groupId>
+                              <artifactId>commons-pool</artifactId>
+                              <version>${cs.pool.version}</version>
+                          </dependency>
+                          <dependency>
+                              <groupId>org.jasypt</groupId>
+                              <artifactId>jasypt</artifactId>
+                              <version>${cs.jasypt.version}</version>
+                          </dependency>
+                          <dependency>
+                              <groupId>org.apache.cloudstack</groupId>
+                              <artifactId>cloud-utils</artifactId>
+                              <version>${project.version}</version>
+                          </dependency>
+                          <dependency>
+                              <groupId>org.apache.cloudstack</groupId>
+                              <artifactId>cloud-server</artifactId>
+                              <version>${project.version}</version>
+                          </dependency>
+                      </dependencies>
+                      <executions>
+                          <execution>
+                              <phase>process-resources</phase>
+                              <id>create-schema</id>
+                              <goals>
+                                  <goal>java</goal>
+                              </goals>
+                          </execution>
+                      </executions>
+                      <configuration>
+                          <includeProjectDependencies>false</includeProjectDependencies>
+                          <includePluginDependencies>true</includePluginDependencies>
+                          <executableDependency>
+                              <groupId>org.apache.cloudstack</groupId>
+                              <artifactId>cloud-server</artifactId>
+                          </executableDependency>
+                          <mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
+                          <arguments>
+                              <!-- db properties file -->
+                              <argument>${project.basedir}/utils/conf/db.properties</argument>
+                              <argument>${project.basedir}/utils/conf/db.properties.override</argument>
+                              <!-- simulator sql files -->
+                              <argument>${basedir}/target/db/create-schema-simulator.sql</argument>
+                              <argument>${basedir}/target/db/templates.simulator.sql</argument>
+                              <!-- database upgrade-->
+                              <argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument>
+                              <argument>--database=simulator</argument>
+                              <argument>--rootpassword=${db.root.password}</argument>
+                              <!-- enable verbosity by -v or dash-dash-verbose -->
+                          </arguments>
+                          <systemProperties>
+                              <systemProperty>
+                                  <key>catalina.home</key>
+                                  <value>${project.basedir}/utils</value>
+                              </systemProperty>
+                          </systemProperties>
+                      </configuration>
+                  </plugin>
+              </plugins>
+          </build>
+      </profile>
   </profiles>
 </project>


Mime
View raw message