Hello community, here is the log from the commit of package axis for openSUSE:Factory checked in at 2012-04-23 09:12:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/axis (Old) and /work/SRC/openSUSE:Factory/.axis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "axis", Maintainer is "bnc-team-j...@forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/axis/axis.changes 2011-09-23 11:36:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.axis.new/axis.changes 2012-04-23 09:12:12.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Feb 28 09:12:20 UTC 2012 - mvysko...@suse.cz + +- strip the jakarta- from classpath to be ready for jakarta->apache-commons + renaming +- added some pms and manifest files + +------------------------------------------------------------------- New: ---- axis-1.4.pom axis-MANIFEST.MF axis-ant-1.4.pom axis-jaxrpc-1.4.pom axis-manifest.patch axis-saaj-1.4.pom axis-schema-1.4.pom saaj-MANIFEST.MF xmlrpc-MANIFEST.MF ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ axis.spec ++++++ --- /var/tmp/diff_new_pack.W1YlXc/_old 2012-04-23 09:12:14.000000000 +0200 +++ /var/tmp/diff_new_pack.W1YlXc/_new 2012-04-23 09:12:14.000000000 +0200 @@ -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: Apache-2.0 -Group: Development/Languages/Java +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:anonym...@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:anonym...@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:anonym...@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: 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: 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 @@ Protocol") submission to W3C. %package javadoc -License: Apache-2.0 PreReq: coreutils Summary: Api documentation for axis Group: Documentation/Other @@ -79,7 +87,6 @@ Api documentation for axis %package manual -License: Apache-2.0 Summary: Manual for axis Group: Documentation/Other @@ -87,25 +94,31 @@ 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,31 @@ 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} %files javadoc %defattr(0644,root,root,0755) ++++++ axis-MANIFEST.MF ++++++ 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 ++++++ axis-ant-1.4.pom ++++++ <project> <modelVersion>4.0.0</modelVersion> <groupId>axis</groupId> <artifactId>axis-ant</artifactId> <version>1.4</version> <distributionManagement> <relocation> <groupId>org.apache.axis</groupId> </relocation> </distributionManagement> </project>++++++ axis-jaxrpc-1.4.pom ++++++ <project> <modelVersion>4.0.0</modelVersion> <groupId>axis</groupId> <artifactId>axis-jaxrpc</artifactId> <version>1.4</version> <distributionManagement> <relocation> <groupId>org.apache.axis</groupId> </relocation> </distributionManagement> </project>++++++ axis-manifest.patch ++++++ --- 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: </replace> <tstamp/> - <jar jarfile="${build.lib}/${name}.jar" basedir="${build.dest}" > + <jar jarfile="${build.lib}/${name}.jar" basedir="${build.dest}" manifest="axis-MANIFEST.MF" > <include name="org/**" /> <include name="log4j.properties" unless="exclude.log4j.configuration"/> <include name="simplelog.properties"/> - <manifest> - <section name="org/apache/axis"> - <attribute name="Implementation-Title" value="Apache Axis"/> - <attribute name="Implementation-Version" value="${axis.version} ${TSTAMP} ${TODAY}"/> - <attribute name="Implementation-Vendor" value="Apache Web Services"/> - </section> - </manifest> </jar> - <jar jarfile="${build.lib}/${jaxrpc}.jar" basedir="${build.dest}" > + <jar jarfile="${build.lib}/${jaxrpc}.jar" basedir="${build.dest}" manifest="xmlrpc-MANIFEST.MF"> <include name="javax/**"/> <exclude name="javax/xml/soap/**"/> - <manifest> - <section name="javax/xml/rpc"> - <attribute name="Specification-Title" value="JAX-RPC"/> - <attribute name="Specification-Version" value="1.1"/> - <attribute name="Specification-Vendor" value="JCP"/> - </section> - </manifest> </jar> - <jar jarfile="${build.lib}/${saaj}.jar" basedir="${build.dest}" > + <jar jarfile="${build.lib}/${saaj}.jar" basedir="${build.dest}" manifest="saaj-MANIFEST.MF" > <include name="javax/xml/soap/**"/> - <manifest> - <section name="javax/xml/soap"> - <attribute name="Specification-Title" value="SAAJ"/> - <attribute name="Specification-Version" value="1.2"/> - <attribute name="Specification-Vendor" value="JCP"/> - </section> - </manifest> </jar> <copy file="${wsdl4j.jar}" toDir="${build.lib}"/> <copy file="${commons-logging.jar}" toDir="${build.lib}"/> ++++++ axis-saaj-1.4.pom ++++++ <project> <modelVersion>4.0.0</modelVersion> <groupId>axis</groupId> <artifactId>axis-saaj</artifactId> <version>1.4</version> <distributionManagement> <relocation> <groupId>org.apache.axis</groupId> </relocation> </distributionManagement> </project>++++++ axis-schema-1.4.pom ++++++ <project> <modelVersion>4.0.0</modelVersion> <groupId>axis</groupId> <artifactId>axis-schema</artifactId> <version>1.4</version> </project> ++++++ saaj-MANIFEST.MF ++++++ 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 ++++++ xmlrpc-MANIFEST.MF ++++++ 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
