apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format

Browse Source
This commit is contained in:
Alex Huang 2013-07-26 20:35:24 -07:00
parent c2752ba93c
commit 3d2e49bcfc
9 changed files with 173 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/tomcatconf/log4j-cloud.xml.in
View File

@ -35,7 +35,7 @@ under the License.
<param name="ActiveFileName" value="@MSLOG@"/> <param name="ActiveFileName" value="@MSLOG@"/>
</rollingPolicy> </rollingPolicy>
<layout class="org.apache.log4j.EnhancedPatternLayout"> <layout class="org.apache.log4j.EnhancedPatternLayout">
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/> <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/>
</layout> </layout>
</appender> </appender>
@ -47,7 +47,7 @@ under the License.
<param name="ActiveFileName" value="@APISERVERLOG@"/> <param name="ActiveFileName" value="@APISERVERLOG@"/>
</rollingPolicy> </rollingPolicy>
<layout class="org.apache.log4j.EnhancedPatternLayout"> <layout class="org.apache.log4j.EnhancedPatternLayout">
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/> <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/>
</layout> </layout>
</appender> </appender>
@ -59,7 +59,7 @@ under the License.
<param name="ActiveFileName" value="@AWSAPILOG@"/> <param name="ActiveFileName" value="@AWSAPILOG@"/>
</rollingPolicy> </rollingPolicy>
<layout class="org.apache.log4j.EnhancedPatternLayout"> <layout class="org.apache.log4j.EnhancedPatternLayout">
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/> <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/>
</layout> </layout>
</appender> </appender>
<!-- ============================== --> <!-- ============================== -->
@ -71,7 +71,7 @@ under the License.
<param name="SyslogHost" value="localhost"/> <param name="SyslogHost" value="localhost"/>
<param name="Facility" value="LOCAL6"/> <param name="Facility" value="LOCAL6"/>
<layout class="org.apache.log4j.PatternLayout"> <layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p [%c{3}] (%t:%x) %m%n"/> <param name="ConversionPattern" value="%-5p [%c{1.}] (%t:%x) %m%n"/>
</layout> </layout>
</appender> </appender>
@ -111,7 +111,7 @@ under the License.
<param name="Target" value="System.out"/> <param name="Target" value="System.out"/>
<param name="Threshold" value="INFO"/> <param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.PatternLayout"> <layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p [%c{3}] (%t:%x) %m%n"/> <param name="ConversionPattern" value="%-5p [%c{1.}] (%t:%x) %m%n"/>
</layout> </layout>
</appender> </appender>
@ -127,6 +127,10 @@ under the License.
<priority value="DEBUG"/> <priority value="DEBUG"/>
</category> </category>
<category name="org.apache.cloudstack">
<priority value="DEBUG"/>
</category>
<category name="com.cloud.utils.nio"> <category name="com.cloud.utils.nio">
<priority value="INFO"/> <priority value="INFO"/>
</category> </category>

14
framework/db/pom.xml
View File

@ -22,12 +22,22 @@
<dependency> <dependency>
<groupId>javax.ejb</groupId> <groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId> <artifactId>ejb-api</artifactId>
<version>${cs.ejb.version}</version> </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.persistence</groupId> <groupId>org.eclipse.persistence</groupId>
<artifactId>javax.persistence</artifactId> <artifactId>javax.persistence</artifactId>
<version>${cs.jpa.version}</version> </dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>

19
plugins/hypervisors/kvm/pom.xml
View File

@ -1,13 +1,12 @@
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to information regarding copyright ownership. The ASF licenses this file to you under
you under the Apache License, Version 2.0 (the "License"); you may not use the Apache License, Version 2.0 (the "License"); you may not use this file except
this file except in compliance with the License. You may obtain a copy of in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required Unless required by applicable law or agreed to in writing, software distributed under
by applicable law or agreed to in writing, software distributed under the the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
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
OF ANY KIND, either express or implied. See the License for the specific governing permissions and limitations under the License. -->
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -30,6 +29,10 @@
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-agent</artifactId> <artifactId>cloud-agent</artifactId>

29
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -50,21 +50,12 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.ejb.Local; import javax.ejb.Local;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.cloudstack.utils.qemu.QemuImg;
import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
import org.apache.cloudstack.utils.qemu.QemuImgException;
import org.apache.cloudstack.utils.qemu.QemuImgFile;
import org.apache.log4j.Logger;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import org.libvirt.Connect; import org.libvirt.Connect;
import org.libvirt.Domain; import org.libvirt.Domain;
import org.libvirt.DomainBlockStats; import org.libvirt.DomainBlockStats;
@ -74,6 +65,14 @@ import org.libvirt.DomainSnapshot;
import org.libvirt.LibvirtException; import org.libvirt.LibvirtException;
import org.libvirt.NodeInfo; import org.libvirt.NodeInfo;
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.cloudstack.utils.qemu.QemuImg;
import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
import org.apache.cloudstack.utils.qemu.QemuImgException;
import org.apache.cloudstack.utils.qemu.QemuImgFile;
import com.cloud.agent.api.Answer; import com.cloud.agent.api.Answer;
import com.cloud.agent.api.AttachIsoCommand; import com.cloud.agent.api.AttachIsoCommand;
import com.cloud.agent.api.AttachVolumeAnswer; import com.cloud.agent.api.AttachVolumeAnswer;
@ -202,7 +201,6 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.GuestDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.GuestResourceDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.GuestResourceDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InputDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InputDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef.hostNicType;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.SerialDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.SerialDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.TermPolicy; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.TermPolicy;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.VirtioSerialDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.VirtioSerialDef;
@ -240,7 +238,6 @@ import com.cloud.utils.script.Script;
import com.cloud.vm.DiskProfile; import com.cloud.vm.DiskProfile;
import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineName;
/** /**
* LibvirtComputingResource execute requests on the computing/routing host using * LibvirtComputingResource execute requests on the computing/routing host using
@ -843,7 +840,7 @@ ServerResource {
configureVifDrivers(params); configureVifDrivers(params);
KVMStorageProcessor storageProcessor = new KVMStorageProcessor(this._storagePoolMgr, this); KVMStorageProcessor storageProcessor = new KVMStorageProcessor(_storagePoolMgr, this);
storageProcessor.configure(name, params); storageProcessor.configure(name, params);
storageHandler = new StorageSubsystemCommandHandlerBase(storageProcessor); storageHandler = new StorageSubsystemCommandHandlerBase(storageProcessor);
@ -1254,7 +1251,7 @@ ServerResource {
} else if (cmd instanceof NetworkRulesVmSecondaryIpCommand) { } else if (cmd instanceof NetworkRulesVmSecondaryIpCommand) {
return execute((NetworkRulesVmSecondaryIpCommand) cmd); return execute((NetworkRulesVmSecondaryIpCommand) cmd);
} else if (cmd instanceof StorageSubSystemCommand) { } else if (cmd instanceof StorageSubSystemCommand) {
return this.storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd); return storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd);
} else if (cmd instanceof PvlanSetupCommand) { } else if (cmd instanceof PvlanSetupCommand) {
return execute((PvlanSetupCommand) cmd); return execute((PvlanSetupCommand) cmd);
} else { } else {
@ -3179,8 +3176,8 @@ ServerResource {
if (vmTO.getMinRam() != vmTO.getMaxRam()){ if (vmTO.getMinRam() != vmTO.getMaxRam()){
grd.setMemBalloning(true); grd.setMemBalloning(true);
grd.setCurrentMem((long)vmTO.getMinRam()/1024); grd.setCurrentMem(vmTO.getMinRam()/1024);
grd.setMemorySize((long)vmTO.getMaxRam()/1024); grd.setMemorySize(vmTO.getMaxRam()/1024);
} }
else{ else{
grd.setMemorySize(vmTO.getMaxRam() / 1024); grd.setMemorySize(vmTO.getMaxRam() / 1024);

117
pom.xml
View File

@ -187,6 +187,121 @@
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>${cs.log4j.version}</version> <version>${cs.log4j.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>${cs.cglib.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>${cs.dbcp.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-pool</artifactId>
<groupId>commons-pool</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${cs.ehcache.version}</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>${cs.pool.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${cs.codec.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>${cs.bcprov.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>${cs.jsch.version}</version>
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
<version>${cs.jasypt.version}</version>
</dependency>
<dependency>
<groupId>com.trilead</groupId>
<artifactId>trilead-ssh2</artifactId>
<version>${cs.trilead.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>${cs.aws.sdk.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
<version>${cs.log4j.extras.version}</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
<version>${cs.ejb.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.java-ipv6</groupId>
<artifactId>java-ipv6</artifactId>
<version>${cs.java-ipv6.version}</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${cs.configuration.version}</version>
</dependency>
<!-- Test dependency in mysql for db tests -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${cs.commons-io.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${cs.reflections.version}</version>
</dependency>
<dependency>
<groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>javax.persistence</artifactId>
<version>${cs.jpa.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -245,7 +360,7 @@
<excludeDefaultDirectories>true</excludeDefaultDirectories> <excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets> <filesets>
<fileset> <fileset>
<directory>target</directory> <directory>${cs.target.dir}</directory>
<includes> <includes>
<include>**/*</include> <include>**/*</include>
</includes> </includes>

12
server/conf/log4j-cloud.xml.in
View File

@ -34,7 +34,7 @@ under the License.
<param name="ActiveFileName" value="@MSLOG@"/> <param name="ActiveFileName" value="@MSLOG@"/>
</rollingPolicy> </rollingPolicy>
<layout class="org.apache.log4j.EnhancedPatternLayout"> <layout class="org.apache.log4j.EnhancedPatternLayout">
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/> <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/>
</layout> </layout>
</appender> </appender>
@ -46,7 +46,7 @@ under the License.
<param name="ActiveFileName" value="@APISERVERLOG@"/> <param name="ActiveFileName" value="@APISERVERLOG@"/>
</rollingPolicy> </rollingPolicy>
<layout class="org.apache.log4j.EnhancedPatternLayout"> <layout class="org.apache.log4j.EnhancedPatternLayout">
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/> <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/>
</layout> </layout>
</appender> </appender>
@ -59,7 +59,7 @@ under the License.
<param name="SyslogHost" value="localhost"/> <param name="SyslogHost" value="localhost"/>
<param name="Facility" value="LOCAL6"/> <param name="Facility" value="LOCAL6"/>
<layout class="org.apache.log4j.PatternLayout"> <layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p [%c{3}] (%t:%x) %m%n"/> <param name="ConversionPattern" value="%-5p [%c{1.}] (%t:%x) %m%n"/>
</layout> </layout>
</appender> </appender>
@ -71,7 +71,7 @@ under the License.
<param name="Target" value="System.out"/> <param name="Target" value="System.out"/>
<param name="Threshold" value="INFO"/> <param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.PatternLayout"> <layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p [%c{3}] (%t:%x) %m%n"/> <param name="ConversionPattern" value="%-5p [%c{1.}] (%t:%x) %m%n"/>
</layout> </layout>
</appender> </appender>
@ -83,6 +83,10 @@ under the License.
<priority value="DEBUG"/> <priority value="DEBUG"/>
</category> </category>
<category name="org.apache.cloudstack">
<priority value="DEBUG"/>
</category
<!-- Limit the org.apache category to INFO as its DEBUG is verbose --> <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
<category name="org.apache"> <category name="org.apache">
<priority value="INFO"/> <priority value="INFO"/>

44
utils/pom.xml
View File

@ -30,7 +30,6 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>${org.springframework.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
@ -39,107 +38,66 @@
<dependency> <dependency>
<groupId>cglib</groupId> <groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId> <artifactId>cglib-nodep</artifactId>
<version>${cs.cglib.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>${cs.dbcp.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-pool</artifactId>
<groupId>commons-pool</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${cs.ehcache.version}</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>${cs.pool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>${cs.codec.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId> <artifactId>bcprov-jdk16</artifactId>
<version>${cs.bcprov.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId> <artifactId>jsch</artifactId>
<version>${cs.jsch.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jasypt</groupId> <groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId> <artifactId>jasypt</artifactId>
<version>${cs.jasypt.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.trilead</groupId> <groupId>com.trilead</groupId>
<artifactId>trilead-ssh2</artifactId> <artifactId>trilead-ssh2</artifactId>
<version>${cs.trilead.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.amazonaws</groupId> <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId> <artifactId>aws-java-sdk</artifactId>
<version>${cs.aws.sdk.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId> <artifactId>apache-log4j-extras</artifactId>
<version>${cs.log4j.extras.version}</version> <scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.ejb</groupId> <groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId> <artifactId>ejb-api</artifactId>
<version>${cs.ejb.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.java-ipv6</groupId> <groupId>com.googlecode.java-ipv6</groupId>
<artifactId>java-ipv6</artifactId> <artifactId>java-ipv6</artifactId>
<version>${cs.java-ipv6.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-configuration</groupId> <groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId> <artifactId>commons-configuration</artifactId>
<version>${cs.configuration.version}</version>
</dependency> </dependency>
<!-- Test dependency in mysql for db tests --> <!-- Test dependency in mysql for db tests -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${cs.commons-io.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<version>${cs.reflections.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.owasp.esapi</groupId> <groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId> <artifactId>esapi</artifactId>
<version>2.0.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

2
utils/src/com/cloud/utils/storage/encoding/Decoder.java
View File

@ -20,11 +20,11 @@ package com.cloud.utils.storage.encoding;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import edu.emory.mathcs.backport.java.util.Arrays;
public class Decoder { public class Decoder {
private static Map<String, String> getParameters(URI uri) { private static Map<String, String> getParameters(URI uri) {

5
utils/src/com/cloud/utils/xmlobject/XmlObject.java
View File

@ -19,6 +19,7 @@ package com.cloud.utils.xmlobject;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -26,10 +27,8 @@ import java.util.Map;
import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.CloudRuntimeException;
import edu.emory.mathcs.backport.java.util.Collections;
public class XmlObject { public class XmlObject {
private Map<String, Object> elements = new HashMap<String, Object>(); private final Map<String, Object> elements = new HashMap<String, Object>();
private String text; private String text;
private String tag; private String tag;