You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sc...@apache.org on 2008/05/23 23:58:50 UTC
svn commit: r659683 - in /webservices/axis2/trunk/java/modules:
jaxws-integration/test-resources/ jaxws/test-resources/
kernel/src/org/apache/axis2/deployment/scheduler/
kernel/src/org/apache/axis2/util/ scripting/src/org/apache/axis2/scripting/
Author: scheu
Date: Fri May 23 14:58:49 2008
New Revision: 659683
URL: http://svn.apache.org/viewvc?rev=659683&view=rev
Log:
AXIS2-3816
Contributor: Lori VanGulick
Additional Java2Security fixes
Modified:
webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/log4j.properties
webservices/axis2/trunk/java/modules/jaxws/test-resources/log4j.properties
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/scheduler/Scheduler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java
webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/log4j.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/log4j.properties?rev=659683&r1=659682&r2=659683&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/log4j.properties (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/log4j.properties Fri May 23 14:58:49 2008
@@ -29,6 +29,7 @@
# the axis2.small.log.
# You can add this without changing the root category.
#log4j.category.org.apache.axiom.om.util.StAXUtils=DEBUG, SMALL
+#log4j.category.org.apache.axis2.jaxws.message.databinding.JAXBUtils=DEBUG, SMALL
# Enable the following to get JAXWS TestLogger trace.
#log4j.category.JAXWS-Tests=DEBUG, SMALL
Modified: webservices/axis2/trunk/java/modules/jaxws/test-resources/log4j.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test-resources/log4j.properties?rev=659683&r1=659682&r2=659683&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test-resources/log4j.properties (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test-resources/log4j.properties Fri May 23 14:58:49 2008
@@ -23,6 +23,15 @@
#log4j.rootCategory=DEBUG, LOGFILE
log4j.rootCategory=ERROR, CONSOLE
+# Set selected logging
+# (You might want to do this to cut down on the size of the file)
+# The example below adds debug trace for StAXUtils or jaxws server to
+# the axis2.small.log.
+# You can add this without changing the root category.
+log4j.category.org.apache.axis2.jaxws.message=DEBUG, SMALL
+
+# Enable the following to get JAXWS TestLogger trace.
+#log4j.category.JAXWS-Tests=DEBUG, SMALL
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
@@ -40,4 +49,11 @@
log4j.appender.LOGFILE.File=axis2.log
log4j.appender.LOGFILE.Append=true
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
+
+# SMALL is set to be a File appender using a PatternLayout.
+log4j.appender.SMALL=org.apache.log4j.FileAppender
+log4j.appender.SMALL.File=axis2.small.log
+log4j.appender.SMALL.Append=true
+log4j.appender.SMALL.layout=org.apache.log4j.PatternLayout
+log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/scheduler/Scheduler.java?rev=659683&r1=659682&r2=659683&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/scheduler/Scheduler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/scheduler/Scheduler.java Fri May 23 14:58:49 2008
@@ -20,12 +20,19 @@
package org.apache.axis2.deployment.scheduler;
+import java.security.PrivilegedAction;
import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
+import org.apache.axis2.java.security.AccessController;
+
public class Scheduler {
- private final Timer timer = new Timer(true);
+ private final Timer timer = (Timer)AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return new Timer(true);
+ }
+ });
private void reschedule(SchedulerTask schedulerTask, DeploymentIterator iterator) {
Date time = iterator.next();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java?rev=659683&r1=659682&r2=659683&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java Fri May 23 14:58:49 2008
@@ -19,6 +19,10 @@
package org.apache.axis2.util;
+import java.security.PrivilegedAction;
+
+import org.apache.axis2.java.security.AccessController;
+
/**
* This class provides a more efficient means of control over logging than
* do most providers of the Common's logging API at the cost of runtime
@@ -40,7 +44,12 @@
static {
String prop = null;
try {
- prop = System.getProperty("Axis2.prohibitDebugLogging");
+ // need doPriv to get system prop with J2S enabled
+ prop = (String) AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return System.getProperty("Axis2.prohibitDebugLogging");
+ }
+ });
} catch (SecurityException SE) {
//do nothing
}
Modified: webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java?rev=659683&r1=659682&r2=659683&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java Fri May 23 14:58:49 2008
@@ -22,8 +22,10 @@
import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.deployment.RepositoryListener;
import org.apache.axis2.deployment.repository.util.WSInfo;
+import org.apache.axis2.java.security.AccessController;
import java.io.File;
+import java.security.PrivilegedAction;
/**
* An Axis2 RepositoryListener subclass for dealing with script services
@@ -39,8 +41,12 @@
* the WSInfolist class.
*/
protected void findServicesInDirectory() {
-
- File[] files = deploymentEngine.getServicesDir().listFiles();
+ // need doPriv to list files with J2S enabled
+ File[] files = (File[]) AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return deploymentEngine.getServicesDir().listFiles();
+ }
+ });
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {