You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/07/30 23:06:44 UTC
[1/3] git commit: updated refs/heads/master to 5595a09
Updated Branches:
refs/heads/master 244cf3b20 -> 5595a099b
Added commons io to runtime
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a8da8c8d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a8da8c8d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a8da8c8d
Branch: refs/heads/master
Commit: a8da8c8dff3e6451d86cb5156d57ca4f244641cc
Parents: b940947
Author: Alex Huang <al...@citrix.com>
Authored: Tue Jul 30 11:43:15 2013 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Tue Jul 30 14:07:20 2013 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
server/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8da8c8d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 50e783a..190a7e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,7 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${cs.commons-io.version}</version>
- <scope>provided</scope>
+ <scope>provided,runtime</scope>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8da8c8d/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 9178f78..20f2b86 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -21,7 +21,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${cs.commons-io.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
[3/3] git commit: updated refs/heads/master to 5595a09
Posted by ah...@apache.org.
Added commons io to server
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5595a099
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5595a099
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5595a099
Branch: refs/heads/master
Commit: 5595a099b24c1f0a89a11262390540ef5d8cbc40
Parents: a8da8c8
Author: Alex Huang <al...@citrix.com>
Authored: Tue Jul 30 13:33:18 2013 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Tue Jul 30 14:07:21 2013 -0700
----------------------------------------------------------------------
pom.xml | 3 +--
server/pom.xml | 3 ---
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5595a099/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 190a7e4..55e3b6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,13 +274,12 @@
<artifactId>commons-configuration</artifactId>
<version>${cs.configuration.version}</version>
</dependency>
- <!-- Test dependency in mysql for db tests -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${cs.commons-io.version}</version>
- <scope>provided,runtime</scope>
</dependency>
+ <!-- Test dependency in mysql for db tests -->
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5595a099/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 20f2b86..dd2df3e 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -21,7 +21,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -77,7 +76,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${cs.codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
@@ -94,7 +92,6 @@
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
- <version>0.9.8</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
[2/3] git commit: updated refs/heads/master to 5595a09
Posted by ah...@apache.org.
Revert "Updating conversion pattern strings from 1. to 1"
The actual fix was already put in.
This reverts commit 4c729e758b935d58a8e93027c604e6353ad05ff2.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9409477
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9409477
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9409477
Branch: refs/heads/master
Commit: b940947764c69b5a6a4e0f3fff7c1a84140b03aa
Parents: 244cf3b
Author: Alex Huang <al...@citrix.com>
Authored: Tue Jul 30 11:40:21 2013 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Tue Jul 30 14:07:20 2013 -0700
----------------------------------------------------------------------
client/tomcatconf/log4j-cloud.xml.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9409477/client/tomcatconf/log4j-cloud.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/log4j-cloud.xml.in b/client/tomcatconf/log4j-cloud.xml.in
index f94b641..d439b77 100755
--- a/client/tomcatconf/log4j-cloud.xml.in
+++ b/client/tomcatconf/log4j-cloud.xml.in
@@ -35,7 +35,7 @@ under the License.
<param name="ActiveFileName" value="@MSLOG@"/>
</rollingPolicy>
<layout class="org.apache.log4j.EnhancedPatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1}] (%t:%x) %m%n"/>
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/>
</layout>
</appender>
@@ -47,7 +47,7 @@ under the License.
<param name="ActiveFileName" value="@APISERVERLOG@"/>
</rollingPolicy>
<layout class="org.apache.log4j.EnhancedPatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1}] (%t:%x) %m%n"/>
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/>
</layout>
</appender>
@@ -59,7 +59,7 @@ under the License.
<param name="ActiveFileName" value="@AWSAPILOG@"/>
</rollingPolicy>
<layout class="org.apache.log4j.EnhancedPatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1}] (%t:%x) %m%n"/>
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1.}] (%t:%x) %m%n"/>
</layout>
</appender>
<!-- ============================== -->
@@ -111,7 +111,7 @@ under the License.
<param name="Target" value="System.out"/>
<param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.EnhancedPatternLayout">
- <param name="ConversionPattern" value="%-5p [%c{1}] (%t:%x) %m%n"/>
+ <param name="ConversionPattern" value="%-5p [%c{1.}] (%t:%x) %m%n"/>
</layout>
</appender>