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 ch...@apache.org on 2005/12/10 20:46:05 UTC
svn commit: r355769 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/client/ extensions/ extensions/src/
extensions/test/
Author: chinthaka
Date: Sat Dec 10 11:45:57 2005
New Revision: 355769
URL: http://svn.apache.org/viewcvs?rev=355769&view=rev
Log:
- More cleaning up.
- Adding a maven module to contain extensions like modules, useful services, etc., (arghh !! yet another maven module :( )
Added:
webservices/axis2/trunk/java/modules/extensions/
webservices/axis2/trunk/java/modules/extensions/project.properties
webservices/axis2/trunk/java/modules/extensions/project.xml
webservices/axis2/trunk/java/modules/extensions/src/
webservices/axis2/trunk/java/modules/extensions/test/
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java?rev=355769&r1=355768&r2=355769&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java Sat Dec 10 11:45:57 2005
@@ -45,7 +45,7 @@
* @param configurationContext
* @throws AxisFault
*/
- public static synchronized final void makeSureStarted(String transport,
+ public static synchronized void makeSureStarted(String transport,
ConfigurationContext configurationContext)
throws AxisFault {
// If this config context is in the map, that means we already have a listener for that
@@ -74,7 +74,7 @@
tsState.waitingCalls++;
}
- public static synchronized final void stop(ConfigurationContext configurationContext, String transport) throws AxisFault {
+ public static synchronized void stop(ConfigurationContext configurationContext, String transport) throws AxisFault {
HashMap listeners = (HashMap) configurationContextMap.get(configurationContext);
if (listeners != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java?rev=355769&r1=355768&r2=355769&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java Sat Dec 10 11:45:57 2005
@@ -29,7 +29,11 @@
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.*;
+import org.apache.axis2.soap.SOAP11Constants;
+import org.apache.axis2.soap.SOAP12Constants;
+import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.util.UUIDGenerator;
import javax.xml.namespace.QName;
@@ -48,6 +52,7 @@
* Client will pass all the parameters to this invocation using this.
*/
protected Options clientOptions;
+ private static final String ANONYMOUS_SERVICE = "AnonymousService";
public MEPClient(ServiceContext service, String mep) {
this.serviceContext = service;
@@ -257,15 +262,15 @@
/**
* Assumes the values for the ConfigurationContext and ServiceContext to make the NON WSDL cases simple.
*
- * @throws org.apache.axis2.AxisFault
+ * @throws AxisFault
*/
protected void assumeServiceContext(String clientHome)
throws AxisFault {
ConfigurationContext configurationContext =
new ConfigurationContextFactory().buildClientConfigurationContext(clientHome);
- QName assumedServiceName = new QName("AnonymousService");
- AxisService axisService = configurationContext.getAxisConfiguration().getService("AnonymousService");
+ QName assumedServiceName = new QName(ANONYMOUS_SERVICE);
+ AxisService axisService = configurationContext.getAxisConfiguration().getService(ANONYMOUS_SERVICE);
if (axisService == null) {
//we will assume a Service and operations
axisService = new AxisService(assumedServiceName);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java?rev=355769&r1=355768&r2=355769&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java Sat Dec 10 11:45:57 2005
@@ -120,7 +120,7 @@
AxisService axisService = serviceContext.getAxisService();
AxisConfiguration axisConfiguration = serviceContext.getConfigurationContext().getAxisConfiguration();
- PhasesInfo info = ((AxisConfiguration) axisConfiguration).getPhasesInfo();
+ PhasesInfo info = axisConfiguration.getPhasesInfo();
//to set the operation flows
if (info != null) {
info.setOperationPhases(axisOperationTemplate);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java?rev=355769&r1=355768&r2=355769&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java Sat Dec 10 11:45:57 2005
@@ -256,7 +256,7 @@
* Sets the transport to be used for sending the SOAP Message
*
* @param senderTransport
- * @throws org.apache.axis2.AxisFault if the transport is not found
+ * @throws AxisFault if the transport is not found
*/
public void setSenderTransport(String senderTransport, AxisConfiguration axisConfiguration) throws AxisFault {
this.senderTransport =
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java?rev=355769&r1=355768&r2=355769&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java Sat Dec 10 11:45:57 2005
@@ -29,7 +29,7 @@
super();
}
- public RESTCall(ServiceContext service) throws AxisFault {
+ public RESTCall(ServiceContext service) {
super(service);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java?rev=355769&r1=355768&r2=355769&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Stub.java Sat Dec 10 11:45:57 2005
@@ -64,10 +64,10 @@
protected Stub() {
}
- public void _setSessionInfo(String key, Object value) throws java.lang.Exception {
+ public void _setSessionInfo(String key, Object value) throws Exception {
if (!_maintainSession) {
//TODO Comeup with a Exception
- throw new java.lang.Exception(
+ throw new Exception(
"Client is running the session OFF mode: Start session before saving to a session ");
}
_configurationContext.getServiceContext(_currentSessionId).setProperty(
@@ -75,10 +75,10 @@
}
- public Object _getSessionInfo(String key) throws java.lang.Exception {
+ public Object _getSessionInfo(String key) throws Exception {
if (!_maintainSession) {
//TODO Comeup with a Exception
- throw new java.lang.Exception(
+ throw new Exception(
"Client is running the session OFF mode: Start session before saving to a session ");
}
return _configurationContext.getServiceContext(_currentSessionId)
Added: webservices/axis2/trunk/java/modules/extensions/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/extensions/project.properties?rev=355769&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/extensions/project.properties (added)
+++ webservices/axis2/trunk/java/modules/extensions/project.properties Sat Dec 10 11:45:57 2005
@@ -0,0 +1,17 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+maven.multiproject.type=jar
Added: webservices/axis2/trunk/java/modules/extensions/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/extensions/project.xml?rev=355769&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/extensions/project.xml (added)
+++ webservices/axis2/trunk/java/modules/extensions/project.xml Sat Dec 10 11:45:57 2005
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+
+ <name>Apache Axis 2.0 - Extensions</name>
+ <id>axis2-extensions</id>
+ <groupId>axis2</groupId>
+ <description>Extensions for Apache Axis2. This will include some cool modules, useful services, etc.,</description>
+
+ <dependencies>
+ <!-- external JARs -->
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-wsdl</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>${axis.wsdl4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
+ <sourceDirectory>src</sourceDirectory>
+ <unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+ <sourceModifications>
+ <sourceModification>
+ <className>fakeClass</className>
+ <excludes>
+ <exclude>**/codegen/**/*.java</exclude>
+ <exclude>**/core/**/*.java</exclude>
+ <exclude>**/service/**/*.java</exclude>
+ </excludes>
+ </sourceModification>
+ </sourceModifications>
+
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <reports/>
+
+</project>