You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/10/15 14:04:56 UTC
[2/2] git commit: updated refs/heads/master to 56129c3
Remove some stuff that is no longer used
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8cfafbe4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8cfafbe4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8cfafbe4
Branch: refs/heads/master
Commit: 8cfafbe44ed9244c482809ddad3831f629abc00a
Parents: 8350a6b
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Oct 15 07:51:31 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Oct 15 14:04:34 2013 +0200
----------------------------------------------------------------------
agent/scripts/_run.sh | 26 ---------
agent/scripts/agent.sh | 31 -----------
agent/scripts/run.sh | 20 -------
plugins/hypervisors/kvm/agent-descriptor.xml | 68 -----------------------
plugins/hypervisors/kvm/pom.xml | 46 ---------------
5 files changed, 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cfafbe4/agent/scripts/_run.sh
----------------------------------------------------------------------
diff --git a/agent/scripts/_run.sh b/agent/scripts/_run.sh
deleted file mode 100644
index 2ba44bf..0000000
--- a/agent/scripts/_run.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# 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.
-
-#script to start multiple agents on one host
-num=$1
-port=8787
-while [ $num -gt 0 ]
-do
-let "port=$port + $num"
-java -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n -cp ./'*' com.cloud.agent.AgentShell &
-let "num=$num - 1"
-done
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cfafbe4/agent/scripts/agent.sh
----------------------------------------------------------------------
diff --git a/agent/scripts/agent.sh b/agent/scripts/agent.sh
deleted file mode 100755
index 867571c..0000000
--- a/agent/scripts/agent.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# 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.
-
-
-#run.sh runs the agent client.
-
-# set -x
-
-while true
-do
- ./run.sh "$@"
- ex=$?
- if [ $ex -eq 0 ] || [ $ex -eq 1 ] || [ $ex -eq 66 ] || [ $ex -gt 128 ]; then
- exit $ex
- fi
-done
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cfafbe4/agent/scripts/run.sh
----------------------------------------------------------------------
diff --git a/agent/scripts/run.sh b/agent/scripts/run.sh
deleted file mode 100755
index 1fa4275..0000000
--- a/agent/scripts/run.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# 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.
-
-#run.sh runs the agent client.
-java $1 -Xms128M -Xmx384M -cp cglib-nodep-2.2.jar:trilead-ssh2-build213.jar:cloud-api.jar:cloud-core-extras.jar:cloud-utils.jar:cloud-agent.jar:cloud-console-proxy.jar:cloud-console-common.jar:freemarker.jar:log4j-1.2.15.jar:ws-commons-util-1.0.2.jar:xmlrpc-client-3.1.3.jar:cloud-core.jar:xmlrpc-common-3.1.3.jar:javaee-api-5.0-1.jar:gson-1.3.jar:commons-httpclient-3.1.jar:commons-logging-1.1.1.jar:commons-codec-1.4.jar:commons-collections-3.2.1.jar:commons-pool-1.4.jar:apache-log4j-extras-1.0.jar:libvirt-0.4.5.jar:jna.jar:.:/etc/cloud:./*:/usr/share/java/*:./conf com.cloud.agent.AgentShell
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cfafbe4/plugins/hypervisors/kvm/agent-descriptor.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/agent-descriptor.xml b/plugins/hypervisors/kvm/agent-descriptor.xml
deleted file mode 100644
index 2923c58..0000000
--- a/plugins/hypervisors/kvm/agent-descriptor.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- 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.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>kvm-agent</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <useProjectArtifact/>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>../../../agent/scripts</directory>
- <outputDirectory></outputDirectory>
- <fileMode>774</fileMode>
- <includes>
- <include>run.sh</include>
- <include>_run.sh</include>
- <include>agent.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <fileMode>555</fileMode>
- <includes>
- <include>cloud-plugin-hypervisor-kvm-*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../../scripts</directory>
- <outputDirectory>scripts</outputDirectory>
- <fileMode>555</fileMode>
- </fileSet>
- <fileSet>
- <directory>../../../agent/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <directoryMode>555</directoryMode>
- <fileMode>774</fileMode>
- <includes>
- <include>agent.properties</include>
- <include>log4j-cloud.xml</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cfafbe4/plugins/hypervisors/kvm/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 024cafe..e279621 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -87,52 +87,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <finalName>kvm-agent</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>agent-descriptor.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-agent</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <!-- here the phase you need -->
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>dist</outputDirectory>
- <resources>
- <resource>
- <directory>target</directory>
- <includes>
- <include>kvm-agent.zip</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
</project>