svn commit: r921460 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Version.java
Author: amilas
Date: Wed Mar 10 17:24:50 2010
New Revision: 921460
URL: http://svn.apache.org/viewvc?rev=921460&view=rev
Log:
adding support to module files ending with .SNAPSHOT
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Version.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Version.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Version.java?rev=921460&r1=921459&r2=921460&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Version.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Version.java
Wed Mar 10 17:24:50 2010
@@ -65,6 +65,9 @@ public class Version implements Serializ
if (dashIndex != -1) {
qualifier = versionString.substring(dashIndex + 1);
versionString = versionString.substring(0, dashIndex);
+} else if (versionString.endsWith(".SNAPSHOT")){
+qualifier = "SNAPSHOT";
+versionString =
versionString.substring(0,versionString.indexOf(".SNAPSHOT"));
} else {
qualifier = null;
}
svn commit: r921527 - /axis/axis2/java/transports/trunk/LICENSE.txt
Author: nagy Date: Wed Mar 10 19:43:16 2010 New Revision: 921527 URL: http://svn.apache.org/viewvc?rev=921527&view=rev Log: Added Apache License Added: axis/axis2/java/transports/trunk/LICENSE.txt (with props) Added: axis/axis2/java/transports/trunk/LICENSE.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/LICENSE.txt?rev=921527&view=auto == --- axis/axis2/java/transports/trunk/LICENSE.txt (added) +++ axis/axis2/java/transports/trunk/LICENSE.txt Wed Mar 10 19:43:16 2010 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to
svn commit: r921685 - in /axis/axis2/java/core/trunk/modules: integration/test/org/apache/axis2/engine/ kernel/src/org/apache/axis2/client/ kernel/src/org/apache/axis2/context/ kernel/src/org/apache/a
Author: amilas
Date: Thu Mar 11 04:21:41 2010
New Revision: 921685
URL: http://svn.apache.org/viewvc?rev=921685&view=rev
Log:
removing ListnerManager.defaultConfigurationContext and use the
MessageConget.getCurrentMessageContext
inorder to get the configuration context for clients running inside the axis2
server
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
axis/axis2/java/core/trunk/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiConfigurationContextFactory.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java?rev=921685&r1=921684&r2=921685&view=diff
==
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java
Thu Mar 11 04:21:41 2010
@@ -329,12 +329,7 @@ public class OperationContextSaveTest ex
assertTrue(comparesOk);
ServiceContext restored_srvCtx =
opctx_restored.getServiceContext();
-comparesOk = restored_srvCtx.isEquivalent(serviceContext);
-log.debug(
-"OperationContextSaveTest:testSaveAndRestore():
ServiceContext equivalency [" +
-comparesOk + "]");
-assertTrue(comparesOk);
-
+
ServiceGroupContext restored_sgCtx =
restored_srvCtx.getServiceGroupContext();
comparesOk = restored_sgCtx.isEquivalent(serviceGroupContext);
log.debug(
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?rev=921685&r1=921684&r2=921685&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
Thu Mar 11 04:21:41 2010
@@ -147,13 +147,12 @@ public class ServiceClient {
private void configureServiceClient(ConfigurationContext configContext,
AxisService axisService)
throws AxisFault {
if (configContext == null) {
-if (ListenerManager.defaultConfigurationContext == null) {
+if (MessageContext.getCurrentMessageContext() == null) {
configContext = ConfigurationContextFactory.
createConfigurationContextFromFileSystem(null, null);
-ListenerManager.defaultConfigurationContext = configContext;
createConfigCtx = true;
} else {
-configContext = ListenerManager.defaultConfigurationContext;
+configContext =
MessageContext.getCurrentMessageContext().getConfigurationContext();
}
}
this.configContext = configContext;
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java?rev=921685&r1=921684&r2=921685&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
Thu Mar 11 04:21:41 2010
@@ -224,22 +224,6 @@ public class ServiceContext extends Abst
this.targetEPR = targetEPR;
}
-public EndpointReference getMyEPR() {
-if (myEPR == null) {
-try {
-if (ListenerManager.defaultConfigurationContext != null) {
-ListenerManager listenerManager =
-
ListenerManager.defaultConfigurationContext.getListenerManager();
-myEPR =
listenerManager.getEPRforService(axisService.getName(), null, null);
-}
-} catch (AxisFault axisFault) {
-// what else I can do
-
svn commit: r921694 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Author: amilas
Date: Thu Mar 11 05:19:48 2010
New Revision: 921694
URL: http://svn.apache.org/viewvc?rev=921694&view=rev
Log:
fixed issue AXIS2-4650
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=921694&r1=921693&r2=921694&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Thu Mar 11 05:19:48 2010
@@ -629,7 +629,7 @@ public class DefaultSchemaGenerator impl
throws Exception {
String propertyName;
if (isArrayType) {
-propertyName = type.getComponentType().getName();
+propertyName = getClassName(type.getComponentType());
if (type.getComponentType().isArray()) {
// this is a double array element
Class simpleType = type.getComponentType();
@@ -689,7 +689,7 @@ public class DefaultSchemaGenerator impl
return;
}
} else {
-propertyName = type.getName();
+propertyName = getClassName(type);
}
if (isArrayType && "byte".equals(propertyName)) {
propertyName = "base64Binary";
