Skip to content

Commit 09c1587

Browse files
veithenveithen
committed
Moved the JWS support to a separate Maven module and disabled it by default (most enterprise projects don't use JWS).
1 parent b5e4e38 commit 09c1587

23 files changed

Lines changed: 225 additions & 10 deletions

File tree

‎axis-rt-core/src/main/resources/org/apache/axis/server/server-config.wsdd‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
<parameter name="dotNetSoapEncFix" value="true"/>
1010
<parameter name="enableNamespacePrefixOptimization" value="false"/>
1111
<requestFlow>
12+
<!-- uncomment this if you want JWS support -->
13+
<!--
1214
<handler type="java:org.apache.axis.handlers.JWSHandler">
1315
<parameter name="scope" value="session"/>
1416
</handler>
1517
<handler type="java:org.apache.axis.handlers.JWSHandler">
1618
<parameter name="scope" value="request"/>
1719
<parameter name="extension" value=".jwr"/>
1820
</handler>
21+
-->
1922
<!-- uncomment this if you want the SOAP monitor -->
2023
<!--
2124
<handler type="java:org.apache.axis.handlers.SOAPMonitorHandler"/>

‎axis-rt-core/src/test/java/test/wsdd/DummyHandler.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package test.wsdd;
20+
21+
import org.apache.axis.AxisFault;
22+
import org.apache.axis.MessageContext;
23+
import org.apache.axis.handlers.BasicHandler;
24+
25+
public class DummyHandler extends BasicHandler {
26+
public void invoke(MessageContext msgContext) throws AxisFault {
27+
}
28+
}

‎axis-rt-core/src/test/java/test/wsdd/TestStructure.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ public void testChainAnonymousHandler() throws Exception
3939
Handler chainOne_handler = chainOne_handlers[0];
4040
assertNotNull("chain.one's handler should be non-null!",
4141
chainOne_handler);
42-
assertTrue("chain.one's handler should be a JWSHandler!",
43-
(chainOne_handler instanceof
44-
org.apache.axis.handlers.JWSHandler));
42+
assertTrue("chain.one's handler should be a DummyHandler!",
43+
(chainOne_handler instanceof DummyHandler));
4544
}
4645

4746
public void testServiceBackReference() throws Exception

‎axis-rt-core/src/test/resources/test/wsdd/testStructure1.wsdd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</documentation>
99

1010
<chain name="chain.one">
11-
<handler type="java:org.apache.axis.handlers.JWSHandler"/>
11+
<handler type="java:test.wsdd.DummyHandler"/>
1212
</chain>
1313

1414
<service name="service.one" provider="java:RPC">

‎axis-rt-jws/pom.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one
4+
~ or more contributor license agreements. See the NOTICE file
5+
~ distributed with this work for additional information
6+
~ regarding copyright ownership. The ASF licenses this file
7+
~ to you under the Apache License, Version 2.0 (the
8+
~ "License"); you may not use this file except in compliance
9+
~ with the License. You may obtain a copy of the License at
10+
~
11+
~ http://www.apache.org/licenses/LICENSE-2.0
12+
~
13+
~ Unless required by applicable law or agreed to in writing,
14+
~ software distributed under the License is distributed on an
15+
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
~ KIND, either express or implied. See the License for the
17+
~ specific language governing permissions and limitations
18+
~ under the License.
19+
-->
20+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<parent>
23+
<groupId>org.apache.axis</groupId>
24+
<artifactId>axis-project</artifactId>
25+
<version>1.4.1-SNAPSHOT</version>
26+
<relativePath>../pom.xml</relativePath>
27+
</parent>
28+
<artifactId>axis-rt-jws</artifactId>
29+
<name>JWS Support</name>
30+
<dependencies>
31+
<dependency>
32+
<groupId>${project.groupId}</groupId>
33+
<artifactId>axis-rt-core</artifactId>
34+
<version>${project.version}</version>
35+
</dependency>
36+
</dependencies>
37+
</project>

axis-rt-core/src/main/java/org/apache/axis/components/compiler/AbstractCompiler.java renamed to axis-rt-jws/src/main/java/org/apache/axis/components/compiler/AbstractCompiler.java

File renamed without changes.

axis-rt-core/src/main/java/org/apache/axis/components/compiler/Compiler.java renamed to axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Compiler.java

File renamed without changes.

axis-rt-core/src/main/java/org/apache/axis/components/compiler/CompilerError.java renamed to axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerError.java

File renamed without changes.

axis-rt-core/src/main/java/org/apache/axis/components/compiler/CompilerFactory.java renamed to axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerFactory.java

File renamed without changes.

axis-rt-core/src/main/java/org/apache/axis/components/compiler/Javac.java renamed to axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Javac.java

File renamed without changes.

0 commit comments

Comments
 (0)