Author: veithen
Date: Sat Mar 7 20:28:48 2009
New Revision: 751325
URL: http://svn.apache.org/viewvc?rev=751325&view=rev
Log:
1. Removed the ModulePolicyExtension interface from the Rampart module.
Rationale:
* ModulePolicyExtension is not really implemented since
Rampart#getPolicyExtension() only throws an UnsupportedOperationException.
* The UnsupportedOperationException causes a misleading error message in
wsdl2java (cf. http://markmail.org/thread/3kcjha2fxo2tksey and r748704).
* ModulePolicyExtension is part of axis2-codegen and therefore requires a
corresponding Maven dependency. Since it is not really used, this is an
unnecessary annoyance for Maven projects depending on Rampart.
* It causes troubles at runtime. See AXIS2-3213 and AXIS2-4265.
2. Moved the codegen and xmlbeans dependencies from the root POM to
rampart-integration.
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
webservices/rampart/trunk/java/pom.xml
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java?rev=751325&r1=751324&r2=751325&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
Sat Mar 7 20:28:48 2009
@@ -21,12 +21,10 @@
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.modules.Module;
-import org.apache.axis2.wsdl.codegen.extension.ModulePolicyExtension;
-import org.apache.axis2.wsdl.codegen.extension.PolicyExtension;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
-public class Rampart implements Module, ModulePolicyExtension {
+public class Rampart implements Module /* , ModulePolicyExtension */ {
public void init(ConfigurationContext configContext, AxisModule module)
throws AxisFault {
@@ -41,9 +39,9 @@
// at the moment, nothing needs to be done ..
}
- public PolicyExtension getPolicyExtension() {
- throw new UnsupportedOperationException("TODO");
- }
+// public PolicyExtension getPolicyExtension() {
+// throw new UnsupportedOperationException("TODO");
+// }
public void applyPolicy(Policy policy, AxisDescription axisDescription)
throws AxisFault {
//Do not do anything
Modified: webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/pom.xml?rev=751325&r1=751324&r2=751325&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
(original)
+++ webservices/rampart/trunk/java/modules/rampart-integration/pom.xml Sat Mar
7 20:28:48 2009
@@ -724,6 +724,21 @@
<artifactId>axis2-transports</artifactId>
<version>${axis2.transport.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-xmlbeans</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
</dependencies>
<reporting>
Modified: webservices/rampart/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/pom.xml?rev=751325&r1=751324&r2=751325&view=diff
==============================================================================
--- webservices/rampart/trunk/java/pom.xml (original)
+++ webservices/rampart/trunk/java/pom.xml Sat Mar 7 20:28:48 2009
@@ -193,21 +193,6 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-xmlbeans</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb-codegen</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>mex</artifactId>
<version>${axis2.version}</version>
<classifier>impl</classifier>
