From 33ebe119d0d8fec54c2ef63815be0b12bea5c2726e52e787325b2c7ba2b833ce Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 1 Mar 2022 15:46:51 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=47 --- axis.changes | 5 +++++ axis.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/axis.changes b/axis.changes index f95a807..a50eb88 100644 --- a/axis.changes +++ b/axis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 1 15:46:26 UTC 2022 - Fridrich Strba + +- Alias relevant artifacts to org.apache.axis + ------------------------------------------------------------------- Tue Feb 22 19:26:22 UTC 2022 - Fridrich Strba diff --git a/axis.spec b/axis.spec index 66a891c..4aeae98 100644 --- a/axis.spec +++ b/axis.spec @@ -152,11 +152,11 @@ install -d -m 755 %{buildroot}%{_mavenpomdir} install -m 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.%{name}-axis.pom %add_maven_depmap JPP.%{name}-axis.pom %{name}/axis.jar install -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP.%{name}-axis-ant.pom -%add_maven_depmap JPP.%{name}-axis-ant.pom %{name}/axis-ant.jar +%add_maven_depmap JPP.%{name}-axis-ant.pom %{name}/axis-ant.jar -a org.apache.axis:axis-ant install -m 644 %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxrpc.pom -%add_maven_depmap JPP.%{name}-jaxrpc.pom %{name}/jaxrpc.jar +%add_maven_depmap JPP.%{name}-jaxrpc.pom %{name}/jaxrpc.jar -a org.apache.axis:%{name}-jaxrpc install -m 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.%{name}-saaj.pom -%add_maven_depmap JPP.%{name}-saaj.pom %{name}/saaj.jar +%add_maven_depmap JPP.%{name}-saaj.pom %{name}/saaj.jar -a org.apache.axis:%{name}-saaj #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 From 9dc438691d1a8c4487e638c0f31c1fa6390d2e932f081675c7eff4af66c2f334 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 1 Mar 2022 16:52:12 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=48 --- axis-schema-1.4.pom | 6 ------ axis.spec | 37 ++++++++++++++++++------------------- 2 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 axis-schema-1.4.pom diff --git a/axis-schema-1.4.pom b/axis-schema-1.4.pom deleted file mode 100644 index 617b44d..0000000 --- a/axis-schema-1.4.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - axis - axis-schema - 1.4 - diff --git a/axis.spec b/axis.spec index 4aeae98..da52689 100644 --- a/axis.spec +++ b/axis.spec @@ -35,11 +35,10 @@ 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 +Source4: https://repo1.maven.org/maven2/axis/axis/1.4/axis-1.4.pom +Source5: https://repo1.maven.org/maven2/axis/axis-ant/1.4/axis-ant-1.4.pom +Source6: https://repo1.maven.org/maven2/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.pom +Source7: https://repo1.maven.org/maven2/axis/axis-saaj/1.4/axis-saaj-1.4.pom Patch0: unimplemented-dom3-methods.patch Patch1: axis-1.4-gcc44_build.patch Patch2: axis-manifest.patch @@ -94,6 +93,10 @@ Manual for axis %prep %setup -q -n %{name}-1_4 +cp %{SOURCE5} %{SOURCE6} %{SOURCE7} . +%pom_xpath_remove pom:distributionManagement *-1.4.pom +cp %{SOURCE8} %{SOURCE9} . +%pom_xpath_set pom:project/pom:version %{version} *-1.3.pom %patch0 -p1 %patch1 -p1 -b gcc44-build @@ -116,12 +119,14 @@ rm -f src/org/apache/axis/deployment/wsdd/providers/WSDDJavaEJBProvider.java cp %{SOURCE1} %{SOURCE2} %{SOURCE3} . +mkdir -p build/schema + %build [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging reload4j 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" -ant -Dcompile.ime=true \ +ant -Dcompile.ime=true -Dgenerate.schema.jar=true \ -Dwsdl4j.jar=$(build-classpath wsdl4j) \ -Dcommons-discovery.jar=$(build-classpath commons-discovery) \ -Dcommons-logging.jar=$(build-classpath commons-logging) \ @@ -149,24 +154,18 @@ popd # POMs install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.%{name}-axis.pom -%add_maven_depmap JPP.%{name}-axis.pom %{name}/axis.jar -install -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP.%{name}-axis-ant.pom -%add_maven_depmap JPP.%{name}-axis-ant.pom %{name}/axis-ant.jar -a org.apache.axis:axis-ant -install -m 644 %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxrpc.pom +install -m 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom +%add_maven_depmap JPP.%{name}.pom %{name}/axis.jar +install -m 644 axis-ant-1.4.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-ant.pom +%add_maven_depmap JPP.%{name}-ant.pom %{name}/axis-ant.jar -a org.apache.axis:axis-ant +install -m 644 %{name}-jaxrpc-1.4.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxrpc.pom %add_maven_depmap JPP.%{name}-jaxrpc.pom %{name}/jaxrpc.jar -a org.apache.axis:%{name}-jaxrpc -install -m 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.%{name}-saaj.pom +install -m 644 %{name}-saaj-1.4.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-saaj.pom %add_maven_depmap JPP.%{name}-saaj.pom %{name}/saaj.jar -a org.apache.axis:%{name}-saaj -#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 +%files -f .mfiles %license LICENSE %doc README release-notes.html changelog.html -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/*.jar -%{_mavenpomdir}/*.pom -%{_datadir}/maven-metadata/%{name}.xml %files manual %doc docs/* From 063a08bea80a98dcb3ee8718fe6ca14c93a14915d87e5abf6f87a8ff09e350cf Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 1 Mar 2022 17:01:30 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=49 --- axis.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/axis.spec b/axis.spec index da52689..90db2e7 100644 --- a/axis.spec +++ b/axis.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Apache implementation of the SOAP License: Apache-2.0 Group: Development/Libraries/Java -URL: http://axis.apache.org/axis/ +URL: https://axis.apache.org/axis/ Source0: axis-src-1_4.tar.bz2 # svn export http://svn.apache.org/repos/asf/webservices/axis/branches/AXIS_1_4_FINAL/ # Build only @@ -94,9 +94,7 @@ Manual for axis %prep %setup -q -n %{name}-1_4 cp %{SOURCE5} %{SOURCE6} %{SOURCE7} . -%pom_xpath_remove pom:distributionManagement *-1.4.pom -cp %{SOURCE8} %{SOURCE9} . -%pom_xpath_set pom:project/pom:version %{version} *-1.3.pom +%pom_xpath_remove pom:distributionManagement *.pom %patch0 -p1 %patch1 -p1 -b gcc44-build @@ -126,7 +124,7 @@ mkdir -p build/schema CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging reload4j 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" -ant -Dcompile.ime=true -Dgenerate.schema.jar=true \ +ant -Dcompile.ime=true \ -Dwsdl4j.jar=$(build-classpath wsdl4j) \ -Dcommons-discovery.jar=$(build-classpath commons-discovery) \ -Dcommons-logging.jar=$(build-classpath commons-logging) \