You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/02/06 22:31:13 UTC
svn commit: r504303 - in /webservices/axis2/trunk/java/modules/jaxws-api:
pom.xml project.xml src/javax/xml/ws/spi/FactoryFinder.java
Author: dims
Date: Tue Feb 6 13:31:12 2007
New Revision: 504303
URL: http://svn.apache.org/viewvc?view=rev&rev=504303
Log:
Fix for (AXIS2-2123) axis2-jaxws-api module has kernel module depedency
Modified:
webservices/axis2/trunk/java/modules/jaxws-api/pom.xml
webservices/axis2/trunk/java/modules/jaxws-api/project.xml
webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/spi/FactoryFinder.java
Modified: webservices/axis2/trunk/java/modules/jaxws-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-api/pom.xml?view=diff&rev=504303&r1=504302&r2=504303
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-api/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-api/pom.xml Tue Feb 6 13:31:12 2007
@@ -35,10 +35,15 @@
<url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-api</url>
</scm>
<dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-kernel</artifactId>
- </dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj-api</artifactId>
Modified: webservices/axis2/trunk/java/modules/jaxws-api/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-api/project.xml?view=diff&rev=504303&r1=504302&r2=504303
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-api/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-api/project.xml Tue Feb 6 13:31:12 2007
@@ -84,11 +84,6 @@
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxbri.version}</version>
Modified: webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/spi/FactoryFinder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/spi/FactoryFinder.java?view=diff&rev=504303&r1=504302&r2=504303
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/spi/FactoryFinder.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/spi/FactoryFinder.java Tue Feb 6 13:31:12 2007
@@ -15,6 +15,9 @@
*/
package javax.xml.ws.spi;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -25,10 +28,6 @@
import java.security.PrivilegedAction;
import java.util.Properties;
-import org.apache.axis2.java.security.AccessController;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* This code is designed to implement the pluggability
* feature and is designed to both compile and run on JDK version 1.1 and
@@ -66,7 +65,7 @@
// the caller already has a doPriv. I added the doPriv in case someone changes the
// visibility of this method to non-private.
ClassLoader cl = (ClassLoader)
- AccessController.doPrivileged( new PrivilegedAction() {
+ doPrivileged( new PrivilegedAction() {
public Object run() {
Method m = null;
@@ -121,7 +120,7 @@
// the caller already has a doPriv. I added the doPriv in case someone changes the
// visibility of this method to non-private.
Object obj =
- AccessController.doPrivileged( new PrivilegedAction() {
+ doPrivileged( new PrivilegedAction() {
public Object run() {
try {
if (iClassLoader != null) {
@@ -164,7 +163,7 @@
final String iFallbackClassName = fallbackClassName;
Object obj =
- AccessController.doPrivileged( new PrivilegedAction() {
+ doPrivileged( new PrivilegedAction() {
public Object run() {
debugPrintln("debug is on");
@@ -257,6 +256,15 @@
}
});
return obj;
+ }
+
+ private static Object doPrivileged(PrivilegedAction action) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null) {
+ return(action.run());
+ } else {
+ return java.security.AccessController.doPrivileged(action);
+ }
}
static class ConfigurationError extends Error {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org