Author: muthulee
Date: Sun Jul 15 20:18:54 2007
New Revision: 556500
URL: http://svn.apache.org/viewvc?view=rev&rev=556500
Log:
1) Fully tested tomcat sample
2) Adding the xdoc directory
3) Adding the site build to the pom
Added:
webservices/rampart/trunk/java/src/site/xdoc/
webservices/rampart/trunk/java/src/site/xdoc/index.xml
Removed:
webservices/rampart/trunk/java/src/site/resources/index.html
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-samples/README.txt
webservices/rampart/trunk/java/modules/rampart-samples/policy/build.xml
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/README
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/build.xml
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/policy.xml
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/src/org/apache/rampart/tomcat/sample/Client.java
webservices/rampart/trunk/java/pom.xml
webservices/rampart/trunk/java/src/site/resources/quick-start.html
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?view=diff&rev=556500&r1=556499&r2=556500
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
Sun Jul 15 20:18:54 2007
@@ -496,7 +496,6 @@
long t0 = 0, t1 = 0;
if(dotDebug){
t0 = System.currentTimeMillis();
- tlog.debug("Signature took :" + (t1 - t0));
}
sigToken = rpd.getInitiatorToken();
Modified: webservices/rampart/trunk/java/modules/rampart-samples/README.txt
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-samples/README.txt?view=diff&rev=556500&r1=556499&r2=556500
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-samples/README.txt (original)
+++ webservices/rampart/trunk/java/modules/rampart-samples/README.txt Sun Jul
15 20:18:54 2007
@@ -12,4 +12,6 @@
- keys - The keystore files that contains the keys used by the samples
Please use Apache Ant with the build.xml file available here to copy all jars
-and mars to required places.
\ No newline at end of file
+and mars to required places.
+
+ - Please copy log4j.jar to AXIS2_HOME/lib directory before trying out
samples.
Modified:
webservices/rampart/trunk/java/modules/rampart-samples/policy/build.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-samples/policy/build.xml?view=diff&rev=556500&r1=556499&r2=556500
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-samples/policy/build.xml
(original)
+++ webservices/rampart/trunk/java/modules/rampart-samples/policy/build.xml Sun
Jul 15 20:18:54 2007
@@ -79,6 +79,16 @@
<create.and.run.client sample.number="04"/>
</target>
+ <!-- Sample Service 05 -->
+ <target name="service.05" if="env.AXIS2_HOME"
depends="check.dependency">
+ <create.service.repo sample.number="05"/>
+ </target>
+
+ <!-- Sample Client 05 -->
+ <target name="client.05" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="05"/>
+ </target>
+
<target name="clean">
<delete dir="build" />
</target>
Modified:
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/README
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/README?view=diff&rev=556500&r1=556499&r2=556500
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/README
(original)
+++
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/README
Sun Jul 15 20:18:54 2007
@@ -6,17 +6,15 @@
Step1: Install Axis2 in Tomcat by reading the Axis2 installation guide
available in http://ws.apache.org/axis2/. Then test axis2 in Tomcat.
-Step2: Copy Rampart jars and mars by executing the ../../build.xml file.
-
-Step3: Copy keystores into Tomcat by giving the following command in this
directory.
+Step2: Copy keystores into Tomcat by giving the following command in this
directory.
$ant copy.keys
-Step4: Copy rampart jars and mars into Tomcat by giving the following command
in this directory.
+Step3: Copy rampart jars and mars into Tomcat by giving the following command
in this directory.
$ant copy.rampart.to.tomcat
-Step5: Enable HTTPS on Tomcat. For Tomcat5 uncomment the "SSL HTTP/1.1
Connector". The default HTTPS port for Tomcat is 8443. For more information
"http://tomcat.apache.org/tomcat-5.0-doc/ssl-howto.html";
+Step4: Enable HTTPS on Tomcat. For Tomcat5 uncomment the "SSL HTTP/1.1
Connector". The default HTTPS port for Tomcat is 8443. For more information
"http://tomcat.apache.org/tomcat-5.0-doc/ssl-howto.html";
-Step6: Add the key store information by adding the following into the
Connector element in server.xml.
+Step5: Add the key store information by adding the following into the
Connector element in server.xml.
truststoreFile="rampart-sample-keys.jks"
truststorePass="apache"
@@ -26,12 +24,12 @@
Start tomcat and check the service by typing
"https://127.0.0.1:8443/axis2/services/listServices"; in the browser. If you
have changed the SSL port then type the correct port number and please change
the build.xml's ssl.port accordingly.
-Step7: The following command will copy the ut-over-https.aar into the
${CATALINA_HOME}/webapps/axis2/WEB-INF/services/ut-over-https.aar
+Step6: The following command will copy the ut-over-https.aar into the
${CATALINA_HOME}/webapps/axis2/WEB-INF/services/ut-over-https.aar
$ant create.and.copy.service
-Step8: Start tomcat. View https://127.0.0.1:8443/axis2/services/listServices
to see wether the service is available.
+Step7: Start tomcat. View https://127.0.0.1:8443/axis2/services/listServices
to see wether the service is available.
-Step9: The following command will create and run the client.
+Step8: The following command will create and run the client.
$ant create.and.run.client
Modified:
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/build.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/build.xml?view=diff&rev=556500&r1=556499&r2=556500
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/build.xml
(original)
+++
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/build.xml
Sun Jul 15 20:18:54 2007
@@ -29,7 +29,7 @@
<property name="ssl.port" value="8443"/>
<!--can be removed-->
- <property name="sample.services.url"
value="https://localhost:${ssl.port}/axis2/services"/>
+ <property name="sample.services.url"
value="https://127.0.0.1:${ssl.port}/axis2/services/ut-over-https"/>
<property environment="env"/>
@@ -37,20 +37,15 @@
<echo message="CATALINA_HOME must be set"/>
</target>
- <target name="check.axis2" unless="env.AXIS2_HOME">
- <echo message="AXIS2_HOME must be set"/>
- </target>
-
<target name="copy.keys" depends="check.tomcat">
<copy file="${keys.dir}/service.jks"
tofile="${env.CATALINA_HOME}/rampart-sample-keys.jks" overwrite="true"/>
</target>
- <target name="copy.rampart.to.tomcat"
depends="check.tomcat,check.axis2">
+ <target name="copy.rampart.to.tomcat" depends="check.tomcat">
<property name="to.modules.dir"
value="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/modules"/>
<property name="to.lib.dir"
value="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/lib"/>
- <property name="from.modules.dir"
value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="from.lib.dir" value="${env.AXIS2_HOME}/lib"/>
+ <property name="from.lib.dir" value="$../../../../../lib"/>
<copy todir="${to.lib.dir}">
@@ -60,7 +55,7 @@
</copy>
<copy todir="${to.modules.dir}">
- <fileset dir="${from.modules.dir}">
+ <fileset dir="${from.lib.dir}">
<include name="**/*.mar"/>
</fileset>
</copy>
@@ -101,7 +96,7 @@
</target>
- <target name="create.and.run.client"
depends="check.tomcat,check.axis2,clean">
+ <target name="create.and.run.client" depends="check.tomcat,clean">
<property name="from.modules"
value="${env.AXIS2_HOME}/repository/modules/"/>
<property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
@@ -128,9 +123,8 @@
<exclude name="**/SimpleService.java"/>
</javac>
- <copy file="${keys.dir}/client.jks"
tofile="${temp.client.dir}/client.jks" overwrite="true"/>
- <copy file="policy.xml" tofile="${temp.client.dir}/policy.xml"
overwrite="true"/>
-
+ <copy file="${keys.dir}/client.jks"
tofile="${temp.dir}/client.jks" overwrite="true"/>
+
<!-- Run client -->
<java classname="org.apache.rampart.tomcat.sample.Client"
fork="true">
<arg value="${sample.services.url}"/>
Modified:
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/policy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/policy.xml?view=diff&rev=556500&r1=556499&r2=556500
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/policy.xml
(original)
+++
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/policy.xml
Sun Jul 15 20:18:54 2007
@@ -32,7 +32,7 @@
<ramp:user>alice</ramp:user>
<ramp:passwordCallbackClass>org.apache.rampart.tomcat.sample.PWCBHandler</ramp:passwordCallbackClass>
<ramp:sslConfig>
- <ramp:property
name="javax.net.ssl.trustStore">client.jks</ramp:property>
+ <ramp:property
name="javax.net.ssl.trustStore">build/client.jks</ramp:property>
<ramp:property
name="javax.net.ssl.trustStorePassword">apache</ramp:property>
</ramp:sslConfig>
</ramp:RampartConfig>
Modified:
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/src/org/apache/rampart/tomcat/sample/Client.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/src/org/apache/rampart/tomcat/sample/Client.java?view=diff&rev=556500&r1=556499&r2=556500
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/src/org/apache/rampart/tomcat/sample/Client.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-samples/policy/sample-tomcat/src/org/apache/rampart/tomcat/sample/Client.java
Sun Jul 15 20:18:54 2007
@@ -68,7 +68,7 @@
private static OMElement getPayload(String value) {
OMFactory factory = OMAbstractFactory.getOMFactory();
- OMNamespace ns =
factory.createOMNamespace("http://sample.tomcat.rampart.apache.org/xsd","ns1";);
+ OMNamespace ns =
factory.createOMNamespace("http://sample.tomcat.rampart.apache.org","ns1";);
OMElement elem = factory.createOMElement("echo", ns);
OMElement childElem = factory.createOMElement("param0", null);
childElem.setText(value);
Modified: webservices/rampart/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/pom.xml?view=diff&rev=556500&r1=556499&r2=556500
==============================================================================
--- webservices/rampart/trunk/java/pom.xml (original)
+++ webservices/rampart/trunk/java/pom.xml Sun Jul 15 20:18:54 2007
@@ -479,18 +479,4 @@
<url>scpexe://people.apache.org/www/ws.apache.org/rampart</url>
</site>
</distributionManagement>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: webservices/rampart/trunk/java/src/site/resources/quick-start.html
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/src/site/resources/quick-start.html?view=diff&rev=556500&r1=556499&r2=556500
==============================================================================
--- webservices/rampart/trunk/java/src/site/resources/quick-start.html
(original)
+++ webservices/rampart/trunk/java/src/site/resources/quick-start.html Sun Jul
15 20:18:54 2007
@@ -1,7 +1,18 @@
<html>
<head>
<body>
-<h3>Under construnction</h3>
+<h2>Rampart Quick Start Guide</h2>
+<h3>Introduction</h3>
+<p>This guide contains three sections</p>
+<ul>
+<li>Securing SOAP Messages</li>
+<li>Setting up a Security Token Service</li>
+<li>Secure Conversation with Rampart</li>
+<p>To provide security both ends has to be secured. Therefore one has to
configure both ends of the message.</p>
+<h3>Securing SOAP Messages</h3>
+<h3>Setting up a Security Token Service</h3>
+<h3>Secure Conversation with Rampart</h3>
+</ul>
</body>
</head>
</html>
Added: webservices/rampart/trunk/java/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/src/site/xdoc/index.xml?view=auto&rev=556500
==============================================================================
--- webservices/rampart/trunk/java/src/site/xdoc/index.xml (added)
+++ webservices/rampart/trunk/java/src/site/xdoc/index.xml Sun Jul 15 20:18:54
2007
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ ~ 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
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<document>
+
+ <properties>
+ <title>Apache Rampart</title>
+ </properties>
+
+<body>
+
+<section name="Apache Rampart">
+<p>Rampart is the security module of Axis2. It secures SOAP messages
+according to specifications in the WS-Security stack. Rampart implements the
+following specifications:</p>
+<ul>
+ <li>WS - Security 1.0</li>
+ <li>WS - Secure Conversation - February 2005</li>
+ <li>WS - Security Policy - 1.1 - July 2005</li>
+ <li>WS - Trust - February 2005</li>
+ <li>WS - Trust - WS-SX spec - EXPERIMENTAL</li>
+</ul>
+</section>
+
+</body>
+</document>
