Skip to content

Commit ac97d67

Browse files
author
Edison Su
committed
add nonoss maven build
1 parent 06d516a commit ac97d67

5 files changed

Lines changed: 232 additions & 110 deletions

File tree

‎build/replace.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ DBHOST=localhost
2424
AGENTLOGDIR=logs
2525
AGENTLOG=logs/agent.log
2626
MSMNTDIR=/mnt
27-
COMPONENTS-SPEC=components-premium.xml
27+
COMPONENTS-SPEC=components.xml
2828
AWSAPILOG=awsapi.log
2929
REMOTEHOST=localhost

‎client/pom.xml‎

Lines changed: 122 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
19-
<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">
1+
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
license agreements. See the NOTICE file distributed with this work for additional
3+
information regarding copyright ownership. The ASF licenses this file to
4+
you under the Apache License, Version 2.0 (the "License"); you may not use
5+
this file except in compliance with the License. You may obtain a copy of
6+
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
7+
by applicable law or agreed to in writing, software distributed under the
8+
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
9+
OF ANY KIND, either express or implied. See the License for the specific
10+
language governing permissions and limitations under the License. -->
11+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
12+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2013
<modelVersion>4.0.0</modelVersion>
2114
<artifactId>cloud-client-ui</artifactId>
2215
<name>Apache CloudStack Client UI</name>
@@ -145,43 +138,66 @@
145138
<version>1.7</version>
146139
<executions>
147140
<execution>
141+
<id>generate-resource</id>
148142
<phase>generate-resources</phase>
149143
<goals>
150144
<goal>run</goal>
151145
</goals>
152146
<configuration>
153147
<target>
154-
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes">
148+
<copy
149+
todir="${basedir}/target/generated-webapp/WEB-INF/classes">
155150
<fileset dir="${basedir}/WEB-INF/classes">
156151
<include name="resources/**/*" />
157152
</fileset>
158153
</copy>
159-
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
154+
<copy
155+
todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
160156
<fileset dir="${basedir}/../scripts" />
161157
</copy>
162158
<copy todir="${basedir}/target/generated-webapp">
163159
<fileset dir="${basedir}/../ui" />
164160
</copy>
165-
<copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
161+
<copy overwrite="true"
162+
todir="${basedir}/target/generated-webapp/WEB-INF/classes">
166163
<fileset dir="${basedir}/tomcatconf">
167164
<include name="*.in" />
168165
</fileset>
169166
<globmapper from="*.in" to="*" />
170167
<filterchain>
171-
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
172-
<param type="propertiesfile" value="${basedir}/../build/replace.properties" />
168+
<filterreader
169+
classname="org.apache.tools.ant.filters.ReplaceTokens">
170+
<param type="propertiesfile"
171+
value="${basedir}/../build/replace.properties" />
173172
</filterreader>
174173
</filterchain>
175174
</copy>
176175
</target>
177176
</configuration>
178177
</execution>
178+
<execution>
179+
<id>process-nonoss</id>
180+
<phase>process-resources</phase>
181+
<goals>
182+
<goal>run</goal>
183+
</goals>
184+
<configuration>
185+
<target if="${nonoss}">
186+
<echo>test</echo>
187+
<replaceregexp
188+
file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties"
189+
match="cloud-stack-components-specification=.*"
190+
replace="cloud-stack-components-specification=components-nonoss.xml" byline="true" />
191+
</target>
192+
</configuration>
193+
</execution>
179194
</executions>
180195
</plugin>
181196
</plugins>
182197
<pluginManagement>
183198
<plugins>
184-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
199+
<!--This plugin's configuration is used to store Eclipse m2e settings
200+
only. It has no influence on the Maven build itself. -->
185201
<plugin>
186202
<groupId>org.eclipse.m2e</groupId>
187203
<artifactId>lifecycle-mapping</artifactId>
@@ -214,85 +230,85 @@
214230
</pluginManagement>
215231
</build>
216232
<profiles>
217-
<profile>
218-
<id>netapp</id>
219-
<activation>
220-
<property>
221-
<name>nonoss</name>
222-
</property>
223-
</activation>
224-
<dependencies>
225-
<dependency>
226-
<groupId>org.apache.cloudstack</groupId>
227-
<artifactId>cloud-plugin-netapp</artifactId>
228-
<version>${project.version}</version>
229-
</dependency>
230-
</dependencies>
231-
</profile>
232-
<profile>
233-
<id>f5</id>
234-
<activation>
235-
<property>
236-
<name>nonoss</name>
237-
</property>
238-
</activation>
239-
<dependencies>
240-
<dependency>
241-
<groupId>org.apache.cloudstack</groupId>
242-
<artifactId>cloud-plugin-network-f5</artifactId>
243-
<version>${project.version}</version>
244-
</dependency>
245-
</dependencies>
246-
</profile>
247-
<profile>
248-
<id>netscaler</id>
249-
<activation>
250-
<property>
251-
<name>nonoss</name>
252-
</property>
253-
</activation>
254-
<dependencies>
255-
<dependency>
256-
<groupId>org.apache.cloudstack</groupId>
257-
<artifactId>cloud-plugin-network-netscaler</artifactId>
258-
<version>${project.version}</version>
259-
</dependency>
260-
</dependencies>
261-
</profile>
262-
<profile>
263-
<id>srx</id>
264-
<activation>
265-
<property>
266-
<name>nonoss</name>
267-
</property>
268-
</activation>
269-
<dependencies>
270-
<dependency>
271-
<groupId>org.apache.cloudstack</groupId>
272-
<artifactId>cloud-plugin-network-srx</artifactId>
273-
<version>${project.version}</version>
274-
</dependency>
275-
</dependencies>
276-
</profile>
277-
<profile>
278-
<id>vmware</id>
279-
<activation>
280-
<property>
281-
<name>nonoss</name>
282-
</property>
283-
</activation>
284-
<dependencies>
285-
<dependency>
286-
<groupId>org.apache.cloudstack</groupId>
287-
<artifactId>cloud-plugin-hypervisor-vmware</artifactId>
288-
<version>${project.version}</version>
289-
</dependency>
290-
<dependency>
291-
<groupId>org.apache.cloudstack</groupId>
292-
<artifactId>cloud-vmware-base</artifactId>
293-
<version>${project.version}</version>
294-
</dependency>
295-
</dependencies>
296-
</profile>
297-
</profiles>
233+
<profile>
234+
<id>netapp</id>
235+
<activation>
236+
<property>
237+
<name>nonoss</name>
238+
</property>
239+
</activation>
240+
<dependencies>
241+
<dependency>
242+
<groupId>org.apache.cloudstack</groupId>
243+
<artifactId>cloud-plugin-netapp</artifactId>
244+
<version>${project.version}</version>
245+
</dependency>
246+
</dependencies>
247+
</profile>
248+
<profile>
249+
<id>f5</id>
250+
<activation>
251+
<property>
252+
<name>nonoss</name>
253+
</property>
254+
</activation>
255+
<dependencies>
256+
<dependency>
257+
<groupId>org.apache.cloudstack</groupId>
258+
<artifactId>cloud-plugin-network-f5</artifactId>
259+
<version>${project.version}</version>
260+
</dependency>
261+
</dependencies>
262+
</profile>
263+
<profile>
264+
<id>netscaler</id>
265+
<activation>
266+
<property>
267+
<name>nonoss</name>
268+
</property>
269+
</activation>
270+
<dependencies>
271+
<dependency>
272+
<groupId>org.apache.cloudstack</groupId>
273+
<artifactId>cloud-plugin-network-netscaler</artifactId>
274+
<version>${project.version}</version>
275+
</dependency>
276+
</dependencies>
277+
</profile>
278+
<profile>
279+
<id>srx</id>
280+
<activation>
281+
<property>
282+
<name>nonoss</name>
283+
</property>
284+
</activation>
285+
<dependencies>
286+
<dependency>
287+
<groupId>org.apache.cloudstack</groupId>
288+
<artifactId>cloud-plugin-network-srx</artifactId>
289+
<version>${project.version}</version>
290+
</dependency>
291+
</dependencies>
292+
</profile>
293+
<profile>
294+
<id>vmware</id>
295+
<activation>
296+
<property>
297+
<name>nonoss</name>
298+
</property>
299+
</activation>
300+
<dependencies>
301+
<dependency>
302+
<groupId>org.apache.cloudstack</groupId>
303+
<artifactId>cloud-plugin-hypervisor-vmware</artifactId>
304+
<version>${project.version}</version>
305+
</dependency>
306+
<dependency>
307+
<groupId>org.apache.cloudstack</groupId>
308+
<artifactId>cloud-vmware-base</artifactId>
309+
<version>${project.version}</version>
310+
</dependency>
311+
</dependencies>
312+
</profile>
313+
</profiles>
298314
</project>

‎client/tomcatconf/components-nonoss.xml.in‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<!--
21+
components.xml is the configuration file for the VM Ops
22+
insertion servers. Someone can quickly pull together an
23+
insertion server by selecting the correct adapters to use.
24+
25+
Here are some places to look for information.
26+
- To find out the general functionality that each Manager
27+
or Adapter provide, look at the javadoc for the interface
28+
that it implements. The interface is usually the
29+
"key" attribute in the declaration.
30+
- To find specific implementation of each Manager or
31+
Adapter, look at the javadoc for the actual class. The
32+
class can be found in the <class> element.
33+
- To find out the configuration parameters for each Manager
34+
or Adapter, look at the javadoc for the actual implementation
35+
class. It should be documented in the description of the
36+
class.
37+
- To know more about the components.xml in general, look for
38+
the javadoc for ComponentLocator.java.
39+
40+
If you found that the Manager or Adapter are not properly
41+
documented, please contact the author.
42+
-->
43+
<components-nonoss.xml>
44+
<system-integrity-checker class="com.cloud.upgrade.DatabaseUpgradeChecker">
45+
<checker name="ManagementServerNode" class="com.cloud.cluster.ManagementServerNode"/>
46+
<checker name="PremiumDatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/>
47+
</system-integrity-checker>
48+
49+
<management-server class="com.cloud.server.ManagementServerExtImpl" library="com.cloud.configuration.PremiumComponentLibrary" extends="components.xml:management-server">
50+
<adapters key="com.cloud.ha.Investigator">
51+
<adapter name="VmwareInvestigator" class="com.cloud.ha.VmwareInvestigator"/>
52+
</adapters>
53+
54+
<adapters key="com.cloud.ha.FenceBuilder">
55+
<adapter name="VmwareFenceBuilder" class="com.cloud.ha.VmwareFencer"/>
56+
</adapters>
57+
58+
<adapters key="com.cloud.resource.Discoverer">
59+
<adapter name="VShpereServer" class="com.cloud.hypervisor.vmware.VmwareServerDiscoverer"/>
60+
</adapters>
61+
62+
<adapters key="com.cloud.network.element.NetworkElement">
63+
<adapter name="JuniperSRX" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
64+
<adapter name="Netscaler" class="com.cloud.network.element.NetscalerElement"/>
65+
<adapter name="F5BigIP" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/>
66+
<adapter name="CiscoNexus1000vVSM" class="com.cloud.network.element.CiscoNexusVSMElement"/>
67+
</adapters>
68+
69+
<adapters key="com.cloud.hypervisor.HypervisorGuru">
70+
<adapter name="VMwareGuru" class="com.cloud.hypervisor.guru.VMwareGuru"/>
71+
</adapters>
72+
73+
<manager name="VmwareManager" key="com.cloud.hypervisor.vmware.manager.VmwareManager" class="com.cloud.hypervisor.vmware.manager.VmwareManagerImpl"/>
74+
<manager name="NetappManager" key="com.cloud.netapp.NetappManager" class="com.cloud.netapp.NetappManagerImpl"/>
75+
<pluggableservice name="NetscalerExternalLoadBalancerElementService" key="com.cloud.network.element.NetscalerLoadBalancerElementService" class="com.cloud.network.element.NetscalerElement"/>
76+
<pluggableservice name="F5ExternalLoadBalancerElementService" key="com.cloud.network.element.F5ExternalLoadBalancerElementService" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/>
77+
<pluggableservice name="JuniperSRXFirewallElementService" key="com.cloud.network.element.JuniperSRXFirewallElementService" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
78+
<pluggableservice name="CiscoNexusVSMElementService" key="com.cloud.network.element.CiscoNexusVSMElementService" class="com.cloud.network.element.CiscoNexusVSMElement"/>
79+
80+
<dao name="NetScalerPodDao" class="com.cloud.network.dao.NetScalerPodDaoImpl" singleton="false"/>
81+
<dao name="CiscoNexusVSMDeviceDao" class="com.cloud.network.dao.CiscoNexusVSMDeviceDaoImpl" singleton="false"/>
82+
<dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/>
83+
<dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/>
84+
<dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/>
85+
</management-server>
86+
<configuration-server class="com.cloud.server.ConfigurationServerImpl" extends="components.xml:configuration-server">
87+
<dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false">
88+
<param name="premium">true</param>
89+
</dao>
90+
</configuration-server>
91+
92+
93+
94+
</components-nonoss.xml>

0 commit comments

Comments
 (0)