You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2006/03/22 14:49:36 UTC

svn commit: r387861 - in /webservices/axis2/trunk/java/modules: core/project.xml samples/maven.xml samples/resources/security/README.txt samples/resources/security/build.xml samples/src/sample/security/Client.java

Author: ruchithf
Date: Wed Mar 22 05:49:35 2006
New Revision: 387861

URL: http://svn.apache.org/viewcvs?rev=387861&view=rev
Log:
- Adding jaxen dependancy
- Fixing the security sample
- Updated the security sample README.txt


Modified:
    webservices/axis2/trunk/java/modules/core/project.xml
    webservices/axis2/trunk/java/modules/samples/maven.xml
    webservices/axis2/trunk/java/modules/samples/resources/security/README.txt
    webservices/axis2/trunk/java/modules/samples/resources/security/build.xml
    webservices/axis2/trunk/java/modules/samples/src/sample/security/Client.java

Modified: webservices/axis2/trunk/java/modules/core/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/project.xml?rev=387861&r1=387860&r2=387861&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/project.xml (original)
+++ webservices/axis2/trunk/java/modules/core/project.xml Wed Mar 22 05:49:35 2006
@@ -155,7 +155,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-        <!--for java2wsdl generation we use JAM , so there should be a dependency on the annogen jar or-->
+        
+	<dependency>
+	    <groupId>jaxen</groupId>
+	    <artifactId>jaxen</artifactId>
+	    <version>${jaxen.version}</version>
+	    <properties>
+	        <module>true</module>
+	    </properties>
+	    <url>http://www.ibiblio.org/maven/jaxen/jars/</url>
+	 </dependency>
+	
+	<!--for java2wsdl generation we use JAM , so there should be a dependency on the annogen jar or-->
         <!--XML Beans-->
          <dependency>
             <groupId>annogen</groupId>

Modified: webservices/axis2/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/maven.xml?rev=387861&r1=387860&r2=387861&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/maven.xml Wed Mar 22 05:49:35 2006
@@ -301,7 +301,15 @@
     </ant:copy>
 
     <ant:copy file="target/security/SecureService.aar" tofile="target/samples/security/SecureService.aar"/>
-    <ant:copy file="target/security/secUtil.jar" tofile="target/samples/security/secUtil.jar"/>
+    
+    <!-- copy the local libs -->
+    <mkdir dir="target/samples/security/lib"/>
+    <ant:copy file="target/security/secUtil.jar" tofile="target/samples/security/lib/secUtil.jar"/>
+    <ant:copy file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar" todir="target/samples/security/lib/"/>
+    <ant:copy file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar" todir="target/samples/security/lib/"/>
+    <ant:copy file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar" todir="target/samples/security/lib/"/>
+    <ant:copy file="${maven.repo.local}/commons-discovery/jars/commons-discovery-${commons.discovery.version}.jar" todir="target/samples/security/lib/"/>
+    
     <ant:copy file="resources/security/README.txt" tofile="target/samples/security/README.txt"/>
     <ant:copy file="resources/security/build.xml" tofile="target/samples/security/build.xml"/>
 

Modified: webservices/axis2/trunk/java/modules/samples/resources/security/README.txt
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/resources/security/README.txt?rev=387861&r1=387860&r2=387861&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/resources/security/README.txt (original)
+++ webservices/axis2/trunk/java/modules/samples/resources/security/README.txt Wed Mar 22 05:49:35 2006
@@ -11,18 +11,21 @@
 ------------------------------------------------------------------------------
 Please follow each of the following steps:
 
-1.) Download the security-0.94.mar from 
-http://ws.apache.org/axis2/modules/%5Bpreferred%5D/ws/axis2/modules/addressing/0_94/security-0.94.mar
+1.) Download the security-0.95.mar from 
+	http://ws.apache.org/axis2/modules/
 2.) To engage the security (WSS4J) module add the following line to axis2.xml in axis
 	<module ref="security"/>
 3.) Copy samples/security/SecureService.aar to axis2/WEB-INF/services/ directory
-4.) Copy samples/security/secUtil.jar to axis2/WEB-INF/lib/
-5.) Copy the downloaded security-0.94.mar to Axis2/WEB-INF/modules/ directory
-6.) Copy the downloaded security-0.94.mar to samples/security/client_repo/modules/ directory
+4.) Copy samples/security/secUtil.jar to axis2/WEB-INF/lib/
+5.) Copy all jars in the samples/security/lib directory to axis2/WEB-INF/lib/
+6.) Copy the downloaded security-0.95.mar to Axis2/WEB-INF/modules/ directory
 7.) Start Tomcat
 
 Run the sample
-------------------------------------------------------------------------------
+------------------------------------------------------------------------------
+
+Copy the downloaded security-0.95.mar to samples/security/client_repo/modules/ directory
+
 To run the sample client run the securitySample ant task in the ant build file available in the samples directory.
 	$ ant securitySample
 

Modified: webservices/axis2/trunk/java/modules/samples/resources/security/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/resources/security/build.xml?rev=387861&r1=387860&r2=387861&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/resources/security/build.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/resources/security/build.xml Wed Mar 22 05:49:35 2006
@@ -3,7 +3,9 @@
         <fileset dir="../../lib">
             <include name="*.jar"/>
         </fileset>
-        <pathelement location="secUtil.jar"/>
+        <fileset dir="lib">
+            <include name="*.jar"/>
+        </fileset>
     </path>
 
 

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/security/Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/security/Client.java?rev=387861&r1=387860&r2=387861&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/security/Client.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/security/Client.java Wed Mar 22 05:49:35 2006
@@ -43,17 +43,17 @@
             // Get the repository location from the args
             String repo = args[0];
             String port = args[1];
-            //todo  : third argumnet should be axis2.xml
 
             OMElement payload = getEchoElement();
-            ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo, repo + "/axis2.xml");
+            ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo, null);
             ServiceClient serviceClient = new ServiceClient(configContext, null);
             Options options = new Options();
-            serviceClient.setOptions(options);
             options.setTo(new EndpointReference("http://127.0.0.1:" + port + "/axis2/services/SecureService"));
             options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             options.setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
-
+            options.setAction("urn:echo");
+            serviceClient.setOptions(options);
+            
             //Blocking invocation
             OMElement result = serviceClient.sendReceive(payload);