pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/apache/axis-axis2-java-core/commit/ea57ea464ef742e2da65932917d4e5ed23df0251

Completing AXIOM refactoring. · apache/axis-axis2-java-core@ea57ea4 · GitHub
Skip to content

Commit ea57ea4

Browse files
author
Eran Chinthaka
committed
Completing AXIOM refactoring.
1 parent efd1e6b commit ea57ea4

File tree

279 files changed

+12599
-21808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+12599
-21808
lines changed

etc/project.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
<siteDirectory>/www/ws.apache.org/axis2/</siteDirectory>
4747
<distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>
4848
<!-- repository>
49-
<connection>scm|svn|http://svn.apache.org/repos/asf/webservices/axis/trunk</connection>
50-
<developerConnection>scm|svn|https://svn.apache.org/repos/asf/webservices/axis/trunk</developerConnection>
51-
<url>http://svn.apache.org/viewcvs.cgi/webservices/axis/trunk/?root=Apache-SVN</url>
49+
<connection>scm|svn|http://svn.apache.org/repos/asf/webservices/axis2/trunk</connection>
50+
<developerConnection>scm|svn|https://svn.apache.org/repos/asf/webservices/axis2/trunk</developerConnection>
51+
<url>http://svn.apache.org/viewcvs.cgi/webservices/axis2/trunk/?root=Apache-SVN</url>
5252
</repository -->
5353
<mailingLists>
5454
<mailingList>

modules/adb/src/org/apache/axis2/databinding/Constants.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public class Constants {
4040
public static final String NS_PREFIX_XML = "xml";
4141

4242
// Axis Namespaces
43-
public static final String NS_URI_AXIS = "http://xml.apache.org/axis/";
43+
public static final String NS_URI_AXIS = "http://xml.apache.org/axis2/";
4444
public static final String NS_URI_XMLSOAP = "http://xml.apache.org/xml-soap";
4545

4646
// Special namespace URI to indicate an "automatically" serialized Java
4747
// type. This allows us to use types without needing explicit mappings,
4848
// such that Java classes like "org.foo.Bar" map to QNames like
49-
// {http://xml.apache.org/axis/java}org.foo.Bar
50-
public static final String NS_URI_JAVA = "http://xml.apache.org/axis/java";
49+
// {http://xml.apache.org/axis2/java}org.foo.Bar
50+
public static final String NS_URI_JAVA = "http://xml.apache.org/axis2/java";
5151

5252

5353
//
@@ -70,17 +70,17 @@ public class Constants {
7070
// The enterprise category is for stuff that an enterprise product might
7171
// want to track, but in a simple environment (like the AXIS build) would
7272
// be nothing more than a nuisance.
73-
public static final String ENTERPRISE_LOG_CATEGORY = "org.apache.axis.enterprise";
73+
public static final String ENTERPRISE_LOG_CATEGORY = "org.apache.axis2.enterprise";
7474

7575
/**
7676
* Time logged stuff.
7777
*/
78-
public static final String TIME_LOG_CATEGORY = "org.apache.axis.TIME";
78+
public static final String TIME_LOG_CATEGORY = "org.apache.axis2.TIME";
7979

8080
/**
8181
* Servlet exceptions. Axis faults are logged at debug level here.
8282
*/
83-
public static final String EXCEPTION_LOG_CATEGORY = "org.apache.axis.EXCEPTIONS";
83+
public static final String EXCEPTION_LOG_CATEGORY = "org.apache.axis2.EXCEPTIONS";
8484

8585
/** The name of the field which accepts xsd:any content in Beans. */
8686
public static final String ANYCONTENT = "_any";
@@ -90,7 +90,7 @@ public class Constants {
9090
public static final int HTTP_TXR_BUFFER_SIZE = 8 * 1024;
9191

9292
/** Basic Profile 1.1 compatibility flag */
93-
public static final String WSIBP11_COMPAT_PROPERTY = "axis.ws-i.bp11.compatibility";
93+
public static final String WSIBP11_COMPAT_PROPERTY = "axis2.ws-i.bp11.compatibility";
9494

9595
/**
9696
* Returns true if the string is the SOAP_ENV namespace.
@@ -597,12 +597,12 @@ public static boolean isWSDLSOAP(String s) {
597597
public static final QName QNAME_RPC_RESULT = new QName(URI_SOAP12_RPC,"result");
598598

599599
/**
600-
* QName of stack trace element in an axis fault detail.
600+
* QName of stack trace element in an axis2 fault detail.
601601
*/
602602
public static final QName QNAME_FAULTDETAIL_STACKTRACE = new QName(NS_URI_AXIS,"stackTrace");
603603

604604
/**
605-
* QName of exception name element in an axis fault detail.
605+
* QName of exception name element in an axis2 fault detail.
606606
* Do not use - this is for pre-1.0 server->client exceptions.
607607
*/
608608
public static final QName QNAME_FAULTDETAIL_EXCEPTIONNAME = new QName(NS_URI_AXIS, "exceptionName");
@@ -614,17 +614,17 @@ public static boolean isWSDLSOAP(String s) {
614614
public static final QName QNAME_FAULTDETAIL_RUNTIMEEXCEPTION = new QName(NS_URI_AXIS, "isRuntimeException");
615615

616616
/**
617-
* QName of HTTP Error code element in an axis fault detail.
617+
* QName of HTTP Error code element in an axis2 fault detail.
618618
*/
619619
public static final QName QNAME_FAULTDETAIL_HTTPERRORCODE = new QName(NS_URI_AXIS, "HttpErrorCode");
620620

621621
/**
622-
* QName of a nested fault in an axis fault detail.
622+
* QName of a nested fault in an axis2 fault detail.
623623
*/
624624
public static final QName QNAME_FAULTDETAIL_NESTEDFAULT = new QName(NS_URI_AXIS, "nestedFault");
625625

626626
/**
627-
* QName of a hostname in an axis fault detail.
627+
* QName of a hostname in an axis2 fault detail.
628628
*/
629629
public static final QName QNAME_FAULTDETAIL_HOSTNAME = new QName(NS_URI_AXIS, "hostname");
630630

@@ -643,7 +643,7 @@ public static boolean isWSDLSOAP(String s) {
643643
// Where we're rooted
644644
public static final String MC_HOME_DIR = "home.dir";
645645

646-
// Relative path of the request URL (ie. http://.../axis/a.jws = /a.jws
646+
// Relative path of the request URL (ie. http://.../axis2/a.jws = /a.jws
647647
public static final String MC_RELATIVE_PATH = "path";
648648

649649
// MessageContext param for the engine's path
@@ -656,15 +656,15 @@ public static boolean isWSDLSOAP(String s) {
656656
// ServletEndpointContext object. This is where it lives.
657657
public static final String MC_SERVLET_ENDPOINT_CONTEXT = "servletEndpointContext";
658658

659-
// If we're SOAP 1.2, the default behavior in org.apache.axis.message.BodyBuilder
659+
// If we're SOAP 1.2, the default behavior in org.apache.axis2.message.BodyBuilder
660660
// is to throw a ProcedureNotPresent fault if we can't dispatch to an
661661
// OperationDesc during deserialization. Set this property to any non-null
662662
// value to prevent this behavior (only used by test.soap12.
663663
public static final String MC_NO_OPERATION_OK = "NoOperationOK";
664664

665665
// This property indicates we're supporting only a single SOAP version.
666666
// If set (by the service or engine), we'll only accept envelopes of the
667-
// specified version. Value should be an org.apache.axis.soap.SOAPConstants
667+
// specified version. Value should be an org.apache.axis2.soap.SOAPConstants
668668
public static final String MC_SINGLE_SOAP_VERSION = "SingleSOAPVersion";
669669

670670
/**

modules/adb/src/org/apache/axis2/databinding/deserializers/SimpleDeserializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ private Object makeBasicValue(String source) throws Exception {
228228
}
229229

230230
/*
231-
if (javaType == org.apache.axis.types.URI.class) {
232-
return new org.apache.axis.types.URI(source);
231+
if (javaType == org.apache.axis2.types.URI.class) {
232+
return new org.apache.axis2.types.URI(source);
233233
}
234234
*/
235235

modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.axis2.databinding.utils.PrintEvents;
2121
import org.apache.ws.commons.om.OMAbstractFactory;
2222
import org.apache.ws.commons.om.OMElement;
23-
import org.apache.axis.om.DOOMAbstractFactory;
23+
import org.apache.axis2.om.DOOMAbstractFactory;
2424
import org.apache.ws.commons.soap.SOAP11Constants;
2525
import org.apache.ws.commons.soap.SOAPEnvelope;
2626
import org.apache.ws.commons.soap.impl.llom.builder.StAXSOAPModelBuilder;

modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AxisBindingBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class AxisBindingBuilder extends AbstractCodeGenerationExtension{
3838

3939
public static final QName AXIS_BINDING_QNAME = new QName(AXIS_NAMESPACE,
4040
"codeGenerationBinding",
41-
"axis");
41+
"axis2");
4242

4343

4444
public AxisBindingBuilder() {

modules/codegen/test-resources/wsat.wsdl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,16 +327,16 @@ Copyright 2001, 2002 BEA Systems and IBM Corporation and Microsoft Corporation.
327327
<wsdl:service name="xxx">
328328
<!--
329329
<wsdl:port binding="wsat:CompletionCoordinatorPortTypeBinding" name="CompletionCoordinator">
330-
<soap:address location="http://localhost:8081/axis/services/CompletionCoordinator"/>
330+
<soap:address location="http://localhost:8081/axis2/services/CompletionCoordinator"/>
331331
</wsdl:port>
332332
<wsdl:port binding="wsat:CompletionInitiatorPortTypeBinding" name="CompletionInitiator">
333-
<soap:address location="http://localhost:8081/axis/services/CompletionInitiator"/>
333+
<soap:address location="http://localhost:8081/axis2/services/CompletionInitiator"/>
334334
</wsdl:port>
335335
<wsdl:port binding="wsat:CoordinatorPortTypeBinding" name="Coordinator">
336-
<soap:address location="http://localhost:8081/axis/services/Coordinator"/>
336+
<soap:address location="http://localhost:8081/axis2/services/Coordinator"/>
337337
</wsdl:port>
338338
<wsdl:port binding="wsat:ParticipantPortTypeBinding" name="Participant">
339-
<soap:address location="http://localhost:8081/axis/services/Participant"/>
339+
<soap:address location="http://localhost:8081/axis2/services/Participant"/>
340340
</wsdl:port>
341341
-->
342342
<wsdl:port binding="wsat:ParticipantPortTypeRPCBinding" name="ParticipantRPC">

modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeQNamePopulateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
public class SimpleTypeQNamePopulateTest extends AbstractSimplePopulater{
1919
private String xmlString[] = {
2020
"<qNameParam>university</qNameParam>",
21-
"<qNameParam xmlns:ns1=\"http://ws.apache.org/axis\">ns1:axis</qNameParam>"
21+
"<qNameParam xmlns:ns1=\"http://ws.apache.org/axis2\">ns1:axis2</qNameParam>"
2222
//"<qNameParam>http://mail.google.com/mail/?auth=DQAAAHEAAAC041</qNameParam>"
2323
};
2424
// force others to implement this method

modules/common/src/org/apache/axis2/Version.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.apache.axis2.i18n.Messages;
2020

2121
/**
22-
* Little utility to get the version and build date of the axis.jar.
22+
* Little utility to get the version and build date of the axis2.jar.
2323
* <p/>
2424
* The messages referenced here are automatically kept up-to-date by the
2525
* build.xml.
@@ -28,7 +28,7 @@ public class Version {
2828
/**
2929
* Get the version of this AXIS.
3030
*
31-
* @return the version of this axis
31+
* @return the version of this axis2
3232
*/
3333
public static String getVersion() {
3434
return Messages.getMessage("axisVersion") + "\n" +
@@ -40,7 +40,7 @@ public static String getVersion() {
4040
* <p/>
4141
* Example output: 1.1 Jul 08, 2003 (09:00:12 EDT)
4242
*
43-
* @return the full version of this axis
43+
* @return the full version of this axis2
4444
*/
4545
public static String getVersionText() {
4646
return Messages.getMessage("axisVersionRaw") + " " + Messages.getMessage("axisBuiltOnRaw");
@@ -50,7 +50,7 @@ public static String getVersionText() {
5050
* Entry point.
5151
* <p/>
5252
* Calling this with no arguments returns the version of the client-side
53-
* axis.jar.
53+
* axis2.jar.
5454
*/
5555
public static void main(String[] args) {
5656
System.out.println(getVersion());

modules/common/src/org/apache/axis2/i18n/RB.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public RB(Object caller, String name, Locale locale) throws MissingResourceExcep
134134
} else {
135135
// Try the shared default properties file...
136136
if (name.indexOf("/") == -1) {
137-
name = "org/apache/axis/default-resource";
137+
name = "org/apache/axis2/default-resource";
138138
}
139139
}
140140

modules/core/src/org/apache/axis2/client/Options.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
/**
3737
* The proposal related for this is here :
38-
* http://marc.theaimsgroup.com/?l=axis-dev&m=113320384108037&w=2 Client can
38+
* http://marc.theaimsgroup.com/?l=axis2-dev&m=113320384108037&w=2 Client can
3939
* fill this options and give to any class extending from MEPClient. All those
4040
* classes will be getting parameters using this.
4141
*/

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.





Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy