svn commit: r1055352 - in /axis/axis2/java/rampart/branches/1_5_x/modules: rampart-mar/pom.xml rampart-trust-mar/pom.xml
Author: shankar
Date: Wed Jan 5 08:29:13 2011
New Revision: 1055352
URL: http://svn.apache.org/viewvc?rev=1055352&view=rev
Log:
Removing contradicting releaseManagement properties
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055352&r1=1055351&r2=1055352&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Wed Jan
5 08:29:13 2011
@@ -106,47 +106,4 @@
-
-
-apache-m2
-Apache M2 Repository
-
http://people.apache.org/repo/m2-ibiblio-rsync-repository
-default
-
-false
-daily
-ignore
-
-
-true
-
-
-
-apache-snapshots
-Apache Snapshots Repository
-http://people.apache.org/repo/m2-snapshot-repository
-default
-
-true
-daily
-ignore
-
-
-false
-
-
-
-
-
-apache-repo
-Maven Central Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
-
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
-false
-
-
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml?rev=1055352&r1=1055351&r2=1055352&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
Wed Jan 5 08:29:13 2011
@@ -83,48 +83,4 @@
${pom.version}
-
-
-
-apache-m2
-Apache M2 Repository
-
http://people.apache.org/repo/m2-ibiblio-rsync-repository
-default
-
-false
-daily
-ignore
-
-
-true
-
-
-
-apache-snapshots
-Apache Snapshots Repository
-http://people.apache.org/repo/m2-snapshot-repository
-default
-
-true
-daily
-ignore
-
-
-false
-
-
-
-
-
-apache-repo
-Maven Central Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
-
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
-false
-
-
svn commit: r1055354 - /axis/axis2/java/rampart/tags/v1.5.1/
Author: shankar Date: Wed Jan 5 08:37:52 2011 New Revision: 1055354 URL: http://svn.apache.org/viewvc?rev=1055354&view=rev Log: Removing 1.5.1 tag to recreate it Removed: axis/axis2/java/rampart/tags/v1.5.1/
svn commit: r1055360 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa
Author: shankar Date: Wed Jan 5 08:52:06 2011 New Revision: 1055360 URL: http://svn.apache.org/viewvc?rev=1055360&view=rev Log: [maven-release-plugin] prepare release v1.5.1 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_5_x/pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Wed Jan 5 08:52:06 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1 ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Wed Jan 5 08:52:06 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1 ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Wed Jan 5 08:52:06 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1 ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml Wed Jan 5 08:52:06 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1 ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Wed Jan 5 08:52:06 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.2-SNAPSHOT +1.5.1 ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1 - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1 - http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x + http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff
svn commit: r1055361 - /axis/axis2/java/rampart/tags/v1.5.1/
Author: shankar Date: Wed Jan 5 08:52:22 2011 New Revision: 1055361 URL: http://svn.apache.org/viewvc?rev=1055361&view=rev Log: [maven-scm] copy for tag v1.5.1 Added: axis/axis2/java/rampart/tags/v1.5.1/ - copied from r1055360, axis/axis2/java/rampart/branches/1_5_x/
svn commit: r1055362 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa
Author: shankar Date: Wed Jan 5 08:52:34 2011 New Revision: 1055362 URL: http://svn.apache.org/viewvc?rev=1055362&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml axis/axis2/java/rampart/branches/1_5_x/pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Wed Jan 5 08:52:34 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Wed Jan 5 08:52:34 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml 4.0.0 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Wed Jan 5 08:52:34 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml Wed Jan 5 08:52:34 2011 @@ -25,7 +25,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Wed Jan 5 08:52:34 2011 @@ -24,7 +24,7 @@ org.apache.rampart rampart-project -1.5.1 +1.5.2-SNAPSHOT ../../pom.xml @@ -35,11 +35,11 @@ Rampart - Mar - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1 + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1 + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x - http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1 + http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff
svn commit: r1055376 - in /axis/axis2/java/rampart/trunk/modules: rampart-mar/pom.xml rampart-trust-mar/pom.xml
Author: shankar
Date: Wed Jan 5 09:39:40 2011
New Revision: 1055376
URL: http://svn.apache.org/viewvc?rev=1055376&view=rev
Log:
Removing contradicting releaseManagement properties
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml?rev=1055376&r1=1055375&r2=1055376&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Wed Jan 5
09:39:40 2011
@@ -138,16 +138,11 @@
-
-
-apache-repo
-Maven Central Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
+
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
+apache.snapshots.https
+${distMgmtSnapshotsName}
+${distMgmtSnapshotsUrl}
false
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml?rev=1055376&r1=1055375&r2=1055376&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml Wed Jan 5
09:39:40 2011
@@ -117,15 +117,10 @@
-
-apache-repo
-Maven Central Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
+apache.snapshots.https
+${distMgmtSnapshotsName}
+${distMgmtSnapshotsUrl}
false
svn commit: r1055381 - in /axis/axis2/java/core/trunk/modules/kernel: src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java test-resources/wsdl/meps-wsdl11.wsdl test/org/apache/axis2/descri
Author: azeez
Date: Wed Jan 5 09:43:02 2011
New Revision: 1055381
URL: http://svn.apache.org/viewvc?rev=1055381&view=rev
Log:
Applying patch provided by Antonio Andrade for AXIS2-4090 -
https://issues.apache.org/jira/browse/AXIS2-4090
Added:
axis/axis2/java/core/trunk/modules/kernel/test-resources/wsdl/meps-wsdl11.wsdl
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/MessageExchangePatternsTest.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=1055381&r1=1055380&r2=1055381&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Wed Jan 5 09:43:02 2011
@@ -1490,7 +1490,7 @@ public class WSDL11ToAxisServiceBuilder
if (null != message) {
outMessage.setName(message.getQName().getLocalPart());
-
copyExtensionAttributes(wsdl4jInputMessage.getExtensionAttributes(),
+
copyExtensionAttributes(wsdl4jOutputMessage.getExtensionAttributes(),
outMessage,
PORT_TYPE_OPERATION_INPUT);
// wsdl:portType -> wsdl:operation -> wsdl:output
Added:
axis/axis2/java/core/trunk/modules/kernel/test-resources/wsdl/meps-wsdl11.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test-resources/wsdl/meps-wsdl11.wsdl?rev=1055381&view=auto
==
---
axis/axis2/java/core/trunk/modules/kernel/test-resources/wsdl/meps-wsdl11.wsdl
(added)
+++
axis/axis2/java/core/trunk/modules/kernel/test-resources/wsdl/meps-wsdl11.wsdl
Wed Jan 5 09:43:02 2011
@@ -0,0 +1,198 @@
+
+http://www.example.org";
+ xmlns:tns="http://www.example.org";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/";>
+
+
+Message Exchange Patterns
+
+
+
+http://www.example.org";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://schemas.xmlsoap.org/soap/http"; />
+
+ http://www.example.org/in-only";
+style="document" />
+
+
+
+
+
+ http://www.example.org/robust-in-only";
+style="document" />
+
+
+
+
+
+
+
+
+ http://www.example.org/in-out";
+style="document" />
+
+
+
+
+
+
+
+
+
+
+
+ http://www.example.org/out-only";
+style="document" />
+
+
+
+
+
+ http://www.example.org/robust-out-only";
+style="document" />
+
+
+
+
+
+
+
+
+ http://www.example.org/out-in";
+style="document" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://schemas.xmlsoap.org/soap/http"; />
+
+ http://www.example.org/in-only";
+style="document" />
+
+
+
+
+
+ http://www.example.org/robust-in-only";
+style="document" />
+
+
+
+
+
+
+
+
+ http://www.example.org/in-out";
+style="document" />
+
+
+
+
+
+
+
+
+
+
+
+ http://www.example.org/out-only";
+style="document" />
+
+
+
+
+
+ http://www.example.org/robust-out-only";
+style="document" />
+
+
+
+
+
+
+
+
+ http://www.example.org/out-in";
+style="document" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Message Exchange Patterns
+
+
+ http://www.example.org"; />
+
+
+ http://www.example.org"; />
+
+
+
+
Added:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/MessageExchangePatternsTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/MessageExchangePatter
svn commit: r1055388 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl: DefaultSchemaGenerator.java TypeTable.java
Author: amilas
Date: Wed Jan 5 09:57:41 2011
New Revision: 1055388
URL: http://svn.apache.org/viewvc?rev=1055388&view=rev
Log:
fixing the issue AXIS2-3444. Adding operation name wrapper in order to create a
unique element for the operation request
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.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=1055388&r1=1055387&r2=1055388&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
Wed Jan 5 09:57:41 2011
@@ -352,14 +352,18 @@ public class DefaultSchemaGenerator impl
parameterNames = methodTable.getParameterNames(methodName);
// put the parameter names to use it for parsing
service.addParameter(methodName, parameterNames);
-sequence = new XmlSchemaSequence();
-
-methodSchemaType = createSchemaTypeForMethodPart(methodName);
-methodSchemaType.setParticle(sequence);
-
inMessage.setElementQName(typeTable.getQNamefortheType(methodName));
-
service.addMessageElementQNameToOperationMapping(methodSchemaType.getQName(),
-axisOperation);
}
+
+// we need to add the method opration wrapper part even to
+// empty parameter operations
+sequence = new XmlSchemaSequence();
+methodSchemaType = createSchemaTypeForMethodPart(methodName);
+methodSchemaType.setParticle(sequence);
+
inMessage.setElementQName(typeTable.getQNamefortheType(methodName));
+
service.addMessageElementQNameToOperationMapping(methodSchemaType.getQName(),
+axisOperation);
+
+
Annotation[][] parameterAnnotation =
jMethod.getParameterAnnotations();
Type[] genericParameterTypes = jMethod.getGenericParameterTypes();
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java?rev=1055388&r1=1055387&r2=1055388&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
Wed Jan 5 09:57:41 2011
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.concurrent.ConcurrentHashMap;
+import java.net.URI;
public class TypeTable {
@@ -126,11 +127,10 @@ public class TypeTable {
new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "gYear",
"xs"));
simpleTypetoxsd.put("org.apache.axis2.databinding.types.YearMonth",
new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD,
"gYearMonth", "xs"));
+simpleTypetoxsd.put("java.lang.Object",ANY_TYPE);
-simpleTypetoxsd.put("java.lang.Object",
-ANY_TYPE);
+simpleTypetoxsd.put(URI.class.getName(), new
QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "anyURI", "xs"));
-// Any types
simpleTypetoxsd.put(OMElement.class.getName(),
ANY_TYPE);
simpleTypetoxsd.put(ArrayList.class.getName(),
svn commit: r1055390 - /axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl
Author: amilas Date: Wed Jan 5 09:58:30 2011 New Revision: 1055390 URL: http://svn.apache.org/viewvc?rev=1055390&view=rev Log: fixed the test case for AXIS2-3444 Modified: axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl Modified: axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl?rev=1055390&r1=1055389&r2=1055390&view=diff == --- axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl (original) +++ axis/axis2/java/core/trunk/modules/integration/test-resources/generics/generics.wsdl Wed Jan 5 09:58:30 2011 @@ -1,14 +1,7 @@ -http://schemas.xmlsoap.org/wsdl/"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; - xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; xmlns:ns1="http://org.apache.axis2/xsd"; - xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; - xmlns:ax21="http://generics.axis2.apache.org/xsd"; xmlns:ns="http://generics.axis2.apache.org"; - xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; - targetNamespace="http://generics.axis2.apache.org";> +http://schemas.xmlsoap.org/wsdl/"; xmlns:ns1="http://org.apache.axis2/xsd"; xmlns:ns="http://generics.axis2.apache.org"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:ax21="http://generics.axis2.apache.org/xsd"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://generics.axis2.apache.org";> -http://generics.axis2.apache.org/xsd"; attributeFormDefault="qualified" - elementFormDefault="qualified" targetNamespace="http://generics.axis2.apache.org";> +http://generics.axis2.apache.org/xsd"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://generics.axis2.apache.org";> http://generics.axis2.apache.org/xsd"/> @@ -39,18 +32,22 @@ - + - + + + + + + @@ -59,8 +56,7 @@ -http://generics.axis2.apache.org/xsd";> +http://generics.axis2.apache.org/xsd";> @@ -78,16 +74,18 @@ - - - - + + + + + + @@ -96,14 +94,14 @@ - - - - + + + + http://schemas.xmlsoap.org/soap/http"; style="document"/> @@ -122,8 +120,8 @@ - - + + @@ -131,8 +129,8 @@ - - + + @@ -158,8 +156,8 @@ - - + + @@ -167,8 +165,8 @@ - - + + @@ -194,8 +192,8 @@ - - + + @@ -203,8 +201,8 @@ - - + + @@ -224,4 +222,4 @@ http://localhost:8080/axis2/services/GenericService"/> - \ No newline at end of file +
svn commit: r1055403 - /axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/OperationReference.java
Author: azeez
Date: Wed Jan 5 10:38:15 2011
New Revision: 1055403
URL: http://svn.apache.org/viewvc?rev=1055403&view=rev
Log:
Oops... forgot to svn add a file when committing patch AXIS2-4090
Added:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/OperationReference.java
Added:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/OperationReference.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/OperationReference.java?rev=1055403&view=auto
==
---
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/OperationReference.java
(added)
+++
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/OperationReference.java
Wed Jan 5 10:38:15 2011
@@ -0,0 +1,65 @@
+package org.apache.axis2.description;
+
+import javax.xml.namespace.QName;
+
+/**
+ * This class is used to encapsulate WSDL operations information. It's used by
+ * other data-driven JUnit Test Classes that deal with
AxisOperations.
+ */
+class OperationReference {
+
+private String wsdlPath;
+private QName serviceName;
+private String portName;
+private QName operationName;
+
+public OperationReference() { }
+
+public OperationReference(String wsdlPath,
+ QName serviceName,
+ String portName,
+ QName operationName) {
+this.wsdlPath = wsdlPath;
+this.serviceName = serviceName;
+this.portName = portName;
+this.operationName = operationName;
+}
+
+public String getWsdlPath() {
+return wsdlPath;
+}
+
+public QName getServiceName() {
+return serviceName;
+}
+
+public String getPortName() {
+return portName;
+}
+
+public QName getOperationName() {
+return operationName;
+}
+
+public void setWsdlPath(String wsdlPath_) {
+wsdlPath = wsdlPath_;
+}
+
+public void setServiceName(QName serviceName_) {
+serviceName = serviceName_;
+}
+
+public void setPortName(String portName_) {
+portName = portName_;
+}
+
+public void setOperationName(QName operationName_) {
+operationName = operationName_;
+}
+
+public String toString() {
+return "serviceName:" + serviceName + "; portName:" + portName +
+"; operationName:" + operationName;
+}
+
+}
svn commit: r1055423 - /axis/axis2/java/core/trunk/src/site/xdoc/docs/builder-formatter.xml
Author: ruwan Date: Wed Jan 5 11:25:29 2011 New Revision: 1055423 URL: http://svn.apache.org/viewvc?rev=1055423&view=rev Log: Initial version of the builder formatter guide Added: axis/axis2/java/core/trunk/src/site/xdoc/docs/builder-formatter.xml Added: axis/axis2/java/core/trunk/src/site/xdoc/docs/builder-formatter.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/xdoc/docs/builder-formatter.xml?rev=1055423&view=auto == --- axis/axis2/java/core/trunk/src/site/xdoc/docs/builder-formatter.xml (added) +++ axis/axis2/java/core/trunk/src/site/xdoc/docs/builder-formatter.xml Wed Jan 5 11:25:29 2011 @@ -0,0 +1,82 @@ + + +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +http://www.w3.org/1999/xhtml";> + + +Supporting new/custom message types with MessageBuilder/Formatter + + +Supporting new/custom message types with MessageBuilder/Formatter +Axis2 provides extended support for new or custom message types. This is done with +using a extension point in the Axis2 architecture, called message builders and formatters. +In Axis2 a builder is responsible of building the MessageContext by looking at the raw message +transmitted and the formatter is responsible of the inverse of that, which is to serialize a +MessageContext to the wire transfer format. Let's create a +custom MessageBuilder/Formatter to add the support for a new message type. +Send your feedback or questions to: mailto:java-...@axis.apache.org?subject=[axis2]";>java-...@axis.apache.org. +( Subscription details are available on the Axis2 site.) +Kindly prefix subject with [Axis2]. +Contents + +New ContentType handling with a custom message builder and formatter + +Step1 : MessageBuilder implementation +Step2 : MessageFormatter implementation +Step3 : Register the builder and formatter with Axis2 +Step4 : Packaging builder and formatter +Step5 : Testing the new ContentType with the echo service + + + + +New ContentType handling with a custom message builder and formatter +Let's write a simple builder and formatter to add the support for a new content type + + +Step1 : MessageBuilder implementation + + + + + + + + + + + + + +Step2 : MessageFormatter implementation + + +Step3 : Register the builder and formatter with Axis2 + + +Step4 : Packaging builder and formatter + + +Step5 : Testing the new ContentType with the echo service + + +
svn commit: r1055433 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
Author: supun Date: Wed Jan 5 11:34:59 2011 New Revision: 1055433 URL: http://svn.apache.org/viewvc?rev=1055433&view=rev Log: fixing an constant name change in axis2 Modified: axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java Modified: axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java?rev=1055433&r1=1055432&r2=1055433&view=diff == --- axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java (original) +++ axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java Wed Jan 5 11:34:59 2011 @@ -277,7 +277,7 @@ public abstract class AbstractTransportL // There is a discrepency in what I thought, Axis2 spawns a nes threads to // send a message is this is TRUE - and I want it to be the other way -msgCtx.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.valueOf(!isNonBlocking)); +msgCtx.setProperty(MessageContext.CLIENT_API_NON_BLOCKING, Boolean.valueOf(!isNonBlocking)); // are these relevant? //msgCtx.setServiceGroupContextId(UUIDGenerator.getUUID());
svn commit: r1055743 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
Author: amilas
Date: Thu Jan 6 04:34:17 2011
New Revision: 1055743
URL: http://svn.apache.org/viewvc?rev=1055743&view=rev
Log:
throwing the exceptions if there any if method invocation fails fixing
AXIS2-3120
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java?rev=1055743&r1=1055742&r2=1055743&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
Thu Jan 6 04:34:17 2011
@@ -83,8 +83,7 @@ public class DependencyManager {
// We can not call classToLoad.getDeclaredMethed() , since there
// can be insatnce where mutiple services extends using one class
// just for init and other reflection methods
-Method method =
-null;
+Method method = null;
try {
method = classToLoad.getMethod(SERVICE_INIT_METHOD, new
Class[]{ServiceContext.class});
} catch (Exception e) {
@@ -96,11 +95,14 @@ public class DependencyManager {
try {
method.invoke(obj, new Object[]{serviceContext});
} catch (IllegalAccessException e) {
-log.info("Exception trying to call " + SERVICE_INIT_METHOD, e);
+log.error("Exception trying to call " + SERVICE_INIT_METHOD,
e);
+throw new AxisFault("Can not access the method ", e);
} catch (IllegalArgumentException e) {
-log.info("Exception trying to call " + SERVICE_INIT_METHOD, e);
+log.error("Exception trying to call " + SERVICE_INIT_METHOD,
e);
+throw new AxisFault(" Incorrect arguments ", e);
} catch (InvocationTargetException e) {
-log.info("Exception trying to call " + SERVICE_INIT_METHOD, e);
+log.error("Exception trying to call " + SERVICE_INIT_METHOD,
e);
+throw new AxisFault(" problem in invocation the method ", e);
}
}
}
svn commit: r1055748 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Author: isurues
Date: Thu Jan 6 04:54:30 2011
New Revision: 1055748
URL: http://svn.apache.org/viewvc?rev=1055748&view=rev
Log:
removing the logic to detect undeployable folders in the deployer which has
become outdated with the hierarchical services model. That is because, it
searches recursively for services..
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?rev=1055748&r1=1055747&r2=1055748&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Thu Jan 6 04:54:30 2011
@@ -314,7 +314,7 @@ public class RepositoryListener implemen
}
/**
- * Searches a given folder for jar files and adds them to a list in the
WSInfolist class.
+ * Searches a given folder for aar files and adds them to a list in the
WSInfolist class.
* If sub folders found, those are also searched for services.
* Ex : repository/services/foo/1.0.0/echo.aar
* repository/services/foo/1.0.1/echo.aar
@@ -330,11 +330,6 @@ public class RepositoryListener implemen
File[] files = root.listFiles();
if (files != null && files.length > 0) {
-/**
- * This undeployableDir flag is used to check whether this folder
(root) doesn't contain
- * any deployable artifacts.
- */
-boolean undeployableDir = true;
for (File file : files) {
if (isSourceControlDir(file)) {
continue;
@@ -353,13 +348,11 @@ public class RepositoryListener implemen
} else {
findServicesInDirectory(file);
}
-undeployableDir = false;
}
} else {
if
(DeploymentFileData.isServiceArchiveFile(file.getName())) {
addFileToDeploy(file,
deploymentEngine.getServiceDeployer(),
WSInfo.TYPE_SERVICE);
-undeployableDir = false;
} else {
String ext =
DeploymentFileData.getFileExtension(file.getName());
Deployer deployer =
deploymentEngine.getDeployerForExtension(ext);
@@ -368,15 +361,10 @@ public class RepositoryListener implemen
if (deployer != null) {
deployer.setDirectory(deploymentEngine.getServicesDir().getName());
addFileToDeploy(file, deployer,
WSInfo.TYPE_SERVICE);
-undeployableDir = false;
}
}
}
}
-if (!servicesDir && undeployableDir) {
-
log.error(Messages.getMessage(DeploymentErrorMsgs.SERVICE_XML_NOT_FOUND,
-root.getName()));
-}
}
}
svn commit: r1055749 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Author: prabath
Date: Thu Jan 6 05:04:34 2011
New Revision: 1055749
URL: http://svn.apache.org/viewvc?rev=1055749&view=rev
Log:
Fix for https://issues.apache.org/jira/browse/AXIS2-4248
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=1055749&r1=1055748&r2=1055749&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
Thu Jan 6 05:04:34 2011
@@ -1,5 +1,4 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
+/*Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
@@ -15,7 +14,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.axis2.util;
@@ -355,6 +354,21 @@ public class MessageContextBuilder {
// now add HTTP Headers
faultContext.setProperty(HTTPConstants.HTTP_HEADERS,
processingContext.getProperty(HTTPConstants.HTTP_HEADERS));
+
+// Set wsa:Action for fault message
+// Use specified value if available
+ AxisOperation axisOperation =
processingContext.getAxisOperation();
+ if ((axisOperation != null) && (axisOperation.getOutputAction()
!= null)) {
+
faultContext.setWSAAction(axisOperation.getOutputAction());
+ } else {
+ // If not, simply copy the request value. Almost always
invalid.
+
faultContext.setWSAAction(processingContext.getWSAAction());
+ }
+
+ if (axisOperation != null && !(axisOperation instanceof
InOnlyAxisOperation)){
+
faultContext.setAxisMessage(axisOperation
+
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE));
+}
//setting the out bound binding message
AxisBindingMessage inboundAxisBindingMessage
svn commit: r1055758 - /axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/httpbase.jsp
Author: azeez
Date: Thu Jan 6 06:36:40 2011
New Revision: 1055758
URL: http://svn.apache.org/viewvc?rev=1055758&view=rev
Log:
Applying patch provided by Boris Milonov for AXIS2-4461
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/httpbase.jsp
Modified:
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/httpbase.jsp
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/httpbase.jsp?rev=1055758&r1=1055757&r2=1055758&view=diff
==
---
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/httpbase.jsp
(original)
+++
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/include/httpbase.jsp
Thu Jan 6 06:36:40 2011
@@ -17,76 +17,55 @@
~ under the License.
--%>
-<%@ page import="org.apache.axis2.AxisFault" %>
<%@ page import="org.apache.axis2.Constants" %>
-<%@ page import="org.apache.axis2.addressing.EndpointReference" %>
-<%@ page import="org.apache.axis2.client.Options" %>
-<%@ page import="org.apache.axis2.client.ServiceClient" %>
<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.apache.axis2.context.ConfigurationContextFactory" %>
-<%@ page import="org.apache.axis2.context.ServiceContext" %>
-<%@ page import="org.apache.axis2.context.ServiceGroupContext" %>
-<%@ page import="org.apache.axis2.deployment.util.PhasesInfo" %>
-<%@ page import="org.apache.axis2.description.AxisModule" %>
-<%@ page import="org.apache.axis2.description.AxisOperation" %>
-<%@ page import="org.apache.axis2.description.AxisService" %>
-<%@ page import="org.apache.axis2.description.AxisServiceGroup" %>
<%@ page import="org.apache.axis2.description.Parameter" %>
-<%@ page import="org.apache.axis2.engine.AxisConfiguration" %>
-<%@ page import="org.apache.axis2.engine.Handler" %>
-<%@ page import="org.apache.axis2.engine.Phase" %>
<%@ page import="org.apache.axis2.transport.http.AxisServlet" %>
-<%@ page import="org.apache.axis2.util.JavaUtils" %>
-<%@ page import="javax.xml.parsers.SAXParser" %>
-<%@ page import="javax.xml.parsers.SAXParserFactory" %>
-<%@ page import="java.io.IOException" %>
-<%@ page import="java.io.InputStream" %>
-<%@ page import="java.io.StringWriter" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Collection" %>
-<%@ page import="java.util.Enumeration" %>
-<%@ page import="java.util.HashMap" %>
-<%@ page import="java.util.Hashtable" %>
-<%@ page import="java.util.Iterator" %>
+<%@ page import="org.apache.axis2.transport.TransportListener" %>
<%!
- private String frontendHostUrl;
+private String frontendHostUrl;
+private String hostname;
- public void jspInit() {
-ServletContext context = this.getServletConfig().getServletContext();
-ConfigurationContext configctx = (ConfigurationContext)
context.getAttribute(AxisServlet.CONFIGURATION_CONTEXT);
-if (configctx != null){
-Parameter parameter =
configctx.getAxisConfiguration().getParameter(Constants.HTTP_FRONTEND_HOST_URL);
-if (parameter != null) {
- frontendHostUrl = (String) parameter.getValue();
+public void jspInit() {
+ServletContext context = this.getServletConfig().getServletContext();
+ConfigurationContext configctx = (ConfigurationContext)
context.getAttribute(AxisServlet.CONFIGURATION_CONTEXT);
+if (configctx != null) {
+Parameter parameter =
configctx.getAxisConfiguration().getParameter(Constants.HTTP_FRONTEND_HOST_URL);
+if (parameter != null) {
+frontendHostUrl = (String) parameter.getValue();
+}
+Parameter hostnameParam =
configctx.getAxisConfiguration().getParameter(TransportListener.HOST_ADDRESS);
+if (hostnameParam != null) {
+hostname = (String) hostnameParam.getValue();
+}
}
}
- }
- public String calculateHttpBase(HttpServletRequest aRequest) {
-StringBuffer stringBuffer = new StringBuffer();
-if (frontendHostUrl != null) {
- stringBuffer.append(frontendHostUrl);
-} else {
- String scheme = aRequest.getScheme();
- stringBuffer.append(scheme);
- stringBuffer.append("://");
- stringBuffer.append(aRequest.getServerName());
- if (("http".equalsIgnoreCase(scheme) && aRequest.getServerPort() != 80)
|| "https".equalsIgnoreCase(scheme) && aRequest.getServerPort() != 443)
- {
-stringBuffer.append(":");
-stringBuffer.append(aRequest.getServerPort());
- }
- // I think i saw web containers return null for root web context
- if (aRequest.getContextPath() != null) {
-stringBuffer.append(aRequest.getContextPath());
- }
-}
-// append / char if needed
-if (stringBuffer.charAt(stringBuffer.length() - 1) != '/') {
- stringBuffer.append("/");
+
svn commit: r1055759 - /axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
Author: shankar Date: Thu Jan 6 06:39:42 2011 New Revision: 1055759 URL: http://svn.apache.org/viewvc?rev=1055759&view=rev Log: Including opensaml libraries Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/bin.xml?rev=1055759&r1=1055758&r2=1055759&view=diff == --- axis/axis2/java/rampart/trunk/modules/distribution/bin.xml (original) +++ axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Thu Jan 6 06:39:42 2011 @@ -23,6 +23,7 @@ org.apache.rampart:rampart-policy:jar org.apache.rampart:rampart-trust:jar org.opensaml:opensaml1:jar +org.opensaml:opensaml:jar org.opensaml:xmltooling:jar joda-time:joda-time:jar org.slf4j:slf4j-api:jar
svn commit: r1055761 - /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Author: amilas
Date: Thu Jan 6 06:46:31 2011
New Revision: 1055761
URL: http://svn.apache.org/viewvc?rev=1055761&view=rev
Log:
fixing issue AXIS2-3911 added the full qualified name.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1055761&r1=1055760&r2=1055761&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Thu Jan 6 06:46:31 2011
@@ -3101,7 +3101,7 @@
else{
// A start element we are not expecting
indicates an invalid parameter was passed
-throw new
org.apache.axis2.databinding.ADBException("Unexpected subelement " +
reader.getLocalName());
+throw new
org.apache.axis2.databinding.ADBException("Unexpected subelement " +
reader.getName());
}
@@ -3117,7 +3117,7 @@
if (reader.isStartElement())
// A start element we are not expecting
indicates a trailing invalid property
-throw new
org.apache.axis2.databinding.ADBException("Unexpected subelement " +
reader.getLocalName());
+throw new
org.apache.axis2.databinding.ADBException("Unexpected subelement " +
reader.getName());
@@ -3126,7 +3126,7 @@
else{
// A start element we are not
expecting indicates an invalid parameter was passed
-throw new
org.apache.axis2.databinding.ADBException("Unexpected subelement " +
reader.getLocalName());
+throw new
org.apache.axis2.databinding.ADBException("Unexpected subelement " +
reader.getName());
}
} else {
svn commit: r1055762 - /axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml
Author: shankar Date: Thu Jan 6 06:57:44 2011 New Revision: 1055762 URL: http://svn.apache.org/viewvc?rev=1055762&view=rev Log: Packing opensaml2 libraries Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml?rev=1055762&r1=1055761&r2=1055762&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml Thu Jan 6 06:57:44 2011 @@ -23,6 +23,7 @@ org.apache.rampart:rampart-policy:jar org.apache.rampart:rampart-trust:jar org.opensaml:opensaml1:jar +org.opensaml:opensaml:jar org.opensaml:xmltooling:jar joda-time:joda-time:jar org.slf4j:slf4j-api:jar
svn commit: r1055772 - in /axis/axis2/java/core/trunk/modules/kernel: src/org/apache/axis2/deployment/ test/org/apache/axis2/deployment/
Author: isurues
Date: Thu Jan 6 07:24:25 2011
New Revision: 1055772
URL: http://svn.apache.org/viewvc?rev=1055772&view=rev
Log:
Fixing https://issues.apache.org/jira/browse/AXIS2-4101. Removed support for
other extensions inside the repository/services folder. This is beacuese, we
can't select the correct deployer only by looking at the file extension. And
also, removed unwanted map in DeploymentEngine which keeps a 1 to 1 mapping
(which is no longer valid) between the extension and the deployer. Changed a
test case also to match the change..
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=1055772&r1=1055771&r2=1055772&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
Thu Jan 6 07:24:25 2011
@@ -386,7 +386,6 @@ public class AxisConfigBuilder extends D
}
private void processDeployers(Iterator deployerItr) {
-HashMap extensionToDeployerMappingMap = new HashMap();
Map> deployers = new HashMap>();
while (deployerItr.hasNext()) {
OMElement element = (OMElement) deployerItr.next();
@@ -429,10 +428,8 @@ public class AxisConfigBuilder extends D
deployers.put(directory, extensionMap);
}
extensionMap.put(extension, deployer);
-extensionToDeployerMappingMap.put(extension, deployer);
}
if (deploymentEngine != null) {
-
deploymentEngine.setExtensionToDeployerMappingMap(extensionToDeployerMappingMap);
deploymentEngine.setDeployers(deployers);
}
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=1055772&r1=1055771&r2=1055772&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Thu Jan 6 07:24:25 2011
@@ -134,10 +134,6 @@ public abstract class DeploymentEngine i
//To deploy modules (both mar and expanded)
protected ModuleDeployer moduleDeployer;
-//to keep map of which deployer can process which file extension ,
-// for example ServiceDeployer will process .aar file
-private HashMap extensionToDeployerMappingMap = new HashMap();
-
private Map> deployerMap = new
HashMap>();
private Lock lock = new ReentrantLock();
@@ -1343,10 +1339,6 @@ public abstract class DeploymentEngine i
return repositoryDir;
}
-public void setExtensionToDeployerMappingMap(HashMap
extensionToDeployerMappingMap) {
-this.extensionToDeployerMappingMap = extensionToDeployerMappingMap;
-}
-
public void setDeployers(Map> deployerMap) {
this.deployerMap = deployerMap;
}
@@ -1373,10 +1365,6 @@ public abstract class DeploymentEngine i
return (extensionMap != null) ? extensionMap.get(extension) : null;
}
-public Deployer getDeployerForExtension(String extension) {
-return (Deployer) extensionToDeployerMappingMap.get(extension);
-}
-
/**
* Clean up the mess
*/
@@ -1450,7 +1438,6 @@ public abstract class DeploymentEngine i
deployerMap.put(directory, extensionMap);
}
extensionMap.put(extension, deployer);
-extensionToDeployerMappingMap.put(extension, deployer);
} finally {
lock.unlock();
}
@@ -1492,10 +1479,6 @@ public abstract class DeploymentEngine i
log.debug("Deployer " + deployer.getClass().getName() + "
is removed");
}
}
-
-if (extensionToDeployerMappingMap.containsKey(extension)) {
-extensionToDeployerMappingMap.remove(extension);
-}
} finally {
lock.unlock();
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/Rep
