From 6f8f9d663f973db35d2779f2fc01473a86c4915682bbe63c57996d41482fa4d9 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 28 Feb 2012 09:54:04 +0000 Subject: [PATCH 1/2] - strip the jakarta- from classpath to be ready for jakarta->apache-commons renaming - added some pms and manifest files OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=9 --- axis-1.4.pom | 56 +++++++++++++++++++++++++++++ axis-MANIFEST.MF | 83 +++++++++++++++++++++++++++++++++++++++++++ axis-ant-1.4.pom | 13 +++++++ axis-jaxrpc-1.4.pom | 13 +++++++ axis-manifest.patch | 44 +++++++++++++++++++++++ axis-saaj-1.4.pom | 13 +++++++ axis-schema-1.4.pom | 6 ++++ axis.changes | 7 ++++ axis.spec | 85 ++++++++++++++++++++++++++++----------------- saaj-MANIFEST.MF | 20 +++++++++++ xmlrpc-MANIFEST.MF | 26 ++++++++++++++ 11 files changed, 335 insertions(+), 31 deletions(-) create mode 100644 axis-1.4.pom create mode 100644 axis-MANIFEST.MF create mode 100644 axis-ant-1.4.pom create mode 100644 axis-jaxrpc-1.4.pom create mode 100644 axis-manifest.patch create mode 100644 axis-saaj-1.4.pom create mode 100644 axis-schema-1.4.pom create mode 100644 saaj-MANIFEST.MF create mode 100644 xmlrpc-MANIFEST.MF diff --git a/axis-1.4.pom b/axis-1.4.pom new file mode 100644 index 0000000..e3bb735 --- /dev/null +++ b/axis-1.4.pom @@ -0,0 +1,56 @@ + + + 4.0.0 + axis + axis + 1.4 + jar + Axis Web Services + + An implementation of the SOAP ("Simple Object Access Protocol") submission to W3C. + + http://ws.apache.org/axis + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + http://svn.apache.org/viewcvs/webservices/axis/trunk/java/ + + + + axis + axis-jaxrpc + 1.4 + + + axis + axis-saaj + 1.4 + + + axis + axis-wsdl4j + 1.5.1 + runtime + + + + commons-logging + commons-logging + 1.0.4 + runtime + + + commons-discovery + commons-discovery + 0.2 + runtime + + + + \ No newline at end of file diff --git a/axis-MANIFEST.MF b/axis-MANIFEST.MF new file mode 100644 index 0000000..9a6eb41 --- /dev/null +++ b/axis-MANIFEST.MF @@ -0,0 +1,83 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.apache.axis +Bundle-Version: 1.4.0.qualifier +Bundle-Vendor: %Bundle-Vendor.0 +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-ClassPath: lib/axis.jar, + lib/axis-ant.jar, + lib/ +Export-Package: org.apache.axis, + org.apache.axis.attachments, + org.apache.axis.client, + org.apache.axis.client.async, + org.apache.axis.collections, + org.apache.axis.components.compiler, + org.apache.axis.components.encoding, + org.apache.axis.components.image, + org.apache.axis.components.jms, + org.apache.axis.components.logger, + org.apache.axis.components.net, + org.apache.axis.components.script, + org.apache.axis.components.threadpool, + org.apache.axis.components.uuid, + org.apache.axis.configuration, + org.apache.axis.constants, + org.apache.axis.deployment.wsdd, + org.apache.axis.deployment.wsdd.providers, + org.apache.axis.description, + org.apache.axis.encoding, + org.apache.axis.encoding.ser, + org.apache.axis.encoding.ser.castor, + org.apache.axis.enum, + org.apache.axis.handlers, + org.apache.axis.handlers.http, + org.apache.axis.handlers.soap, + org.apache.axis.holders, + org.apache.axis.i18n, + org.apache.axis.management, + org.apache.axis.management.jmx, + org.apache.axis.message, + org.apache.axis.monitor, + org.apache.axis.providers, + org.apache.axis.providers.java, + org.apache.axis.schema, + org.apache.axis.security, + org.apache.axis.security.servlet, + org.apache.axis.security.simple, + org.apache.axis.server, + org.apache.axis.session, + org.apache.axis.soap, + org.apache.axis.strategies, + org.apache.axis.tools.ant.axis, + org.apache.axis.tools.ant.foreach, + org.apache.axis.tools.ant.wsdl, + org.apache.axis.transport.http, + org.apache.axis.transport.java, + org.apache.axis.transport.jms, + org.apache.axis.transport.local, + org.apache.axis.transport.mail, + org.apache.axis.types, + org.apache.axis.utils, + org.apache.axis.utils.bytecode, + org.apache.axis.utils.cache, + org.apache.axis.wsdl, + org.apache.axis.wsdl.fromJava, + org.apache.axis.wsdl.gen, + org.apache.axis.wsdl.symbolTable, + org.apache.axis.wsdl.toJava +Require-Bundle: javax.xml.rpc;bundle-version="[1.1.0,2.0.0)", + javax.xml.soap;bundle-version="[1.2.0,2.0.0)", + javax.wsdl;bundle-version="[1.5.1,2.0.0)", + org.apache.commons.discovery;bundle-version="[0.2.0,1.0.0)", + org.apache.ant;resolution:=optional;bundle-version="[1.6.5,2.0.0)" +Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)";resolution:=optional, + org.apache.commons.logging.impl;version="[1.0.4,2.0.0)";resolution:=optional, + javax.servlet;version="[2.4.0,3.0.0)";resolution:=optional, + javax.servlet.http;version="[2.4.0,3.0.0)";resolution:=optional, + javax.activation;resolution:=optional, + javax.mail;resolution:=optional, + javax.mail.internet;resolution:=optional +Eclipse-BuddyPolicy: registered diff --git a/axis-ant-1.4.pom b/axis-ant-1.4.pom new file mode 100644 index 0000000..19feb8f --- /dev/null +++ b/axis-ant-1.4.pom @@ -0,0 +1,13 @@ + + 4.0.0 + axis + axis-ant + 1.4 + + + + org.apache.axis + + + + \ No newline at end of file diff --git a/axis-jaxrpc-1.4.pom b/axis-jaxrpc-1.4.pom new file mode 100644 index 0000000..5c1ec5c --- /dev/null +++ b/axis-jaxrpc-1.4.pom @@ -0,0 +1,13 @@ + + 4.0.0 + axis + axis-jaxrpc + 1.4 + + + + org.apache.axis + + + + \ No newline at end of file diff --git a/axis-manifest.patch b/axis-manifest.patch new file mode 100644 index 0000000..011ccad --- /dev/null +++ b/axis-manifest.patch @@ -0,0 +1,44 @@ +--- build.xml 2011-11-30 16:55:39.668021907 -0500 ++++ build.xml 2011-12-01 11:06:16.379181123 -0500 +@@ -190,38 +190,17 @@ Copyright: + + + +- ++ + + + +- +-
+- +- +- +-
+- + +- ++ + + +- +-
+- +- +- +-
+- + +- ++ + +- +-
+- +- +- +-
+- + + + diff --git a/axis-saaj-1.4.pom b/axis-saaj-1.4.pom new file mode 100644 index 0000000..2853f62 --- /dev/null +++ b/axis-saaj-1.4.pom @@ -0,0 +1,13 @@ + + 4.0.0 + axis + axis-saaj + 1.4 + + + + org.apache.axis + + + + \ No newline at end of file diff --git a/axis-schema-1.4.pom b/axis-schema-1.4.pom new file mode 100644 index 0000000..617b44d --- /dev/null +++ b/axis-schema-1.4.pom @@ -0,0 +1,6 @@ + + 4.0.0 + axis + axis-schema + 1.4 + diff --git a/axis.changes b/axis.changes index 045170e..262ba6c 100644 --- a/axis.changes +++ b/axis.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 28 09:12:20 UTC 2012 - mvyskocil@suse.cz + +- strip the jakarta- from classpath to be ready for jakarta->apache-commons + renaming +- added some pms and manifest files + ------------------------------------------------------------------- Sat Sep 17 13:55:50 UTC 2011 - jengelh@medozas.de diff --git a/axis.spec b/axis.spec index f2179af..0e7ddf7 100644 --- a/axis.spec +++ b/axis.spec @@ -1,7 +1,7 @@ # # spec file for package axis # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,27 +14,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # icecream 0 -%define name axis -%define version 1.4 -%define archivever 1_4 -%define release 2jpp -%define section free Name: axis Version: 1.4 -Release: 275 +Release: 0 Summary: Apache implementation of the SOAP -License: ASLv.. -Group: Development/Languages/Java +License: Apache-2.0 +Group: Development/Libraries/Java Url: http://ws.apache.org/axis/ -Source0: %{name}-src-%{archivever}.tar.bz2 +Source0: axis-src-1_4.tar.bz2 +# svn export http://svn.apache.org/repos/asf/webservices/axis/branches/AXIS_1_4_FINAL/ +# Build only +# cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r v1_1_0 org.eclipse.orbit/javax.xml.rpc/META-INF/MANIFEST.MF +# mv org.eclipse.orbit/javax.xml.rpc/META-INF/MANIFEST.MF xmlrpc-MANIFEST.MF +Source1: xmlrpc-MANIFEST.MF +# cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r v1_4_0 org.eclipse.orbit/org.apache.axis/META-INF/MANIFEST.MF +# mv org.eclipse.orbit/org.apache.axis/META-INF/MANIFEST.MF axis-MANIFEST.MF +Source2: axis-MANIFEST.MF +# cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r v1_3_0 org.eclipse.orbit/javax.xml.soap/META-INF/MANIFEST.MF +# mv org.eclipse.orbit/javax.xml.soap/META-INF/MANIFEST.MF saaj-MANIFEST.MF +Source3: saaj-MANIFEST.MF +Source4: http://repo1.maven.org/maven2/axis/axis/1.4/axis-1.4.pom +Source5: http://repo1.maven.org/maven2/axis/axis-ant/1.4/axis-ant-1.4.pom +Source6: http://repo1.maven.org/maven2/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.pom +Source7: http://repo1.maven.org/maven2/axis/axis-saaj/1.4/axis-saaj-1.4.pom +Source8: axis-schema-1.4.pom Patch0: unimplemented-dom3-methods.patch Patch1: axis-1.4-gcc44_build.patch -# Mandatory requires -# optional requires +Patch2: axis-manifest.patch BuildRequires: ant BuildRequires: ant-jdepend BuildRequires: antlr @@ -44,6 +53,7 @@ BuildRequires: gnu-jaf BuildRequires: jakarta-commons-discovery BuildRequires: jakarta-commons-httpclient3 BuildRequires: jakarta-commons-logging +BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: junit BuildRequires: log4j-mini @@ -51,15 +61,14 @@ BuildRequires: servletapi5 BuildRequires: unzip BuildRequires: wsdl4j BuildRequires: xerces-j2 -BuildRequires: java-devel -Requires: java -Requires: jpackage-utils >= 1.5 Requires: jaf Requires: jakarta-commons-discovery -Requires: jakarta-commons-logging Requires: jakarta-commons-httpclient3 +Requires: jakarta-commons-logging +Requires: java Requires: javamail Requires: jaxp_parser_impl +Requires: jpackage-utils >= 1.5 Requires: log4j Requires: wsdl4j BuildArch: noarch @@ -70,7 +79,6 @@ Apache Axis is an implementation of the SOAP ("Simple Object Access Protocol") submission to W3C. %package javadoc -License: ASLv.. PreReq: coreutils Summary: Api documentation for axis Group: Documentation/Other @@ -79,7 +87,6 @@ Group: Documentation/Other Api documentation for axis %package manual -License: ASLv.. Summary: Manual for axis Group: Documentation/Other @@ -87,25 +94,31 @@ Group: Documentation/Other Manual for axis %prep -%setup -q -n %{name}-%{archivever} +%setup -q -n %{name}-1_4 +ln -s %{_javadocdir}/%{name} docs/apiDocs + %patch0 -p1 %patch1 -p1 -b gcc44-build +%patch2 -p0 + # Remove provided binaries find . -name "*.jar" -exec rm -f {} \; find . -name "*.zip" -exec rm -f {} \; find . -name "*.class" -exec rm -f {} \; +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} . + %build [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java -CLASSPATH=$(build-classpath wsdl4j jakarta-commons-discovery jakarta-commons-httpclient3 jakarta-commons-logging log4j activation javamail servletapi5) +CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging log4j activation javamail servletapi5) export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jdepend jimi xml-security jsse httpunit jms castor 2>/dev/null) export OPT_JAR_LIST="ant/ant-nodeps" export LC_ALL="en_US.UTF-8" # necessary for javadoc ant -Dcompile.ime=true \ -Dwsdl4j.jar=$(build-classpath wsdl4j) \ - -Dcommons-discovery.jar=$(build-classpath jakarta-commons-discovery) \ - -Dcommons-logging.jar=$(build-classpath jakarta-commons-logging) \ - -Dcommons-httpclient.jar=$(build-classpath jakarta-commons-httpclient3) \ + -Dcommons-discovery.jar=$(build-classpath commons-discovery) \ + -Dcommons-logging.jar=$(build-classpath commons-logging) \ + -Dcommons-httpclient.jar=$(build-classpath commons-httpclient3) \ -Dlog4j-core.jar=$(build-classpath log4j) \ -Dactivation.jar=$(build-classpath jaf) \ -Dmailapi.jar=$(build-classpath javamail/mailapi) \ @@ -126,22 +139,32 @@ pushd build/lib install -m 644 axis.jar axis-ant.jar saaj.jar jaxrpc.jar \ %{buildroot}%{_javadir}/%{name} popd -pushd %{buildroot}%{_javadir}/%{name} - for jar in *.jar ; do - vjar=$(echo $jar | sed s+.jar+-%{version}.jar+g) - mv $jar $vjar - ln -fs $vjar $jar - done -popd + ### Javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name} +# POMs +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -m 644 %{S:4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis.pom +%add_maven_depmap JPP.%{name}-axis.pom %{name}/axis.jar +install -m 644 %{S:5} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-ant.pom +%add_maven_depmap JPP.%{name}-axis-ant.pom %{name}/axis-ant.jar +install -m 644 %{S:6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jaxrpc.pom +%add_maven_depmap JPP.%{name}-jaxrpc.pom %{name}/jaxrpc.jar +install -m 644 %{S:7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-saaj.pom +%add_maven_depmap JPP.%{name}-saaj.pom %{name}/saaj.jar +install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom +%add_maven_depmap JPP.%{name}-axis-schema.pom %{name}/axis-schema.jar + %files %defattr(0644,root,root,0755) %doc LICENSE README release-notes.html changelog.html %dir %{_javadir}/%{name} %{_javadir}/%{name}/*.jar +%{_mavenpomdir}/*.pom +%{_mavendepmapfragdir}/%{name} +%dir /usr/share/maven2 %files javadoc %defattr(0644,root,root,0755) diff --git a/saaj-MANIFEST.MF b/saaj-MANIFEST.MF new file mode 100644 index 0000000..c529a9a --- /dev/null +++ b/saaj-MANIFEST.MF @@ -0,0 +1,20 @@ +Manifest-Version: 1.0 +Export-Package: javax.xml.soap;version="1.3.0"; + uses:="javax.activation, + javax.xml.namespace, + javax.xml.transform, + org.w3c.dom" +Bundle-Classpath: . +Bundle-Localization: plugin +Bundle-Name: %Bundle-Name.0 +Bundle-Version: 1.3.0.qualifier +Bundle-ManifestVersion: 2 +Import-Package: javax.activation, + javax.xml.namespace, + javax.xml.transform, + javax.xml.transform.dom, + org.w3c.dom +Bundle-SymbolicName: javax.xml.soap +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: system.bundle +Bundle-Vendor: %Bundle-Vendor.0 diff --git a/xmlrpc-MANIFEST.MF b/xmlrpc-MANIFEST.MF new file mode 100644 index 0000000..ac6132c --- /dev/null +++ b/xmlrpc-MANIFEST.MF @@ -0,0 +1,26 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Created-By: 1.4.2_08-b03 (Sun Microsystems Inc.) + Name: javax/xml/rpc +Specification-Title: JAX-RPC +Specification-Version: 1.1 +Specification-Vendor: JCP +Bundle-SymbolicName: javax.xml.rpc +Bundle-Version: 1.1.0.qualifier +Bundle-Vendor: %Bundle-Vendor.0 +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-ClassPath: lib/jaxrpc.jar +Export-Package: javax.xml.messaging, + javax.xml.rpc, + javax.xml.rpc.encoding, + javax.xml.rpc.handler, + javax.xml.rpc.handler.soap, + javax.xml.rpc.holders, + javax.xml.rpc.server, + javax.xml.rpc.soap +Require-Bundle: org.apache.xerces;bundle-version="[2.8.0,3.0.0)";resolution:=optional +Import-Package: javax.servlet, + javax.servlet.http, + javax.xml.soap From 586a21243a48fef7ad19941f6491d725fa224fd95b326ad5441e6dcf88ecb507 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 29 Feb 2012 15:02:00 +0000 Subject: [PATCH 2/2] comment out unused axis-schema.pom installation OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=10 --- axis.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/axis.spec b/axis.spec index 0e7ddf7..68f753c 100644 --- a/axis.spec +++ b/axis.spec @@ -154,8 +154,8 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jaxrpc.pom %add_maven_depmap JPP.%{name}-jaxrpc.pom %{name}/jaxrpc.jar install -m 644 %{S:7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-saaj.pom %add_maven_depmap JPP.%{name}-saaj.pom %{name}/saaj.jar -install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom -%add_maven_depmap JPP.%{name}-axis-schema.pom %{name}/axis-schema.jar +#install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom +# % add_maven_depmap JPP.%{name}-axis-schema.pom %{name}/axis-schema.jar %files %defattr(0644,root,root,0755) @@ -164,7 +164,6 @@ install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom %{_javadir}/%{name}/*.jar %{_mavenpomdir}/*.pom %{_mavendepmapfragdir}/%{name} -%dir /usr/share/maven2 %files javadoc %defattr(0644,root,root,0755)