axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r474503 - in /webservices/axis2/trunk/java/modules: adb-codegen/ addressing/ codegen/ integration/ jaxws/ jibx/ kernel/ kernel/src/org/apache/axis2/description/ kernel/src/org/apache/axis2/util/ rahas/ saaj/ samples/ savan/ secpolicy/ secur...
Date Mon, 13 Nov 2006 20:37:02 GMT
Author: sanka
Date: Mon Nov 13 12:37:01 2006
New Revision: 474503

URL: http://svn.apache.org/viewvc?view=rev&rev=474503
Log:
Fixed build break to the removal of old neethi codebase
from the trunk.


Removed:
    webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy1/
    webservices/axis2/trunk/java/modules/security/test/org/apache/ws/security/
Modified:
    webservices/axis2/trunk/java/modules/adb-codegen/project.xml
    webservices/axis2/trunk/java/modules/addressing/project.xml
    webservices/axis2/trunk/java/modules/codegen/project.xml
    webservices/axis2/trunk/java/modules/integration/project.xml
    webservices/axis2/trunk/java/modules/jaxws/project.xml
    webservices/axis2/trunk/java/modules/jibx/project.xml
    webservices/axis2/trunk/java/modules/kernel/project.xml
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
    webservices/axis2/trunk/java/modules/rahas/project.xml
    webservices/axis2/trunk/java/modules/saaj/project.xml
    webservices/axis2/trunk/java/modules/samples/project.xml
    webservices/axis2/trunk/java/modules/savan/project.xml
    webservices/axis2/trunk/java/modules/secpolicy/project.xml
    webservices/axis2/trunk/java/modules/security/project.xml
    webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java
    webservices/axis2/trunk/java/modules/soapmonitor/project.xml
    webservices/axis2/trunk/java/modules/webapp/project.xml
    webservices/axis2/trunk/java/modules/xmlbeans/project.xml

Modified: webservices/axis2/trunk/java/modules/adb-codegen/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/project.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/project.xml Mon Nov 13 12:37:01 2006
@@ -136,10 +136,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/addressing/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/project.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/project.xml Mon Nov 13 12:37:01 2006
@@ -125,10 +125,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-       <dependency>
+        <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/codegen/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/project.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/project.xml Mon Nov 13 12:37:01 2006
@@ -165,7 +165,15 @@
         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Mon Nov 13 12:37:01 2006
@@ -303,10 +303,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/jaxws/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/project.xml Mon Nov 13 12:37:01 2006
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
  -->
-<project>
+<project>                                                      
 	<pomVersion>3</pomVersion>
 	<extend>../../etc/project.xml</extend>
 	
@@ -278,10 +278,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/jibx/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jibx/project.xml Mon Nov 13 12:37:01 2006
@@ -44,7 +44,15 @@
         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/kernel/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/project.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/project.xml Mon Nov 13 12:37:01 2006
@@ -180,7 +180,15 @@
         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
Mon Nov 13 12:37:01 2006
@@ -16,16 +16,15 @@
 
 package org.apache.axis2.description;
 
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
+
 import org.apache.axiom.om.util.UUIDGenerator;
-import org.apache.axis2.i18n.Messages;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyReference;
 import org.apache.neethi.PolicyRegistry;
 import org.apache.neethi.PolicyRegistryImpl;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
 
 public class PolicyInclude {
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
Mon Nov 13 12:37:01 2006
@@ -142,7 +142,7 @@
 
                 return PolicyEngine.getPolicy(bais);
 
-            } else if (Constants.ELEM_POLICYREF.equals(element.getLocalName())) {
+            } else if (Constants.ELEM_POLICY_REF.equals(element.getLocalName())) {
                 xmlString = DOM2Writer.nodeToString(element);
                 bais = new ByteArrayInputStream(xmlString.getBytes());
 

Modified: webservices/axis2/trunk/java/modules/rahas/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/project.xml (original)
+++ webservices/axis2/trunk/java/modules/rahas/project.xml Mon Nov 13 12:37:01 2006
@@ -178,14 +178,22 @@
             <version>${XmlSchema.version}</version>
         </dependency>
 	<!-- For WS-Policy support -->
+	 <dependency>
+            <groupId>org.apache.ws.commons.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
 	<dependency>
-		<groupId>org.apache.ws.commons.neethi</groupId>
-		<artifactId>neethi</artifactId>
-		<version>${neethi.version}</version>
-		<properties>
-			<module>true</module>
-		</properties>
-	</dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
 	<dependency>
             <groupId>incubator-woden</groupId>
             <artifactId>woden</artifactId>

Modified: webservices/axis2/trunk/java/modules/saaj/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/project.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/project.xml Mon Nov 13 12:37:01 2006
@@ -201,10 +201,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/project.xml Mon Nov 13 12:37:01 2006
@@ -41,10 +41,18 @@
             <artifactId>axiom-impl</artifactId>
             <version>${axiom.version}</version>
         </dependency>
-	<dependency>
+	 <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/savan/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/project.xml (original)
+++ webservices/axis2/trunk/java/modules/savan/project.xml Mon Nov 13 12:37:01 2006
@@ -154,10 +154,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-       <dependency>
+        <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/secpolicy/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/secpolicy/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/secpolicy/project.xml (original)
+++ webservices/axis2/trunk/java/modules/secpolicy/project.xml Mon Nov 13 12:37:01 2006
@@ -65,10 +65,18 @@
 				<module>true</module>
 			</properties>
 		</dependency>
-    	<dependency>
+    	 <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/security/project.xml (original)
+++ webservices/axis2/trunk/java/modules/security/project.xml Mon Nov 13 12:37:01 2006
@@ -36,16 +36,23 @@
             <artifactId>axiom-impl</artifactId>
             <version>${axiom.version}</version>
         </dependency>
-		
-		<dependency>
+	<dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-dom</artifactId>
             <version>${axiom.version}</version>
         </dependency>
-		<dependency>
+        <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java Mon
Nov 13 12:37:01 2006
@@ -21,15 +21,10 @@
 import org.apache.axis2.description.AxisDescription;
 import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.modules.Module;
-import org.apache.axis2.modules.ModulePolicyExtension;
-import org.apache.axis2.modules.PolicyExtension;
-
 import org.apache.neethi.Assertion;
 import org.apache.neethi.Policy;
 
-import org.apache.ws.security.policy1.extension.WSSCodegenPolicyExtension;
-
-public class Rampart implements Module, ModulePolicyExtension  {
+public class Rampart implements Module  {
 
     public void init(ConfigurationContext configContext, AxisModule module)
             throws AxisFault {
@@ -42,10 +37,6 @@
 
     public void shutdown(ConfigurationContext configurationContext) throws AxisFault {
         // at the moment, nothing needs to be done ..
-    }
-
-    public PolicyExtension getPolicyExtension() {
-        return new WSSCodegenPolicyExtension();
     }
 
     public void applyPolicy(Policy policy, AxisDescription axisDescription) throws AxisFault
{

Modified: webservices/axis2/trunk/java/modules/soapmonitor/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/soapmonitor/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/soapmonitor/project.xml (original)
+++ webservices/axis2/trunk/java/modules/soapmonitor/project.xml Mon Nov 13 12:37:01 2006
@@ -37,10 +37,18 @@
             <artifactId>axiom-impl</artifactId>
             <version>${axiom.version}</version>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/webapp/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/project.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/project.xml Mon Nov 13 12:37:01 2006
@@ -212,10 +212,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis2/trunk/java/modules/xmlbeans/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/project.xml?view=diff&rev=474503&r1=474502&r2=474503
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/project.xml (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/project.xml Mon Nov 13 12:37:01 2006
@@ -136,10 +136,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.apache.ws.commons.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
+            <version>1.0.1</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0</version>
             <properties>
                 <module>true</module>
             </properties>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message