Skip to content

Commit b57be33

Browse files
author
Edison Su
committed
add apidocs/devcloud projects
1 parent 38578bf commit b57be33

32 files changed

Lines changed: 235 additions & 59 deletions

‎client/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
</fileset>
160160
</copy>
161161
<copy
162-
todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
162+
todir="${basedir}/target/generated-webapp/WEB-INF/lib/scripts">
163163
<fileset dir="${basedir}/../scripts" />
164164
</copy>
165165
<copy
@@ -186,6 +186,7 @@
186186
</filterreader>
187187
</filterchain>
188188
</copy>
189+
<copy overwrite="true" file="../console-proxy/dist/systemvm.iso" todir="${basedir}/target/generated-webapp/WEB-INF/lib/vms"/>
189190
</target>
190191
</configuration>
191192
</execution>

‎client/tomcatconf/commands.properties.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ stopRouter=com.cloud.api.commands.StopRouterCmd;7
160160
destroyRouter=com.cloud.api.commands.DestroyRouterCmd;7
161161
changeServiceForRouter=com.cloud.api.commands.UpgradeRouterCmd;7
162162
listRouters=com.cloud.api.commands.ListRoutersCmd;7
163+
listVirtualRouterElements=com.cloud.api.commands.ListVirtualRouterElementsCmd;7
164+
configureVirtualRouterElement=com.cloud.api.commands.ConfigureVirtualRouterElementCmd;7
163165

164166
#### system vm commands
165167
startSystemVm=com.cloud.api.commands.StartSystemVMCmd;1

‎console-proxy/pom.xml‎

Lines changed: 45 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,6 @@
120120
<include>systemvm.zip</include>
121121
</includes>
122122
</resource>
123-
<resource>
124-
<directory>../patches/target/</directory>
125-
<includes>
126-
<include>cloud-scripts.tar.gz</include>
127-
</includes>
128-
</resource>
129123
<resource>
130124
<directory>../patches/systemvm/debian/config/root/.ssh</directory>
131125
<includes>
@@ -137,6 +131,50 @@
137131
</execution>
138132
</executions>
139133
</plugin>
134+
<plugin>
135+
<artifactId>maven-antrun-plugin</artifactId>
136+
<version>1.7</version>
137+
<executions>
138+
<execution>
139+
<id>generate-resource</id>
140+
<phase>generate-resources</phase>
141+
<goals>
142+
<goal>run</goal>
143+
</goals>
144+
<configuration>
145+
<target>
146+
<copy overwrite="true" file="../patches/target/cloud-scripts.tar.gz" tofile="${basedir}/dist/cloud-scripts.tgz"/>
147+
</target>
148+
</configuration>
149+
</execution>
150+
</executions>
151+
</plugin>
152+
<plugin>
153+
<groupId>org.codehaus.mojo</groupId>
154+
<artifactId>exec-maven-plugin</artifactId>
155+
<version>1.2.1</version>
156+
<executions>
157+
<execution>
158+
<phase>package</phase>
159+
<goals>
160+
<goal>exec</goal>
161+
</goals>
162+
</execution>
163+
</executions>
164+
<configuration>
165+
<executable>mkisofs</executable>
166+
<workingDirectory>dist</workingDirectory>
167+
<arguments>
168+
<argument>-quiet</argument>
169+
<argument>-r</argument>
170+
<argument>-o</argument>
171+
<argument>systemvm.iso</argument>
172+
<argument>systemvm.zip</argument>
173+
<argument>cloud-scripts.tgz</argument>
174+
<argument>authorized_keys</argument>
175+
</arguments>
176+
</configuration>
177+
</plugin>
140178
</plugins>
141179
</build>
142180
<profiles>
@@ -162,11 +200,6 @@
162200
</profile>
163201
<profile>
164202
<id>systemvm</id>
165-
<activation>
166-
<property>
167-
<name>systemvm</name>
168-
</property>
169-
</activation>
170203
<build>
171204
<plugins>
172205
<plugin>
@@ -190,7 +223,7 @@
190223
<argument>-o</argument>
191224
<argument>systemvm.iso</argument>
192225
<argument>systemvm.zip</argument>
193-
<argument>cloud-scripts.tar.gz</argument>
226+
<argument>cloud-scripts.tgz</argument>
194227
<argument>authorized_keys</argument>
195228
</arguments>
196229
</configuration>

‎console-proxy/systemvm-descriptor.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<includes>
5757
<include>log4j-cloud.xml</include>
5858
<include>consoleproxy.properties</include>
59+
<include>agent.properties</include>
5960
</includes>
6061
</fileSet>
6162
<fileSet>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@
160160
<module>client</module>
161161
<module>test</module>
162162
<module>tools/devcloud</module>
163+
<module>tools/apidoc</module>
163164
</modules>
164165

165166
<dependencies>

‎server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
7070
Listener, ResourceStateAdapter {
7171
private static final Logger s_logger = Logger.getLogger(KvmServerDiscoverer.class);
72-
private String _setupAgentPath;
7372
private ConfigurationDao _configDao;
7473
private String _hostIp;
7574
private int _waitTime = 5; /*wait for 5 minutes*/
@@ -288,7 +287,6 @@ private HostVO waitForHostConnect(long dcId, long podId, long clusterId, String
288287
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
289288
ComponentLocator locator = ComponentLocator.getCurrentLocator();
290289
_configDao = locator.getDao(ConfigurationDao.class);
291-
_setupAgentPath = Script.findScript(getPatchPath(), "setup_agent.sh");
292290
_kvmPrivateNic = _configDao.getValue(Config.KvmPrivateNetwork.key());
293291
if (_kvmPrivateNic == null) {
294292
_kvmPrivateNic = "cloudbr0";
@@ -304,9 +302,6 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
304302
_kvmGuestNic = _kvmPrivateNic;
305303
}
306304

307-
if (_setupAgentPath == null) {
308-
throw new ConfigurationException("Can't find setup_agent.sh");
309-
}
310305
_hostIp = _configDao.getValue("host");
311306
if (_hostIp == null) {
312307
throw new ConfigurationException("Can't get host IP");

setup/apidoc/XmlToHtmlConverter.java renamed to tools/apidoc/XmlToHtmlConverter.java

File renamed without changes.

setup/apidoc/build-apidoc.sh renamed to tools/apidoc/build-apidoc.sh

File renamed without changes.

setup/apidoc/gen_toc.py renamed to tools/apidoc/gen_toc.py

File renamed without changes.

setup/apidoc/generateadmincommands.xsl renamed to tools/apidoc/generateadmincommands.xsl

File renamed without changes.

0 commit comments

Comments
 (0)