Skip to content

Commit 9a7f304

Browse files
spark404spark404
committed
Move the systemvm copy action and dependency to the systemvm profile
Applied auto-formatting on the xml file
1 parent c7cc791 commit 9a7f304

1 file changed

Lines changed: 89 additions & 78 deletions

File tree

‎client/pom.xml‎

Lines changed: 89 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
88
OF ANY KIND, either express or implied. See the License for the specific language
99
governing permissions and limitations under the License. -->
10-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
<project xmlns="http://maven.apache.org/POM/4.0.0"
11+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1112
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1213
<modelVersion>4.0.0</modelVersion>
1314
<artifactId>cloud-client-ui</artifactId>
@@ -17,7 +18,7 @@
1718
<groupId>org.apache.cloudstack</groupId>
1819
<artifactId>cloudstack</artifactId>
1920
<version>4.3.0-SNAPSHOT</version>
20-
</parent>
21+
</parent>
2122
<dependencies>
2223
<dependency>
2324
<groupId>org.apache.cloudstack</groupId>
@@ -275,12 +276,6 @@
275276
<artifactId>cloud-plugin-host-anti-affinity</artifactId>
276277
<version>${project.version}</version>
277278
</dependency>
278-
<dependency>
279-
<groupId>org.apache.cloudstack</groupId>
280-
<artifactId>cloud-systemvm</artifactId>
281-
<version>${project.version}</version>
282-
<type>pom</type>
283-
</dependency>
284279
</dependencies>
285280
<build>
286281
<plugins>
@@ -351,25 +346,6 @@
351346
<artifactId>maven-antrun-plugin</artifactId>
352347
<version>1.7</version>
353348
<executions>
354-
<!-- Copy the systemvm in the package phase as it is generated by console-proxy
355-
in the package phase. -->
356-
<execution>
357-
<id>copy-systemvm</id>
358-
<phase>process-resources</phase>
359-
<goals>
360-
<goal>run</goal>
361-
</goals>
362-
<configuration>
363-
<target>
364-
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
365-
<fileset dir="${basedir}/../systemvm/dist">
366-
<include name="systemvm.zip" />
367-
<include name="systemvm.iso" />
368-
</fileset>
369-
</copy>
370-
</target>
371-
</configuration>
372-
</execution>
373349
<execution>
374350
<id>generate-resource</id>
375351
<phase>generate-resources</phase>
@@ -378,95 +354,93 @@
378354
</goals>
379355
<configuration>
380356
<target>
381-
<copy
382-
todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
383-
<fileset dir="${basedir}/../scripts" />
357+
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
358+
<fileset dir="${basedir}/../scripts"/>
384359
</copy>
385360
<!-- CLOUDSTACK-1304 -->
386-
<chmod perm="755" file="${basedir}/target/generated-webapp/WEB-INF/classes/scripts/**" type="both" />
361+
<chmod perm="755"
362+
file="${basedir}/target/generated-webapp/WEB-INF/classes/scripts/**" type="both"/>
387363
<copy todir="${basedir}/target/generated-webapp/WEB-INF/">
388364
<fileset dir="${basedir}/WEB-INF/">
389-
<include name="web.xml" />
365+
<include name="web.xml"/>
390366
</fileset>
391367
</copy>
392368
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes">
393369
<fileset dir="${basedir}/WEB-INF/classes">
394-
<include name="resources/**/*" />
370+
<include name="resources/**/*"/>
395371
</fileset>
396372
</copy>
397373
<copy todir="${basedir}/target/generated-webapp">
398-
<fileset dir="${basedir}/../ui" />
374+
<fileset dir="${basedir}/../ui"/>
399375
</copy>
400-
<copy overwrite="true"
401-
todir="${basedir}/target/generated-webapp/WEB-INF/classes">
376+
<copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
402377
<fileset dir="${basedir}/tomcatconf">
403-
<include name="*.in" />
378+
<include name="*.in"/>
404379
</fileset>
405-
<globmapper from="*.in" to="*" />
380+
<globmapper from="*.in" to="*"/>
406381
<filterchain>
407382
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
408-
<param type="propertiesfile" value="${cs.replace.properties}" />
383+
<param type="propertiesfile" value="${cs.replace.properties}"/>
409384
</filterreader>
410385
</filterchain>
411386
</copy>
412-
<copy overwrite="true"
413-
todir="${basedir}/target/generated-webapp/WEB-INF/classes">
387+
<copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
414388
<fileset dir="${basedir}/tomcatconf">
415-
<include name="*.in" />
389+
<include name="*.in"/>
416390
</fileset>
417-
<globmapper from="*.in" to="*" />
391+
<globmapper from="*.in" to="*"/>
418392
<filterchain>
419393
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
420-
<param type="propertiesfile" value="${cs.replace.properties}" />
394+
<param type="propertiesfile" value="${cs.replace.properties}"/>
421395
</filterreader>
422396
</filterchain>
423397
</copy>
424398
<copy overwrite="true" todir="${basedir}/target/utilities/bin">
425399
<fileset dir="${basedir}/../setup/bindir">
426-
<include name="*.in" />
400+
<include name="*.in"/>
427401
</fileset>
428-
<globmapper from="*.in" to="*" />
402+
<globmapper from="*.in" to="*"/>
429403
<filterchain>
430404
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
431-
<param type="propertiesfile" value="${cs.replace.properties}" />
405+
<param type="propertiesfile" value="${cs.replace.properties}"/>
432406
</filterreader>
433407
</filterchain>
434408
</copy>
435409
<copy overwrite="true" todir="${basedir}/target/utilities/bin">
436410
<fileset dir="${basedir}/bindir">
437-
<include name="*.in" />
411+
<include name="*.in"/>
438412
</fileset>
439-
<globmapper from="*.in" to="*" />
413+
<globmapper from="*.in" to="*"/>
440414
<filterchain>
441415
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
442-
<param type="propertiesfile" value="${cs.replace.properties}" />
416+
<param type="propertiesfile" value="${cs.replace.properties}"/>
443417
</filterreader>
444418
</filterchain>
445419
</copy>
446420
<copy overwrite="true" todir="${basedir}/target/utilities/scripts/db">
447421
<fileset dir="${basedir}/../setup/db">
448-
<include name="**/*" />
422+
<include name="**/*"/>
449423
</fileset>
450424
<filterchain>
451425
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
452-
<param type="propertiesfile" value="${cs.replace.properties}" />
426+
<param type="propertiesfile" value="${cs.replace.properties}"/>
453427
</filterreader>
454428
</filterchain>
455429
</copy>
456430
<copy overwrite="true" todir="${basedir}/target/conf">
457431
<fileset dir="${basedir}/tomcatconf">
458-
<include name="*.in" />
432+
<include name="*.in"/>
459433
</fileset>
460-
<globmapper from="*.in" to="*" />
434+
<globmapper from="*.in" to="*"/>
461435
<filterchain>
462436
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
463-
<param type="propertiesfile" value="${cs.replace.properties}" />
437+
<param type="propertiesfile" value="${cs.replace.properties}"/>
464438
</filterreader>
465439
</filterchain>
466440
</copy>
467441
<copy overwrite="true" todir="${basedir}/target/conf">
468442
<fileset dir="${basedir}/tomcatconf">
469-
<exclude name="*.in" />
443+
<exclude name="*.in"/>
470444
</fileset>
471445
</copy>
472446
</target>
@@ -484,8 +458,8 @@
484458
<replaceregexp
485459
file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties"
486460
match="cloud-stack-components-specification=.*"
487-
replace="cloud-stack-components-specification=components-nonoss.xml"
488-
byline="true" />
461+
replace="cloud-stack-components-specification=components-nonoss.xml" byline="true"
462+
/>
489463
</target>
490464
</configuration>
491465
</execution>
@@ -498,10 +472,9 @@
498472
<configuration>
499473
<target if="${simulator}">
500474
<echo>test</echo>
501-
<replaceregexp
502-
file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
503-
match="classpath:componentContext.xml" replace="classpath:simulatorComponentContext.xml"
504-
byline="true" />
475+
<replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
476+
match="classpath:componentContext.xml"
477+
replace="classpath:simulatorComponentContext.xml" byline="true"/>
505478
</target>
506479
</configuration>
507480
</execution>
@@ -513,15 +486,13 @@
513486
</goals>
514487
<configuration>
515488
<target if="${nonoss}">
516-
<replaceregexp
517-
file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
518-
match="classpath:componentContext.xml" replace="classpath:nonossComponentContext.xml"
519-
byline="true" />
489+
<replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
490+
match="classpath:componentContext.xml"
491+
replace="classpath:nonossComponentContext.xml" byline="true"/>
520492
<copy overwrite="true"
521493
todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
522-
<fileset
523-
dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
524-
<include name="**/*" />
494+
<fileset dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
495+
<include name="**/*"/>
525496
</fileset>
526497
</copy>
527498
</target>
@@ -539,8 +510,7 @@
539510
<replaceregexp
540511
file="${basedir}/target/generated-webapp/WEB-INF/classes/applicationContext.xml"
541512
match="com.cloud.consoleproxy.ConsoleProxyManagerImpl"
542-
replace="com.cloud.consoleproxy.StaticConsoleProxyManager"
543-
byline="true" />
513+
replace="com.cloud.consoleproxy.StaticConsoleProxyManager" byline="true"/>
544514
</target>
545515
</configuration>
546516
</execution>
@@ -592,19 +562,15 @@
592562
<pluginExecutions>
593563
<pluginExecution>
594564
<pluginExecutionFilter>
595-
<groupId>
596-
org.apache.maven.plugins
597-
</groupId>
598-
<artifactId>
599-
maven-antrun-plugin
600-
</artifactId>
565+
<groupId> org.apache.maven.plugins </groupId>
566+
<artifactId> maven-antrun-plugin </artifactId>
601567
<versionRange>[1.7,)</versionRange>
602568
<goals>
603569
<goal>run</goal>
604570
</goals>
605571
</pluginExecutionFilter>
606572
<action>
607-
<ignore />
573+
<ignore/>
608574
</action>
609575
</pluginExecution>
610576
</pluginExecutions>
@@ -615,6 +581,51 @@
615581
</pluginManagement>
616582
</build>
617583
<profiles>
584+
<profile>
585+
<id>systemvm</id>
586+
<activation>
587+
<property>
588+
<name>systemvm</name>
589+
</property>
590+
</activation>
591+
<dependencies>
592+
<dependency>
593+
<groupId>org.apache.cloudstack</groupId>
594+
<artifactId>cloud-systemvm</artifactId>
595+
<version>${project.version}</version>
596+
<type>pom</type>
597+
</dependency>
598+
</dependencies>
599+
<build>
600+
<plugins>
601+
<plugin>
602+
<artifactId>maven-antrun-plugin</artifactId>
603+
<version>1.7</version>
604+
<executions>
605+
<!-- Copy the systemvm in the package phase as it is generated by console-proxy
606+
in the package phase. -->
607+
<execution>
608+
<id>copy-systemvm</id>
609+
<phase>process-resources</phase>
610+
<goals>
611+
<goal>run</goal>
612+
</goals>
613+
<configuration>
614+
<target>
615+
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
616+
<fileset dir="${basedir}/../systemvm/dist">
617+
<include name="systemvm.zip"/>
618+
<include name="systemvm.iso"/>
619+
</fileset>
620+
</copy>
621+
</target>
622+
</configuration>
623+
</execution>
624+
</executions>
625+
</plugin>
626+
</plugins>
627+
</build>
628+
</profile>
618629
<profile>
619630
<id>simulator</id>
620631
<activation>

0 commit comments

Comments
 (0)