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 de...@apache.org on 2006/03/22 09:41:49 UTC
svn commit: r387798 - in /webservices/axis2/trunk/java: etc/
modules/core/src/org/apache/axis2/deployment/
modules/core/src/org/apache/axis2/deployment/util/
modules/samples/src/userguide/clients/
modules/samples/src/userguide/example3/META-INF/
Author: deepal
Date: Wed Mar 22 00:41:47 2006
New Revision: 387798
URL: http://svn.apache.org/viewcvs?rev=387798&view=rev
Log:
- changed 0.95 SNAPSHOT into 0.95
- fixing sample problems
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
webservices/axis2/trunk/java/modules/samples/src/userguide/example3/META-INF/services.xml
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=387798&r1=387797&r2=387798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Wed Mar 22 00:41:47 2006
@@ -19,10 +19,14 @@
# Project Information
# -------------------------------------------------------------------
version_number=0.95
-version_affix=SNAPSHOT
-axis2_version=${version_number}-${version_affix}
-addressing_version=${version_number}-${version_affix}
-security_version=${version_number}-${version_affix}
+#version_affix=SNAPSHOT
+axis2_version=${version_number}
+addressing_version=${version_number}
+security_version=${version_number}
+
+#axis2_version=${version_number}-${version_affix}
+#addressing_version=${version_number}-${version_affix}
+#security_version=${version_number}-${version_affix}
# -------------------------------------------------------------------
# Dependency Repositories
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=387798&r1=387797&r2=387798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Wed Mar 22 00:41:47 2006
@@ -514,6 +514,7 @@
new RepositoryListener(this);
org.apache.axis2.util.Utils.calculateDefaultModuleVersion(
axisConfig.getModules(), axisConfig);
+ validateSystemPredefinedPhases();
return axisConfig;
} else if (axis2repository != null) {
InputStream in;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java?rev=387798&r1=387797&r2=387798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java Wed Mar 22 00:41:47 2006
@@ -157,7 +157,7 @@
String serviceClass = (String) implInfoParam.getValue();
ClassLoader serviceClassLoader = axisService.getClassLoader();
SchemaGenerator schemaGenerator = new SchemaGenerator(serviceClassLoader,
- serviceClass, axisService.getSchematargetNamespace(),
+ serviceClass.trim(), axisService.getSchematargetNamespace(),
axisService.getSchematargetNamespacePrefix());
axisService.setSchema(schemaGenerator.generateSchema());
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java?rev=387798&r1=387797&r2=387798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java Wed Mar 22 00:41:47 2006
@@ -28,6 +28,7 @@
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
+import javax.xml.namespace.QName;
import java.io.StringWriter;
/**
@@ -71,6 +72,7 @@
//Non-Blocking Invocation
ServiceClient sender = new ServiceClient();
+ sender.engageModule(new QName(Constants.MODULE_ADDRESSING));
sender.setOptions(options);
sender.sendReceiveNonBlocking(payload, callback);
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/example3/META-INF/services.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/example3/META-INF/services.xml?rev=387798&r1=387797&r2=387798&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/example3/META-INF/services.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/example3/META-INF/services.xml Wed Mar 22 00:41:47 2006
@@ -3,8 +3,7 @@
<description>
Sample to via WSA Mapping
</description>
- <parameter name="ServiceClass" locked="false">
- userguide.example3.MyService</parameter>
+ <parameter name="ServiceClass" locked="false">userguide.example3.MyService</parameter>
<operation name="echo">
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>