[Jpackage-commits] dist/wss4j/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 wss4j-1.5.3-build.patch, NONE, 1.1 wss4j-1.5.3-pom.patch, NONE, 1.1 wss4j-1.5.3-project.patch, NONE, 1.1 wss4j.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 22:17:38 CEST 2008


Update of /home/projects/jpackage/cvs/dist/wss4j/devel
In directory ryu.zarb.org:/tmp/cvs-serv22070/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wss4j-1.5.3-build.patch wss4j-1.5.3-pom.patch 
	wss4j-1.5.3-project.patch wss4j.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/wss4j/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 20:16:29 -0000	1.1
--- .cvsignore	28 May 2008 20:17:36 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ wss4j-1.5.3.tar.gz

--- NEW FILE: wss4j-1.5.3-pom.patch ---
--- pom.xml.sav1	2007-09-06 05:01:37.000000000 +0200
+++ pom.xml	2008-03-27 09:47:47.000000000 +0100
@@ -190,17 +190,18 @@
                 </configuration>
             </plugin>
 
-			<!--<plugin>
+	    <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <testSourceDirectory>${basedir}/test</testSourceDirectory>
                     <includes>
-                        <include>**/*Test.java</include>
+                        <include>**/Test*.java</include>
                     </includes>
                     <excludes>
                         <exclude>tests/w3c/SchemaTest.java</exclude>
                     </excludes>
                 </configuration>
-            </plugin> -->
+            </plugin>
 			
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -392,6 +393,18 @@
 		</dependency>
 		<dependency>
 			<groupId>axis</groupId>
+			<artifactId>axis-jaxrpc</artifactId>
+			<version>${axis.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis-saaj</artifactId>
+			<version>${axis.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
 			<artifactId>axis-ant</artifactId>
 			<version>${axis.version}</version>
 		</dependency>

--- NEW FILE: wss4j.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define section         free

%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}


Name:           wss4j
Summary:        Implementation of the OASIS Web Services Security
Version:        1.5.3
Release:        1jpp
Epoch:          0

URL:            http://ws.apache.org/wss4j/
License:        Apache License v2.0
Group:          Development/Libraries/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
Source0:        %{name}-%{version}.tar.gz
#svn export http://svn.apache.org/repos/asf/webservices/wss4j/tags/1_5_3/ wss4j-1.5.3
#Source1:        pom-maven2jpp-mapdeps.xsl
#Source2:        %{name}-jpp-depmap.xml

Patch0:         wss4j-1.5.3-build.patch
Patch1:         wss4j-1.5.3-pom.patch
Patch2:         wss4j-1.5.3-project.patch

BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-1.5.0-sun-jce-policy
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  junit
%if %{with_maven}
BuildRequires:  maven >= 0:1.1
BuildRequires:  maven-plugins-base
BuildRequires:  maven-plugin-checkstyle 
BuildRequires:  maven-plugin-jdepend 
BuildRequires:  maven-plugin-jxr 
BuildRequires:  maven-plugin-license 
BuildRequires:  maven-plugin-pmd 
BuildRequires:  maven-plugin-test
BuildRequires:  maven-plugin-xdoc
%endif

BuildRequires:  axis >= 0:1.4
BuildRequires:  bouncycastle-provider >= 0:1.37
BuildRequires:  jakarta-commons-codec >= 0:1.3
BuildRequires:  jakarta-commons-discovery >= 0.2
BuildRequires:  jakarta-commons-httpclient >= 0:3.0.1
BuildRequires:  jakarta-commons-logging >= 0:1.1
BuildRequires:  log4j >= 0:1.2.8
BuildRequires:  opensaml >= 0:1.1b
BuildRequires:  ws-fx-addressing >= 0:1.0
BuildRequires:  wsdl4j >= 0:1.6.2
BuildRequires:  xalan-j2 >= 0:2.7.0
BuildRequires:  xerces-j2 >= 0:2.9.0
BuildRequires:  xml-commons-jaxp-1.3-apis
BuildRequires:  xml-security >= 0:1.3.0

Requires:       java >= 0:1.5.0
Requires:       axis >= 0:1.4
Requires:       bouncycastle-provider >= 0:1.37
Requires:       jakarta-commons-codec >= 0:1.3
Requires:       jakarta-commons-discovery >= 0:0.2
Requires:       jakarta-commons-httpclient >= 0:3.0.1
Requires:       jakarta-commons-logging >= 0:1.1
Requires:       log4j >= 0:1.2.8
Requires:       opensaml >= 0:1.1b
Requires:       ws-fx-addressing >= 1.0
Requires:       wsdl4j >= 0:1.6.2
Requires:       xalan-j2 >= 0:2.7.0
Requires:       xerces-j2 >= 0:2.9.0
Requires:       xml-commons-jaxp-1.3-apis
Requires:       xml-security >= 0:1.3.0

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch:      noarch

%description 
Apache WSS4J is an implementation of the OASIS Web Services Security
(WS-Security) from OASIS Web Services Security TC. WSS4J is a
primarily a Java library that can be used to sign and verify SOAP
Messages with WS-Security information. WSS4J will use Apache Axis and
Apache XML-Security projects and will be interoperable with JAX-RPC
based server/clients and .NET server/clients.

%package javadoc
Group:          Development/Documentation
Summary:        Javadoc for %{name}

%description javadoc
Javadoc for %{name}.

%prep
%setup -q 
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2

# set JAVA_HOME for build-classpath to work properly
export JAVA_HOME=%{_jvmdir}/java-1.5.0
ln -sf $(build-classpath addressing) lib
ln -sf $(build-classpath axis/axis) lib
ln -sf $(build-classpath axis/axis-ant) lib
ln -sf $(build-classpath axis/jaxrpc) lib
ln -sf $(build-classpath axis/saaj) lib
ln -sf $(build-classpath bouncycastle/bcprov) lib
ln -sf $(build-classpath commons-codec) lib
ln -sf $(build-classpath commons-discovery) lib
ln -sf $(build-classpath commons-httpclient) lib
ln -sf $(build-classpath commons-logging) lib
ln -sf $(build-classpath log4j) lib
ln -sf $(build-classpath opensaml) lib
ln -sf $(build-classpath wsdl4j) lib
ln -sf $(build-classpath xalan-j2) lib
ln -sf $(build-classpath xalan-j2-serializer) lib
ln -sf $(build-classpath xml-security) lib

ln -sf $(build-classpath xerces-j2) endorsed
ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) endorsed

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0
%if %{without_maven}
ant jar javadoc
%else
mkdir -p target/work
maven -e \
        -Dmaven.repo.remote=file:///usr/share/maven/repository \
        -Dmaven.home.local=$(pwd)/.maven \
        jar javadoc xdoc

#       -Dmaven.test.failure.ignore=true \
%endif

%install
rm -rf $RPM_BUILD_ROOT

# main package
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
%if %{without_maven}
install -m 644 build/%{name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%else
install -m 644 target/%{name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%endif
ln -s wss4j-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d -m 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
%if %{without_maven}
cp -pr build/doc/html/api/* \
    $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
%else
cp -pr target/docs/apidocs/* \
    $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
%endif
ln -s %{name}-%{version} $RPM_BUILD_ROOT/%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
    rm -f %{_javadocdir}/%{name}
fi

%files
%defattr(0644,root,root,0755)
%dir %{_javadir}
%{_javadir}/wss4j-%{version}.jar
%{_javadir}/wss4j.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%changelog
* Fri Mar 28 2008 Ralph Apel <r.apel at r-apel.de> 0:1.5.3-1jpp
- 1.5.3
- Drop ws-commons-policy and ws-commons-neethi (B)Rs
- Build with maven1 by default

* Wed Oct 10 2007 Ralph Apel <r.apel at r-apel.de> 0:1.5.0-3jpp
- (B)R bouncycastle-provider instead of bouncycastle-jdk1.X
- (B)R ws-commons-neethi, as a way of avoiding usage of old neethi
  package to satisfy ws-commons-policy (B)R

* Wed Jul 11 2007 Ralph Apel <r.apel at r-apel.de> 0:1.5.0-2jpp
- Replace neethi (B)R by ws-commons-policy

* Wed May 24 2006 Deepak Bhole <dbhole at redhat.com> 0:1.5.0-1jpp
- Upgrade to 1.5.0

* Mon Jan 16 2006 Deepak Bhole <dbhole at redhat.com> 0:1.1.1-0.20060117.1jpp
- Upgrade to 1.1.1 snapshot

* Thu Oct 20 2005 Deepak Bhole <dbhole at redhat.com> 0:1.1.0-1jpp
- Initial build.

--- NEW FILE: wss4j-1.5.3-project.patch ---
--- project.xml.sav2	2006-04-30 22:12:20.000000000 +0200
+++ project.xml	2008-03-27 10:20:27.000000000 +0100
@@ -13,7 +13,7 @@
   
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-SNAPSHOT -->
-  <currentVersion>1.5</currentVersion>
+  <currentVersion>1.5.3</currentVersion>
   
   <!-- details about the organization that 'owns' the project -->
   <organization>
@@ -48,11 +48,13 @@
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
+<!--
   <repository>
   	<connection>scm:svn:http://svn.apache.org:repos/asf/webservices:wss4j/trunk</connection>
 	<developerConnection>scm:svn:http://svn.apache.org:repos/asf/webservices:wss4j/trunk</developerConnection>
 	<url>http://svn.apache.org/viewcvs.cgi/webservices/wss4j/trunk?root=Apache-SVN</url>
   </repository>
+-->
 
   <!-- any mailing lists for the project -->
     <mailingLists>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/wss4j/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 20:16:29 -0000	1.1
--- sources	28 May 2008 20:17:36 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ c86f222d79d530a3aa1a4cbba6dc5f68  wss4j-1.5.3.tar.gz

--- NEW FILE: wss4j-1.5.3-build.patch ---
--- build.xml.sav	2008-03-26 18:14:34.000000000 +0100
+++ build.xml	2008-03-26 18:15:00.000000000 +0100
@@ -499,7 +499,7 @@
 
     <target name="unitTests" unless="skip.tests" depends="compile">
         <junit printsummary="yes"
-            haltonfailure="yes"
+            haltonfailure="false"
             fork="yes"
             dir="${basedir}">
             <!-- See if this helps with Gump test failures -->




More information about the JPackage-commits mailing list