Skip to content

Commit a4cea4e

Browse files
author
Alex Huang
committed
Removed schema from the dependency of many components
1 parent 399c373 commit a4cea4e

47 files changed

Lines changed: 85 additions & 78 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

core/src/com/cloud/consoleproxy/ConsoleProxyAllocator.java renamed to api/src/com/cloud/consoleproxy/ConsoleProxyAllocator.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,15 @@
2020
import java.util.Map;
2121

2222
import com.cloud.utils.component.Adapter;
23-
import com.cloud.vm.ConsoleProxyVO;
23+
import com.cloud.vm.ConsoleProxy;
2424

2525
public interface ConsoleProxyAllocator extends Adapter {
26-
public ConsoleProxyVO allocProxy(List<ConsoleProxyVO> candidates, Map<Long, Integer> loadInfo, long dataCenterId);
26+
/**
27+
* Finds the least loaded console proxy.
28+
* @param candidates
29+
* @param loadInfo
30+
* @param dataCenterId
31+
* @return id of the console proxy to use or null if none.
32+
*/
33+
public Long allocProxy(List<? extends ConsoleProxy> candidates, Map<Long, Integer> loadInfo, long dataCenterId);
2734
}

‎client/tomcatconf/log4j-cloud.xml.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ under the License.
7171
<param name="SyslogHost" value="localhost"/>
7272
<param name="Facility" value="LOCAL6"/>
7373
<layout class="org.apache.log4j.PatternLayout">
74-
<param name="ConversionPattern" value="%-5p [%c{1.}] (%t:%x) %m%n"/>
74+
<param name="ConversionPattern" value="%-5p [%c{3}] (%t:%x) %m%n"/>
7575
</layout>
7676
</appender>
7777

@@ -110,7 +110,7 @@ under the License.
110110
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
111111
<param name="Target" value="System.out"/>
112112
<param name="Threshold" value="INFO"/>
113-
<layout class="org.apache.log4j.PatternLayout">
113+
<layout class="org.apache.log4j.EnhancedPatternLayout">
114114
<param name="ConversionPattern" value="%-5p [%c{1.}] (%t:%x) %m%n"/>
115115
</layout>
116116
</appender>

‎core/pom.xml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,17 @@
3535
<groupId>org.apache.cloudstack</groupId>
3636
<artifactId>cloud-engine-api</artifactId>
3737
<version>${project.version}</version>
38-
</dependency>
38+
</dependency>
39+
<!--
3940
<dependency>
4041
<groupId>org.apache.cloudstack</groupId>
4142
<artifactId>cloud-engine-schema</artifactId>
4243
<version>${project.version}</version>
4344
</dependency>
44-
<dependency>
45-
<groupId>commons-httpclient</groupId>
46-
<artifactId>commons-httpclient</artifactId>
47-
<version>${cs.httpclient.version}</version>
48-
<exclusions>
49-
<exclusion>
50-
<artifactId>commons-codec</artifactId>
51-
<groupId>commons-codec</groupId>
52-
</exclusion>
53-
</exclusions>
54-
</dependency>
45+
-->
5546
<dependency>
5647
<groupId>commons-codec</groupId>
5748
<artifactId>commons-codec</artifactId>
58-
<version>${cs.codec.version}</version>
5949
</dependency>
6050
</dependencies>
61-
<build>
62-
<defaultGoal>install</defaultGoal>
63-
</build>
6451
</project>

engine/api/src/org/apache/cloudstack/storage/command/AttachAnswer.java renamed to core/src/org/apache/cloudstack/storage/command/AttachAnswer.java

File renamed without changes.

engine/api/src/org/apache/cloudstack/storage/command/AttachCommand.java renamed to core/src/org/apache/cloudstack/storage/command/AttachCommand.java

File renamed without changes.

engine/api/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java renamed to core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java

File renamed without changes.

engine/api/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java renamed to core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java

File renamed without changes.

engine/api/src/org/apache/cloudstack/storage/command/CopyCmdAnswer.java renamed to core/src/org/apache/cloudstack/storage/command/CopyCmdAnswer.java

File renamed without changes.

engine/api/src/org/apache/cloudstack/storage/command/CopyCommand.java renamed to core/src/org/apache/cloudstack/storage/command/CopyCommand.java

File renamed without changes.

engine/api/src/org/apache/cloudstack/storage/command/CreateObjectAnswer.java renamed to core/src/org/apache/cloudstack/storage/command/CreateObjectAnswer.java

File renamed without changes.

0 commit comments

Comments
 (0)