Issue #1805 - adding missing qpid changeset to 13.4
- the baselined AWIPS II Jetty was incompatible with qpid; so, the expected version of jetty will be used - source jars will no longer be included in the rpms - merged specs patch file Change-Id: I8172800bfbc31be7117c490e828ebfc1e2355774 Conflicts: rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0 Former-commit-id:d7b463f6a4[formerlyd7b463f6a4[formerly 2d38533790815d569a957702f6f4b122de9bcd62]] Former-commit-id:f3dfe43098Former-commit-id:fd40278c71
This commit is contained in:
Bryan Kowal
parent
ffe14a6d2e
commit
e413abcaf9
13 changed files with 30 additions and 88 deletions
|
|
@ -87,22 +87,33 @@ diff -crB a/qpid/java/build.deps b/qpid/java/build.deps
|
|||
|
||||
derby-db=lib/required/derby-10.8.2.2.jar
|
||||
***************
|
||||
*** 35,38 ****
|
||||
geronimo-openejb=lib/required/geronimo-ejb_3.0_spec-1.0.1.jar
|
||||
! geronimo-servlet=lib/required/geronimo-servlet_2.5_spec-1.2.jar
|
||||
|
||||
junit=lib/required/junit-3.8.1.jar
|
||||
--- 35,38 ----
|
||||
geronimo-openejb=lib/required/geronimo-ejb_3.0_spec-1.0.1.jar
|
||||
! geronimo-servlet=lib/required/geronimo-servlet_2.5_spec-1.1.2.jar
|
||||
|
||||
junit=lib/required/junit-3.8.1.jar
|
||||
***************
|
||||
*** 45,51 ****
|
||||
slf4j-api=lib/required/slf4j-api-1.6.4.jar
|
||||
slf4j-log4j=lib/required/slf4j-log4j12-1.6.4.jar
|
||||
|
||||
! xalan=lib/required/xalan-2.7.0.jar
|
||||
|
||||
jetty=lib/required/jetty-server-7.6.3.v20120416.jar
|
||||
jetty-continuation=lib/required/jetty-continuation-7.6.3.v20120416.jar
|
||||
jetty=lib/required/jetty-server-7.6.3.v20120416.jar
|
||||
jetty-continuation=lib/required/jetty-continuation-7.6.3.v20120416.jar
|
||||
--- 45,51 ----
|
||||
slf4j-api=lib/required/slf4j-api-1.6.4.jar
|
||||
slf4j-log4j=lib/required/slf4j-log4j12-1.6.4.jar
|
||||
|
||||
! xalan=lib/required/xalan-2.7.1.jar
|
||||
|
||||
jetty=lib/required/jetty-server-7.6.3.v20120416.jar
|
||||
jetty-continuation=lib/required/jetty-continuation-7.6.3.v20120416.jar
|
||||
jetty=lib/required/jetty-server-7.6.3.v20120416.jar
|
||||
jetty-continuation=lib/required/jetty-continuation-7.6.3.v20120416.jar
|
||||
***************
|
||||
*** 63,70 ****
|
||||
|
||||
|
|
|
|||
|
|
@ -10,4 +10,5 @@ org.apache.commons.collections/commons-collections-3.2.jar
|
|||
org.apache.commons.configuration/commons-configuration-1.6.jar
|
||||
org.codehaus.jackson/jackson-core-asl-1.7.3.jar
|
||||
org.codehaus.jackson/jackson-mapper-asl-1.7.3.jar
|
||||
org.junit/mockito-all-1.9.0.jar
|
||||
org.junit/mockito-all-1.9.0.jar
|
||||
org.apache.commons.cxf/geronimo-servlet_2.5_spec-1.1.2.jar
|
||||
|
|
|
|||
BIN
rpms/awips2.qpid/0.18/SOURCES/awips2/dojo-war-1.7.2.war
Normal file
BIN
rpms/awips2.qpid/0.18/SOURCES/awips2/dojo-war-1.7.2.war
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,64 +0,0 @@
|
|||
diff -crB a/qpid/java/build.deps b/qpid/java/build.deps
|
||||
*** a/qpid/java/build.deps 2013-01-23 13:54:15.000000000 -0600
|
||||
--- b/qpid/java/build.deps 2013-01-23 13:52:28.000000000 -0600
|
||||
***************
|
||||
*** 19,29 ****
|
||||
|
||||
commons-beanutils-core=lib/required/commons-beanutils-core-1.8.3.jar
|
||||
commons-cli=lib/required/commons-cli-1.2.jar
|
||||
! commons-codec=lib/required/commons-codec-1.6.jar
|
||||
commons-collections=lib/required/commons-collections-3.2.1.jar
|
||||
! commons-configuration=lib/required/commons-configuration-1.8.jar
|
||||
commons-digester=lib/required/commons-digester-1.8.1.jar
|
||||
! commons-lang=lib/required/commons-lang-2.6.jar
|
||||
commons-logging=lib/required/commons-logging-1.1.1.jar
|
||||
|
||||
derby-db=lib/required/derby-10.8.2.2.jar
|
||||
--- 19,29 ----
|
||||
|
||||
commons-beanutils-core=lib/required/commons-beanutils-core-1.8.3.jar
|
||||
commons-cli=lib/required/commons-cli-1.2.jar
|
||||
! commons-codec=lib/required/commons-codec-1.4.jar
|
||||
commons-collections=lib/required/commons-collections-3.2.1.jar
|
||||
! commons-configuration=lib/required/commons-configuration-1.6.jar
|
||||
commons-digester=lib/required/commons-digester-1.8.1.jar
|
||||
! commons-lang=lib/required/commons-lang-2.3.jar
|
||||
commons-logging=lib/required/commons-logging-1.1.1.jar
|
||||
|
||||
derby-db=lib/required/derby-10.8.2.2.jar
|
||||
***************
|
||||
*** 45,51 ****
|
||||
slf4j-api=lib/required/slf4j-api-1.6.4.jar
|
||||
slf4j-log4j=lib/required/slf4j-log4j12-1.6.4.jar
|
||||
|
||||
! xalan=lib/required/xalan-2.7.0.jar
|
||||
|
||||
jetty=lib/required/jetty-server-7.6.3.v20120416.jar
|
||||
jetty-continuation=lib/required/jetty-continuation-7.6.3.v20120416.jar
|
||||
--- 45,51 ----
|
||||
slf4j-api=lib/required/slf4j-api-1.6.4.jar
|
||||
slf4j-log4j=lib/required/slf4j-log4j12-1.6.4.jar
|
||||
|
||||
! xalan=lib/required/xalan-2.7.1.jar
|
||||
|
||||
jetty=lib/required/jetty-server-7.6.3.v20120416.jar
|
||||
jetty-continuation=lib/required/jetty-continuation-7.6.3.v20120416.jar
|
||||
***************
|
||||
*** 63,70 ****
|
||||
|
||||
felix.libs=${felix-main}
|
||||
|
||||
! jackson-core=lib/required/jackson-core-asl-1.9.0.jar
|
||||
! jackson-mapper=lib/required/jackson-mapper-asl-1.9.0.jar
|
||||
|
||||
commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
|
||||
${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
|
||||
--- 63,70 ----
|
||||
|
||||
felix.libs=${felix-main}
|
||||
|
||||
! jackson-core=lib/required/jackson-core-asl-1.7.3.jar
|
||||
! jackson-mapper=lib/required/jackson-mapper-asl-1.7.3.jar
|
||||
|
||||
commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
|
||||
${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
diff -crB a/qpid-java.spec b/qpid-java.spec
|
||||
*** a/qpid-java.spec 2013-04-15 16:19:49.000000000 -0500
|
||||
--- b/qpid-java.spec 2013-04-15 16:23:28.000000000 -0500
|
||||
--- b/qpid-java.spec 2013-04-24 13:31:29.000000000 -0500
|
||||
***************
|
||||
*** 1,6 ****
|
||||
Name: qpid-java
|
||||
|
|
@ -14,7 +14,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
|
|||
+
|
||||
Name: qpid-java
|
||||
Version: 0.18
|
||||
! Release: 3%{?dist}
|
||||
! Release: 4%{?dist}
|
||||
Summary: Java implementation of Apache Qpid
|
||||
License: Apache Software License
|
||||
Group: Development/Java
|
||||
|
|
@ -68,7 +68,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
|
|||
+ fi
|
||||
+ done
|
||||
+ # copy dependencies that are not native to the baseline to required
|
||||
+ cp -f %{_topdir}/SOURCES/awips2/*.jar java/lib/required
|
||||
+ cp -f %{_topdir}/SOURCES/awips2/*.jar %{_topdir}/SOURCES/awips2/*.war java/lib/required
|
||||
+ if [ $? -ne 0 ]; then
|
||||
+ exit 1
|
||||
+ fi
|
||||
|
|
@ -99,7 +99,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
|
|||
! -Dmodules=${module}
|
||||
! done
|
||||
! ant -Dretrieve.dependencies=false \
|
||||
! -Dmodules=common\ client\ amqp-1-0-common\ amqp-1-0-client\ amqp-1-0-client-jms\ management/common\ broker\ jca\ systests\ broker-plugins/management-jmx
|
||||
! -Dmodules=common\ client\ amqp-1-0-common\ amqp-1-0-client\ amqp-1-0-client-jms\ management/common\ broker\ jca\ systests\ broker-plugins/access-control\ broker-plugins/firewall\ broker-plugins/management-http\ broker-plugins/management-jmx
|
||||
! if [ $? -ne 0 ]; then
|
||||
! exit 1
|
||||
! fi
|
||||
|
|
@ -155,30 +155,26 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
|
|||
|
||||
%changelog
|
||||
* Thu Sep 6 2012 Irina Boverman <iboverma@redhat.com> - 0.18-2
|
||||
--- 122,239 ----
|
||||
--- 122,233 ----
|
||||
|
||||
cd ..
|
||||
|
||||
! install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-client-%{version}.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-client-%{version}-sources.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-common-%{version}.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-common-%{version}-sources.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-broker-%{version}.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-broker-%{version}-sources.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-management-common-%{version}.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-management-common-%{version}-sources.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/plugins/qpid-broker-plugins-management-jmx-%{version}.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-broker-plugins-management-jmx-%{version}-sources.jar \
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/plugins/qpid-broker-plugins-access-control-%{version}.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/plugins/qpid-broker-plugins-firewall-%{version}.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
! install -pm 644 %{qpid_src_dir}/java/build/lib/plugins/qpid-broker-plugins-management-http-%{version}.jar \
|
||||
! %{buildroot}%{_awips2_directory}/lib/opt
|
||||
!
|
||||
! # scripts for broker
|
||||
|
|
@ -234,9 +230,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
|
|||
! %dir /awips2/qpid/lib
|
||||
! %dir /awips2/qpid/lib/opt
|
||||
! /awips2/qpid/lib/opt/qpid-common-%{version}.jar
|
||||
! /awips2/qpid/lib/opt/qpid-common-%{version}-sources.jar
|
||||
! /awips2/qpid/lib/opt/qpid-management-common-%{version}.jar
|
||||
! /awips2/qpid/lib/opt/qpid-management-common-%{version}-sources.jar
|
||||
! %dir /awips2/qpid/lib/opt/qpid-deps
|
||||
! /awips2/qpid/lib/opt/qpid-deps/*
|
||||
! %doc /awips2/qpid/LICENSE
|
||||
|
|
@ -248,7 +242,6 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
|
|||
! %dir /awips2/qpid/lib
|
||||
! %dir /awips2/qpid/lib/opt
|
||||
! /awips2/qpid/lib/opt/qpid-client-%{version}.jar
|
||||
! /awips2/qpid/lib/opt/qpid-client-%{version}-sources.jar
|
||||
!
|
||||
! %files broker
|
||||
! %defattr(-,awips,fxalpha,-)
|
||||
|
|
@ -256,9 +249,10 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
|
|||
! %dir /awips2/qpid/lib
|
||||
! %dir /awips2/qpid/lib/opt
|
||||
! /awips2/qpid/lib/opt/qpid-broker-%{version}.jar
|
||||
! /awips2/qpid/lib/opt/qpid-broker-%{version}-sources.jar
|
||||
! /awips2/qpid/lib/opt/qpid-broker-plugins-management-jmx-%{version}.jar
|
||||
! /awips2/qpid/lib/opt/qpid-broker-plugins-management-jmx-%{version}-sources.jar
|
||||
! /awips2/qpid/lib/opt/qpid-broker-plugins-access-control-%{version}.jar
|
||||
! /awips2/qpid/lib/opt/qpid-broker-plugins-firewall-%{version}.jar
|
||||
! /awips2/qpid/lib/opt/qpid-broker-plugins-management-http-%{version}.jar
|
||||
! %dir /awips2/qpid/log
|
||||
! %defattr(755,awips,fxalpha,755)
|
||||
! %dir /awips2/qpid/bin
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue