apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Separate out the target directories for eclipse and the one for regular builds

Browse Source
This commit is contained in:
Alex Huang 2013-03-13 20:08:24 -07:00
parent 1079d63b6f
commit 01151331f5
2 changed files with 219 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -59,6 +59,7 @@ tools/cli/build/
*.iso *.iso
*.tar.gz *.tar.gz
*.tgz *.tgz
target-eclipse
awsapi/modules/* awsapi/modules/*
!.gitignore !.gitignore
.classpath .classpath

462
pom.xml
View File

@ -1,23 +1,15 @@
<!-- <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
Licensed to the Apache Software Foundation (ASF) under one license agreements. See the NOTICE file distributed with this work for additional
or more contributor license agreements. See the NOTICE file information regarding copyright ownership. The ASF licenses this file to
distributed with this work for additional information you under the Apache License, Version 2.0 (the "License"); you may not use
regarding copyright ownership. The ASF licenses this file this file except in compliance with the License. You may obtain a copy of
to you under the Apache License, Version 2.0 (the the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
"License"); you may not use this file except in compliance by applicable law or agreed to in writing, software distributed under the
with the License. You may obtain a copy of the License at 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
http://www.apache.org/licenses/LICENSE-2.0 language governing permissions and limitations under the License. -->
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" <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -43,7 +35,7 @@
</issueManagement> </issueManagement>
<properties> <properties>
<!--skipTests>true</skipTests--> <!--skipTests>true</skipTests -->
<cs.jdk.version>1.6</cs.jdk.version> <cs.jdk.version>1.6</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -92,6 +84,7 @@
<cs.java-ipv6.version>0.10</cs.java-ipv6.version> <cs.java-ipv6.version>0.10</cs.java-ipv6.version>
<cs.replace.properties>build/replace.properties</cs.replace.properties> <cs.replace.properties>build/replace.properties</cs.replace.properties>
<cs.libvirt-java.version>0.4.9</cs.libvirt-java.version> <cs.libvirt-java.version>0.4.9</cs.libvirt-java.version>
<cs.target.dir>target</cs.target.dir>
</properties> </properties>
<distributionManagement> <distributionManagement>
@ -174,11 +167,11 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version> <version>${cs.mysql.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -188,13 +181,13 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${cs.junit.version}</version> <version>${cs.junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
@ -205,74 +198,37 @@
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
</dependency> </dependency>
<!-- <!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId>
<dependency> <version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId>
<artifactId>spring-expression</artifactId> <version>${org.springframework.version}</version> </dependency> <dependency>
<version>${org.springframework.version}</version> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId>
</dependency> <version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId>
<dependency> <version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>
<artifactId>spring-beans</artifactId> <version>${org.springframework.version}</version> </dependency> <dependency>
<version>${org.springframework.version}</version> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId>
</dependency> <version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId>
<dependency> <version>${org.springframework.version}</version> </dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId>
<artifactId>spring-aop</artifactId> <version>${org.springframework.version}</version> </dependency> <dependency>
<version>${org.springframework.version}</version> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId>
</dependency> <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> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<version>1.9.5</version> <version>1.9.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
@ -285,17 +241,19 @@
<version>1.7.1</version> <version>1.7.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
<version>1</version> <version>1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory>
<testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory>
<pluginManagement> <pluginManagement>
<plugins> <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. --> only. It has no influence on the Maven build itself. -->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
@ -453,41 +411,41 @@
<configuration> <configuration>
<source>${cs.jdk.version}</source> <source>${cs.jdk.version}</source>
<target>${cs.jdk.version}</target> <target>${cs.jdk.version}</target>
<fork>true</fork> <fork>true</fork>
<meminitial>128m</meminitial> <meminitial>128m</meminitial>
<maxmem>512m</maxmem> <maxmem>512m</maxmem>
<compilerArgument>-XDignore.symbol.file=true</compilerArgument> <compilerArgument>-XDignore.symbol.file=true</compilerArgument>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version> <version>2.4</version>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries> <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version> <version>1.7</version>
<executions> <executions>
<execution> <execution>
<id>remove-old-installers</id> <id>remove-old-installers</id>
<goals> <goals>
<goal>remove-project-artifact</goal> <goal>remove-project-artifact</goal>
</goals> </goals>
<configuration> <configuration>
<removeAll>true</removeAll> <removeAll>true</removeAll>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
@ -515,15 +473,31 @@
</modules> </modules>
</profile> </profile>
<profile> <profile>
<id>eclipse</id>
<properties>
<cs.target.dir>target-eclipse</cs.target.dir>
</properties>
</profile>
<profile>
<id>developer</id> <id>developer</id>
<properties> <properties>
<marvin.config>tools/devcloud/devcloud.cfg</marvin.config> <marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
</properties> </properties>
<modules> <modules>
<module>developer</module> <module>developer</module>
<module>tools</module> <module>tools</module>
</modules> </modules>
</profile> </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> <profile>
<id>vmware</id> <id>vmware</id>
<activation> <activation>
@ -536,112 +510,112 @@
</modules> </modules>
</profile> </profile>
<profile> <profile>
<id>simulator</id> <id>simulator</id>
<activation> <activation>
<property> <property>
<name>deploydb-simulator</name> <name>deploydb-simulator</name>
</property> </property>
</activation> </activation>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId> <artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version> <version>1.0-alpha-2</version>
<executions> <executions>
<execution> <execution>
<phase>initialize</phase> <phase>initialize</phase>
<goals> <goals>
<goal>read-project-properties</goal> <goal>read-project-properties</goal>
</goals> </goals>
<configuration> <configuration>
<files> <files>
<file>${project.basedir}/utils/conf/db.properties</file> <file>${project.basedir}/utils/conf/db.properties</file>
<file>${project.basedir}/utils/conf/db.properties.override</file> <file>${project.basedir}/utils/conf/db.properties.override</file>
</files> </files>
<quiet>true</quiet> <quiet>true</quiet>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- DatabaseCreator driver here --> <!-- DatabaseCreator driver here -->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version> <version>1.2.1</version>
<dependencies> <dependencies>
<!-- specify the dependent jdbc driver here --> <!-- specify the dependent jdbc driver here -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version> <version>${cs.mysql.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-dbcp</groupId> <groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId> <artifactId>commons-dbcp</artifactId>
<version>${cs.dbcp.version}</version> <version>${cs.dbcp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-pool</groupId> <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<version>${cs.pool.version}</version> <version>${cs.pool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jasypt</groupId> <groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId> <artifactId>jasypt</artifactId>
<version>${cs.jasypt.version}</version> <version>${cs.jasypt.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-utils</artifactId> <artifactId>cloud-utils</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-server</artifactId> <artifactId>cloud-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
<execution> <execution>
<phase>process-resources</phase> <phase>process-resources</phase>
<id>create-schema</id> <id>create-schema</id>
<goals> <goals>
<goal>java</goal> <goal>java</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<includeProjectDependencies>false</includeProjectDependencies> <includeProjectDependencies>false</includeProjectDependencies>
<includePluginDependencies>true</includePluginDependencies> <includePluginDependencies>true</includePluginDependencies>
<executableDependency> <executableDependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-server</artifactId> <artifactId>cloud-server</artifactId>
</executableDependency> </executableDependency>
<mainClass>com.cloud.upgrade.DatabaseCreator</mainClass> <mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
<arguments> <arguments>
<!-- db properties file --> <!-- db properties file -->
<argument>${project.basedir}/utils/conf/db.properties</argument> <argument>${project.basedir}/utils/conf/db.properties</argument>
<argument>${project.basedir}/utils/conf/db.properties.override</argument> <argument>${project.basedir}/utils/conf/db.properties.override</argument>
<!-- simulator sql files --> <!-- simulator sql files -->
<argument>${basedir}/target/db/create-schema-simulator.sql</argument> <argument>${basedir}/target/db/create-schema-simulator.sql</argument>
<argument>${basedir}/target/db/templates.simulator.sql</argument> <argument>${basedir}/target/db/templates.simulator.sql</argument>
<!-- database upgrade--> <!-- database upgrade -->
<argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument> <argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument>
<argument>--database=simulator</argument> <argument>--database=simulator</argument>
<argument>--rootpassword=${db.root.password}</argument> <argument>--rootpassword=${db.root.password}</argument>
<!-- enable verbosity by -v or dash-dash-verbose --> <!-- enable verbosity by -v or dash-dash-verbose -->
</arguments> </arguments>
<systemProperties> <systemProperties>
<systemProperty> <systemProperty>
<key>catalina.home</key> <key>catalina.home</key>
<value>${project.basedir}/utils</value> <value>${project.basedir}/utils</value>
</systemProperty> </systemProperty>
</systemProperties> </systemProperties>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>