|
170 | 170 | <module>engine</module> |
171 | 171 | <module>plugins</module> |
172 | 172 | <module>framework</module> |
| 173 | + <module>services</module> |
173 | 174 | <module>test</module> |
174 | 175 | <module>client</module> |
175 | | - <module>services</module> |
| 176 | + <module>setup</module> |
176 | 177 | </modules> |
177 | 178 |
|
178 | 179 | <dependencyManagement> |
|
207 | 208 | <artifactId>spring-web</artifactId> |
208 | 209 | <version>${org.springframework.version}</version> |
209 | 210 | </dependency> |
210 | | - <!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> |
211 | | - <version>${org.springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> |
212 | | - <artifactId>spring-beans</artifactId> <version>${org.springframework.version}</version> |
213 | | - </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> |
214 | | - <version>${org.springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> |
215 | | - <artifactId>spring-context-support</artifactId> <version>${org.springframework.version}</version> |
216 | | - </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> |
217 | | - <version>${org.springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> |
218 | | - <artifactId>spring-jdbc</artifactId> <version>${org.springframework.version}</version> |
219 | | - </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> |
220 | | - <version>${org.springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> |
221 | | - <artifactId>spring-oxm</artifactId> <version>${org.springframework.version}</version> |
222 | | - </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> |
223 | | - <version>${org.springframework.version}</version> </dependency> --> |
224 | 211 | <dependency> |
225 | 212 | <groupId>org.mockito</groupId> |
226 | 213 | <artifactId>mockito-all</artifactId> |
|
252 | 239 |
|
253 | 240 | <build> |
254 | 241 | <defaultGoal>install</defaultGoal> |
255 | | - <sourceDirectory>src</sourceDirectory> |
256 | | - <testSourceDirectory>test</testSourceDirectory> |
257 | | - <testResources> |
258 | | - <testResource> |
259 | | - <directory>test/resources</directory> |
260 | | - </testResource> |
261 | | - </testResources> |
262 | | - <outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory> |
263 | | - <testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory> |
264 | 242 | <pluginManagement> |
265 | 243 | <plugins> |
266 | 244 | <plugin> |
|
386 | 364 | <exclude>deps/XenServerJava/Makefile</exclude> |
387 | 365 | <exclude>dist/console-proxy/js/jquery.js</exclude> |
388 | 366 | <exclude>scripts/vm/systemvm/id_rsa.cloud</exclude> |
389 | | - <exclude>services/console-proxy/server/conf/agent.properties</exclude> |
390 | | - <exclude>services/console-proxy/server/conf/environment.properties</exclude> |
391 | | - <exclude>services/secondary-storage/conf/agent.properties</exclude> |
392 | | - <exclude>services/secondary-storage/conf/environment.properties</exclude> |
393 | 367 | <exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude> |
394 | 368 | <exclude>tools/appliance/definitions/systemvmtemplate/base.sh</exclude> |
395 | 369 | <exclude>tools/appliance/definitions/systemvmtemplate/cleanup.sh</exclude> |
|
556 | 530 | <module>tools</module> |
557 | 531 | </modules> |
558 | 532 | </profile> |
559 | | - <profile> |
560 | | - <id>impatient</id> |
561 | | - <properties> |
562 | | - <marvin.config>tools/devcloud/devcloud.cfg</marvin.config> |
563 | | - </properties> |
564 | | - <modules> |
565 | | - <module>developer</module> |
566 | | - <!--module>tools/devcloud</module --> |
567 | | - </modules> |
568 | | - </profile> |
569 | 533 | <profile> |
570 | 534 | <id>vmware</id> |
571 | 535 | <activation> |
|
0 commit comments