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 pr...@apache.org on 2008/01/24 14:56:18 UTC
svn commit: r614876 [2/2] - in /webservices/axis2/branches/java/jaxws21: ./
modules/addressing/src/org/apache/axis2/handlers/addressing/
modules/addressing/test/org/apache/axis2/handlers/addressing/
modules/clustering/ modules/clustering/src/org/apache...
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/DeployableChain.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/DeployableChain.java?rev=614876&r1=614875&r2=614876&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/DeployableChain.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/DeployableChain.java Thu Jan 24 05:56:07 2008
@@ -19,16 +19,14 @@
package org.apache.axis2.engine;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
import java.util.Collection;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* A DeployableChain is a container which manages dependencies between Deployables. You
@@ -43,10 +41,10 @@
Deployable last;
/** A Map of name -> List (of Strings). Each List contains the key's successors */
- Map activeConstraints = new HashMap();
+ Map activeConstraints = new LinkedHashMap();
/** A Map of name -> Deployable for all deployed items */
- private Map deployed = new HashMap();
+ private Map deployed = new LinkedHashMap();
/**
* Deploy a Deployable into this chain. Note that this does NOT order yet. The idea
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java?rev=614876&r1=614875&r2=614876&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java Thu Jan 24 05:56:07 2008
@@ -30,6 +30,8 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.engine.MessageReceiver;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
@@ -39,6 +41,9 @@
* the related messages and makes a call to the appropriate callback.
*/
public class CallbackReceiver implements MessageReceiver {
+
+ private static final Log log = LogFactory.getLog(CallbackReceiver.class);
+
public static String SERVICE_NAME = "ClientService";
private ConcurrentHashMap callbackStore;
@@ -48,14 +53,18 @@
public void addCallback(String MsgID, Callback callback) {
callbackStore.put(MsgID, callback);
+ if (log.isDebugEnabled()) log.debug("CallbackReceiver: add callback " + MsgID + ", " + callback + " ," + this);
}
public void addCallback(String msgID, AxisCallback callback) {
callbackStore.put(msgID, callback);
+ if (log.isDebugEnabled()) log.debug("CallbackReceiver: add callback " + msgID + ", " + callback + " ," + this);
}
public Object lookupCallback(String msgID) {
- return callbackStore.remove(msgID);
+ Object o = callbackStore.remove(msgID);
+ if (log.isDebugEnabled()) log.debug("CallbackReceiver: lookup callback " + msgID + ", " + o + " ," + this);
+ return o;
}
public void receive(MessageContext msgContext) throws AxisFault {
@@ -66,7 +75,7 @@
String messageID = relatesTO.getValue();
Object callbackObj = callbackStore.remove(messageID);
-
+ if (log.isDebugEnabled()) log.debug("CallbackReceiver: receive found callback " + callbackObj + ", " + messageID + ", " + this + ", " + msgContext.getAxisOperation());
if (callbackObj == null) {
throw new AxisFault("The Callback for MessageID " + messageID + " was not found");
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java?rev=614876&r1=614875&r2=614876&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Thu Jan 24 05:56:07 2008
@@ -807,7 +807,11 @@
// Look for the WSDL file as follows:
// 1) As a resource on the classpath
- URL url = composite.getClassLoader().getResource(wsdlLocation);
+ ClassLoader loader = composite.getClassLoader();
+ URL url = null;
+ if (loader != null) {
+ url = loader.getResource(wsdlLocation);
+ }
// 2) As a fully specified URL
if (url == null) {
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/feature/ServerFramework.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/feature/ServerFramework.java?rev=614876&r1=614875&r2=614876&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/feature/ServerFramework.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/feature/ServerFramework.java Thu Jan 24 05:56:07 2008
@@ -41,7 +41,6 @@
}
public void addConfigurator(String id, ServerConfigurator configurator) {
- System.out.println("[" + id + "], " + configurator.toString());
configuratorMap.put(id, configurator);
}
@@ -55,8 +54,6 @@
String id = null;
if (wsfAnnotation != null)
id = wsfAnnotation.id();
-
- System.out.println("[" + id + "]");
return configuratorMap.containsKey(id);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml?rev=614876&r1=614875&r2=614876&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml Thu Jan 24 05:56:07 2008
@@ -1018,6 +1018,12 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axis2/branches/java/jaxws21/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/pom.xml?rev=614876&r1=614875&r2=614876&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/pom.xml Thu Jan 24 05:56:07 2008
@@ -249,6 +249,12 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org