Author: sagara
Date: Sat Jul 7 06:17:13 2012
New Revision: 1358511
URL: http://svn.apache.org/viewvc?rev=1358511&view=rev
Log:
AXIS2-5360 - Merged r1358508 to 1.5 branch.
Modified:
axis/axis2/java/core/branches/1_5/ (props changed)
axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed)
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
(props changed)
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/
(props changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props
changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed)
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/1_5/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1358508
Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/distribution:r1358508
Propchange:
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:r1358508
Modified:
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java?rev=1358511&r1=1358510&r2=1358511&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
(original)
+++
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
Sat Jul 7 06:17:13 2012
@@ -47,7 +47,7 @@ public class PrettyPrinter {
// If the user has set "axis2.jalopy=false" on the system property,
// then just return back to caller
String property = System.getProperty("axis2.jalopy");
- if((property == null) || !JavaUtils.isTrueExplicitly(property)){
+ if((property != null) && !JavaUtils.isTrueExplicitly(property)){
return;
}
PrintStream backupOutputStream = System.out;
@@ -55,7 +55,7 @@ public class PrettyPrinter {
System.setOut(new PrintStream(new ByteArrayOutputStream()));
System.setErr(new PrintStream(new ByteArrayOutputStream()));
try {
- Class clazzConfigurator =
Loader.loadClass("org.apache.log4j.PropertyConfigurator");
+ Class<?> clazzConfigurator =
Loader.loadClass("org.apache.log4j.PropertyConfigurator");
Method configure = clazzConfigurator.getMethod("configure", new
Class[]{Properties.class});
Properties properties = new Properties();
properties.setProperty("log4j.logger.de.hunsicker.jalopy.io",
@@ -63,7 +63,7 @@ public class PrettyPrinter {
configure.invoke(null, new Object[]{properties});
// Create an instance of the Jalopy bean
- Class clazz = Loader.loadClass("de.hunsicker.jalopy.Jalopy");
+ Class<?> clazz = Loader.loadClass("de.hunsicker.jalopy.Jalopy");
Object prettifier = clazz.newInstance();
// Set the input file
@@ -74,11 +74,11 @@ public class PrettyPrinter {
Method output = clazz.getMethod("setOutput", new
Class[]{File.class});
output.invoke(prettifier, new Object[]{file});
- Class clazz2 =
Loader.loadClass("de.hunsicker.jalopy.storage.Convention");
+ Class<?> clazz2 =
Loader.loadClass("de.hunsicker.jalopy.storage.Convention");
Method instance = clazz2.getMethod("getInstance", new Class[]{});
Object settings = instance.invoke(null, new Object[]{});
- Class clazz3 =
Loader.loadClass("de.hunsicker.jalopy.storage.ConventionKeys");
+ Class<?> clazz3 =
Loader.loadClass("de.hunsicker.jalopy.storage.ConventionKeys");
Field field = clazz3.getField("COMMENT_FORMAT_MULTI_LINE");
Object key = field.get(null);
Method put = clazz2.getMethod("put", new Class[]{key.getClass(),
String.class});
Propchange:
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:r1358508
Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/parent:r1358508
Propchange:
axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:r1358508
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module:r1358508
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:r1358508
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:r1358508
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:r1358508
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/soapmonitor/servlet:r1358508
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:r1358508
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:r1358508
Propchange:
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin:r1358508
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/transport/http/pom.xml:r1358508
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/transport/http/src:r1358508
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/transport/local:r1358508
Propchange:
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:r1358508
Propchange:
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
Merged
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:r1358508
