Author: coheigea
Date: Wed Oct 1 04:05:53 2008
New Revision: 700739
URL: http://svn.apache.org/viewvc?rev=700739&view=rev
Log:
[WSS-124] - pom cleanup
- Removed unused ciManagement blob
- Updated versions of the build plugins
- Removed commented out sections of build plugins
- Removed maven central and snapshot from "repositories"
- Removed pluginRepositories blob altogether (no more codehaus dependencies)
- Switched codehaus jdepend-maven-plugin to maven-dependency-plugin
- Switched codehaus jxr-maven-plugin to maven-jxr-plugin
Modified:
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
Modified: webservices/wss4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=700739&r1=700738&r2=700739&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Wed Oct 1 04:05:53 2008
@@ -22,21 +22,6 @@
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/WSS</url>
</issueManagement>
- <ciManagement>
- <system>Continuum</system>
- <url>unknown</url>
- <notifiers>
- <notifier>
- <sendOnError>false</sendOnError>
- <sendOnFailure>false</sendOnFailure>
- <sendOnSuccess>false</sendOnSuccess>
- <sendOnWarning>false</sendOnWarning>
- <configuration>
-
<address>[email protected]</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
<mailingLists>
<mailingList>
<name>WSS4J Developer List</name>
@@ -93,7 +78,6 @@
<organization></organization>
</developer>
</developers>
-
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -114,6 +98,7 @@
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
+
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
@@ -126,11 +111,11 @@
</resource>
</resources>
- <!--<testSourceDirectory>test</testSourceDirectory> -->
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<executions>
<execution>
<id>prepareLicenseFiles</id>
@@ -150,47 +135,12 @@
<goal>run</goal>
</goals>
</execution>
- <!-- <execution>
- <id>settingUpInteropTests</id>
-
<phase>generate-resources</phase>
- <configuration>
- <tasks>
-
- <mkdir dir="target/work"/>
- <axis-wsdl2java
- output="target/work"
- serverSide="yes"
- testcase="no"
- verbose="no"
- url="interop/ping.wsdl">
- <mapping
-
namespace="http://xmlsoap.org/Ping";
-
package="org.apache.ws.axis.oasis.ping"/>
- </axis-wsdl2java>
-
- <echo message="Starting http
server."/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>stopServer</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <echo message="Stopping http
server."/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution> -->
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-one-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<goals>
@@ -207,6 +157,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>
@@ -215,27 +166,18 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.3</source>
<target>1.3</target>
</configuration>
</plugin>
-
- <!--<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>tests/w3c/SchemaTest.java</exclude>
- </excludes>
- </configuration>
- </plugin> -->
-
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<descriptors>
<descriptor>assembly/bin.xml</descriptor>
@@ -245,7 +187,9 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
<executions>
<execution>
<goals>
@@ -259,6 +203,7 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>release</id>
@@ -271,7 +216,9 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-javadoc-plugin</artifactId>
+
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
<executions>
<execution>
<goals>
@@ -300,7 +247,6 @@
</dependency>
</dependencies>
</profile>
-
<profile>
<id>jdk15</id>
<activation>
@@ -314,8 +260,8 @@
</dependency>
</dependencies>
</profile>
-
</profiles>
+
<properties>
<xmlsec.version>1.4.0</xmlsec.version>
<opensaml.version>1.1</opensaml.version>
@@ -328,27 +274,10 @@
<axis.version>1.4</axis.version>
<junit.version>3.8.1</junit.version>
</properties>
+
<repositories>
<repository>
<releases>
- <enabled>false</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <id>apache-snapshots</id>
- <name>Apache Maven2 SNAPSHOTS</name>
- <url>
-
http://people.apache.org/repo/m2-snapshot-repository/
- </url>
- <layout>default</layout>
- </repository>
- <repository>
- <releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
@@ -358,52 +287,12 @@
<updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</snapshots>
- <id>maven2</id>
- <name>Maven2 repo</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
<id>apache-ws-snapshots2</id>
<name>Apache ws.zones - 2</name>
<url>http://ws.zones.apache.org/repository2/</url>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>snapshot</id>
- <name>Snapshot repository</name>
- <url>http://snapshots.maven.codehaus.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>snapshot-apache</id>
- <name>Apache Snapshot repository</name>
- <url>
-
http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
+
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
@@ -455,55 +344,59 @@
<reporting>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>mailing-list</report>
+ <report>project-team</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
</plugin>
<plugin>
- <artifactId>
- maven-project-info-reports-plugin
- </artifactId>
- <reportSets>
- <reportSet>
- <reports>
-
<report>dependencies</report>
-
<report>project-team</report>
-
<report>mailing-list</report>
-
<report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
-
<onlyCurrentVersion>true</onlyCurrentVersion>
- <resolutionIds>Any</resolutionIds>
- <statusIds>Resolved, Closed</statusIds>
- <sortColumnNames>Key</sortColumnNames>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
-
<report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <resolutionIds>Any</resolutionIds>
+ <statusIds>Resolved, Closed</statusIds>
+ <sortColumnNames>Key</sortColumnNames>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
</plugins>
</reporting>
+
<distributionManagement>
<repository>
<id>apache-repo</id>
@@ -512,13 +405,6 @@
scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
</url>
</repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
- <url>
-
scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
- </url>
- </snapshotRepository>
<site>
<id>website</id>
<url>
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java?rev=700739&r1=700738&r2=700739&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
Wed Oct 1 04:05:53 2008
@@ -157,8 +157,8 @@
/**
* Process the security header given the soap envelope as W3C document.
* <p/>
- * This is the main entry point to verify or decrypt a SOAP enevelope.
- * First check if a <code>wsse:Security</code> is availabe with the
+ * This is the main entry point to verify or decrypt a SOAP envelope.
+ * First check if a <code>wsse:Security</code> is available with the
* defined actor.
*
* @param doc the SOAP envelope as [EMAIL PROTECTED] Document}
@@ -184,7 +184,7 @@
/**
* Process the security header given the soap envelope as W3C document.
* <p/>
- * This is the main entry point to verify or decrypt a SOAP enevelope.
+ * This is the main entry point to verify or decrypt a SOAP envelope.
* First check if a <code>wsse:Security</code> is available with the
* defined actor.
*
@@ -200,7 +200,8 @@
* handling of certificates for Decryption
* @return a result vector
* @throws WSSecurityException
- * @see WSSecurityEngine#processSecurityHeader(Element securityHeader,
CallbackHandler cb,Crypto sigCrypto, Crypto decCrypto)
+ * @see WSSecurityEngine#processSecurityHeader(
+ * Element securityHeader, CallbackHandler cb,Crypto sigCrypto, Crypto
decCrypto)
*/
public Vector processSecurityHeader(Document doc,
String actor,
@@ -235,7 +236,7 @@
* Element.
*
* This function loops over all direct child elements of the
- * <code>wsse:Security</code> header. If it finds a knwon element, it
+ * <code>wsse:Security</code> header. If it finds a known element, it
* transfers control to the appropriate handling function. The method
* processes the known child elements in the same order as they appear in
* the <code>wsse:Security</code> element. This is in accordance to the WS
@@ -280,7 +281,7 @@
}
/*
* Gather some info about the document to process and store
- * it for retrival. Store the implemenation of signature crypto
+ * it for retrieval. Store the implementation of signature crypto
* (no need for encryption --- yet)
*/
WSDocInfo wsDocInfo = new
WSDocInfo(securityHeader.getOwnerDocument().hashCode());
@@ -304,7 +305,7 @@
Processor p = cfg.getProcessor(el);
/*
* Call the processor for this token. After the processor returns,
- * store it for later retrival. The token processor may store some
+ * store it for later retrieval. The token processor may store some
* information about the processed token
*/
if (p != null) {
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java?rev=700739&r1=700738&r2=700739&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
Wed Oct 1 04:05:53 2008
@@ -124,7 +124,8 @@
* </ul>
* <p/>
* The methods checks is the certificate is valid and calls the
- * [EMAIL PROTECTED]
org.apache.xml.security.signature.XMLSignature#checkSignatureValue(X509Certificate)
verfication} function.
+ * [EMAIL PROTECTED]
org.apache.xml.security.signature.XMLSignature#checkSignatureValue(X509Certificate)
+ * verification} function.
*
* @param elem the XMLSignature DOM Element.
* @param crypto the object that implements the access to the
keystore and the
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
