February 2011 - java-sig-commits - Fedora Mailing-Lists

[apache-commons-validator] Change oro to jakarta-oro in BR/R

by Stanislav Ochotnicky

commit 6a68c77391bc06b09923f53ece8db7d3f329223d Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue Feb 22 09:57:38 2011 +0100 Change oro to jakarta-oro in BR/R apache-commons-validator.spec | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) --- diff --git a/apache-commons-validator.spec b/apache-commons-validator.spec index 486c217..376e204 100644 --- a/apache-commons-validator.spec +++ b/apache-commons-validator.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache Commons Validator Group: Development/Libraries License: ASL 2.0 @@ -18,12 +18,12 @@ BuildRequires: ant BuildRequires: apache-commons-beanutils BuildRequires: apache-commons-digester BuildRequires: apache-commons-logging -BuildRequires: oro +BuildRequires: jakarta-oro BuildRequires: junit Requires: apache-commons-beanutils Requires: apache-commons-digester Requires: apache-commons-logging -Requires: oro +Requires: jakarta-oro Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires(post): jpackage-utils @@ -34,11 +34,11 @@ Provides: jakarta-%{short_name} = 0:%{version}-%{release} Obsoletes: jakarta-%{short_name} < 0:1.3.1-2 %description -A common issue when receiving data either electronically or from user input is -verifying the integrity of the data. This work is repetitive and becomes even -more complicated when different sets of validation rules need to be applied to -the same set of data based on locale for example. Error messages may also vary -by locale. This package attempts to address some of these issues and speed +A common issue when receiving data either electronically or from user input is +verifying the integrity of the data. This work is repetitive and becomes even +more complicated when different sets of validation rules need to be applied to +the same set of data based on locale for example. Error messages may also vary +by locale. This package attempts to address some of these issues and speed development and maintenance of validation rules. %package javadoc @@ -58,8 +58,8 @@ sed -i 's/\r//' RELEASE-NOTES.txt sed -i 's/\r//' NOTICE.txt %build -# TODO: Use Maven for building as soon as upstream provides proper build.xml. -# Currently upstream build.xml uses antrun plugin to build, so downloads +# TODO: Use Maven for building as soon as upstream provides proper build.xml. +# Currently upstream build.xml uses antrun plugin to build, so downloads # during build process can't be prohibited. export CLASSPATH=$(build-classpath \ @@ -67,7 +67,7 @@ export CLASSPATH=$(build-classpath \ apache-commons-digester \ apache-commons-beanutils \ junit \ - oro ) + jakarta-oro ) ant -Dskip.download=true -Dbuild.sysclasspath=first dist @@ -77,7 +77,7 @@ export CLASSPATH=$(build-classpath \ apache-commons-digester \ apache-commons-beanutils \ junit \ - oro ) + jakarta-oro ) ant -Dskip.download=true -Dbuild.sysclasspath=first test @@ -110,6 +110,9 @@ rm -rf %{buildroot} %{_javadocdir}/%{name} %changelog +* Tue Feb 22 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.3.1-5 +- Change oro to jakarta-oro in BR/R + * Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

13 years, 2 months

1
0
0 / 0

[apache-commons-csv] Initial version of the package

by Stanislav Ochotnicky

commit b62ae61549b6ab50dbcf1843c61a2cecb3fdbef0 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue Feb 22 09:32:02 2011 +0100 Initial version of the package .gitignore | 1 + apache-commons-csv.spec | 89 +++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 91 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..cebaa3d 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/apache-commons-csv-1.0.tar.xz diff --git a/apache-commons-csv.spec b/apache-commons-csv.spec new file mode 100644 index 0000000..c103d5e --- /dev/null +++ b/apache-commons-csv.spec @@ -0,0 +1,89 @@ +%global base_name csv +%global short_name commons-%{base_name} + +Name: apache-%{short_name} +Version: 1.0 +Release: 0.1.svn1071189%{?dist} +Summary: Utilities to assist with handling of CSV files +License: ASL 2.0 +Group: Development/Libraries +URL: http://commons.apache.org/sandbox/%{base_name} +# svn export -r 1071189 http://svn.apache.org/repos/asf/commons/sandbox/csv/trunk/ apache-commons-csv-1.0 +# tar caf apache-commons-csv-1.0.tar.xz apache-commons-csv-1.0 +Source0: %{name}-%{version}.tar.xz +BuildArch: noarch + +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: junit4 +BuildRequires: maven +BuildRequires: maven-surefire-provider-junit4 +BuildRequires: apache-commons-parent + +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun): jpackage-utils + +%description +Commons CSV was started to unify a common and simple interface for +reading and writing CSV files under an ASL license. + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils + + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q +sed -i 's/\r//' *.txt +sed -i 's:commons-sandbox-parent:commons-parent:' pom.xml + +%build +mvn-rpmbuild install javadoc:javadoc + +%install +# jars +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 target/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar +ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom +%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} + +# following line is only for backwards compatibility. New packages +# should use proper groupid org.apache.commons +%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name} + +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt NOTICE.txt +%{_javadir}/*.jar +%{_mavenpomdir}/JPP-%{short_name}.pom +%{_mavendepmapfragdir}/* + +%files javadoc +%defattr(-,root,root,-) +%doc LICENSE.txt NOTICE.txt +%doc %{_javadocdir}/%{name} + +%changelog +* Thu Feb 17 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0-0.1.svn1071189 +- Initial version of the package + diff --git a/sources b/sources index e69de29..5777cda 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +7f232c4904017dc5508e2e04e22ddca8 apache-commons-csv-1.0.tar.xz

13 years, 2 months

1
0
0 / 0

[maven-doxia] Change oro to jakarta-oro in BR/R

by Stanislav Ochotnicky

commit a5594ad15dada36b92e318e6c97b2d30feff7b83 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue Feb 22 09:29:25 2011 +0100 Change oro to jakarta-oro in BR/R maven-doxia.spec | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) --- diff --git a/maven-doxia.spec b/maven-doxia.spec index 5beb573..d85bc11 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -30,7 +30,7 @@ Name: maven-doxia Version: 1.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Content generation framework License: ASL 2.0 @@ -91,7 +91,7 @@ BuildRequires: apache-commons-logging BuildRequires: apache-commons-validator BuildRequires: apache-commons-configuration BuildRequires: junit -BuildRequires: oro +BuildRequires: jakarta-oro BuildRequires: plexus-i18n BuildRequires: plexus-utils >= 1.5.7 BuildRequires: plexus-velocity @@ -109,7 +109,7 @@ Requires: apache-commons-collections Requires: apache-commons-logging Requires: apache-commons-validator Requires: junit -Requires: oro +Requires: jakarta-oro Requires: plexus-container-default Requires: plexus-i18n Requires: plexus-utils >= 1.5.7 @@ -227,6 +227,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %doc %{_javadocdir}/* %changelog +* Tue Feb 22 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.1.4-3 +- Change oro to jakarta-oro in BR/R + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

13 years, 2 months

1
0
0 / 0

File apache-commons-csv-1.0.tar.xz uploaded to lookaside cache by sochotni

by Stanislav Ochotnicky

A file has been added to the lookaside cache for apache-commons-csv: 7f232c4904017dc5508e2e04e22ddca8 apache-commons-csv-1.0.tar.xz

13 years, 2 months

1
0
0 / 0

[apache-james-project] Initial version of the package

by Stanislav Ochotnicky

commit 8223e7c89ae6d348ed57aaf29e25b55afe4b8cbc Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue Feb 22 08:32:39 2011 +0100 Initial version of the package .gitignore | 1 + apache-james-project.spec | 81 +++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 83 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..cabbf2a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/james-parent-1.5-source-release.zip diff --git a/apache-james-project.spec b/apache-james-project.spec new file mode 100644 index 0000000..f5470c8 --- /dev/null +++ b/apache-james-project.spec @@ -0,0 +1,81 @@ +%global server_ver 2.2.0 +%global short_name apache-james + +Name: %{short_name}-project +Version: 1.5 +Release: 1%{?dist} +Summary: Main project POM files and resources +License: ASL 2.0 +Group: Development/Libraries +URL: http://james.apache.org/ +Source0: http://repo1.maven.org/maven2/org/apache/james/james-parent/%{version}/ja... +BuildArch: noarch + +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: maven +BuildRequires: maven-surefire-provider-junit4 +BuildRequires: apache-commons-parent + +Requires: maven +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun): jpackage-utils + +%description +Main project POM files and resources for Apache James project + + +%prep +%setup -q -n james-parent-%{version} + +%build +# to build james skin for site plugin +mvn-rpmbuild install + +%install +# jars +install -d -m 755 %{buildroot}%{_javadir}/%{short_name} +install -p -m 644 maven-skin/target/maven-skin-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/maven-skin.jar + +# poms +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 maven-skin/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-maven-skin.pom +%add_to_maven_depmap org.apache.james maven-skin %{version} JPP/%{short_name} maven-skin + +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-parent.pom +%add_to_maven_depmap org.apache.james james-parent %{version} JPP/%{short_name} parent + +install -pm 644 project/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-project.pom +%add_to_maven_depmap org.apache.james james-project %{version} JPP/%{short_name} project + +install -pm 644 project/server/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-server-root.pom +%add_to_maven_depmap org.apache.james james-server-root %{version} JPP/%{short_name} server-root + +pom_ver=`echo %{server_ver} | tr . -` +install -pm 644 project/server/%{server_ver}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{short_name}-server-site.pom +%add_to_maven_depmap org.apache.james james-server-site-$pom_ver %{version} JPP/%{short_name} server-site + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + +%files +%defattr(-,root,root,-) +%doc LICENSE NOTICE +%{_javadir}/%{short_name}/*.jar +%{_mavenpomdir}/JPP.%{short_name}-maven-skin.pom +%{_mavenpomdir}/JPP.%{short_name}-parent.pom +%{_mavenpomdir}/JPP.%{short_name}-project.pom +%{_mavenpomdir}/JPP.%{short_name}-server-root.pom +%{_mavenpomdir}/JPP.%{short_name}-server-site.pom +%{_mavendepmapfragdir}/* + + +%changelog +* Mon Feb 21 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.5-1 +- Initial version of the package + diff --git a/sources b/sources index e69de29..a1ce201 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e1a3cda8583bb0e5d7d3172568cb0a63 james-parent-1.5-source-release.zip

13 years, 2 months

1
0
0 / 0

File james-parent-1.5-source-release.zip uploaded to lookaside cache by sochotni

by Stanislav Ochotnicky

A file has been added to the lookaside cache for apache-james-project: e1a3cda8583bb0e5d7d3172568cb0a63 james-parent-1.5-source-release.zip

13 years, 2 months

1
0
0 / 0

[velocity] Update to latest version

by Stanislav Ochotnicky

commit cf428fb9fc8a050043d588b96ca5d094029c5267 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Mon Feb 21 16:48:54 2011 +0100 Update to latest version - Drop old/unused patches .gitignore | 1 + 0001-Remove-avalon-logkit.patch | 62 ++++++++ 0002-Fix-servlet25-testcase.patch | 64 +++++++++ ...system-jars.patch => 0003-Use-system-jars.patch | 59 +++++--- sources | 2 +- velocity-1.6.4.pom => velocity-1.7.pom | 29 +++- ...AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch | 11 -- velocity-AnakiaTask-jdom-XMLOutputter.patch | 21 --- velocity-build-testcases.patch | 11 -- velocity-cleanup-pom.patch | 35 ----- velocity-enum.patch | 150 -------------------- velocity-legacy-tests.patch | 15 -- velocity-remove-avalon-logkit.patch | 31 ---- velocity-servletapi5.patch | 29 ---- velocity-tomcat6.patch | 37 ----- velocity.spec | 43 +++--- 16 files changed, 208 insertions(+), 392 deletions(-) --- diff --git a/.gitignore b/.gitignore index 4c5a55f..57d2359 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ velocity-1.6.3.tar.gz /velocity-1.6.4.tar.gz +/velocity-1.7.tar.gz diff --git a/0001-Remove-avalon-logkit.patch b/0001-Remove-avalon-logkit.patch new file mode 100644 index 0000000..2f09b03 --- /dev/null +++ b/0001-Remove-avalon-logkit.patch @@ -0,0 +1,62 @@ +From 1d2f89cb3e954b943751fa8dd587fdb404eb9338 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Mon, 21 Feb 2011 15:53:34 +0100 +Subject: [PATCH 1/3] Remove avalon-logkit + +we don't have it packaged so change defaults and remove it from pom.xml +--- + pom.xml | 6 ------ + .../velocity/runtime/defaults/velocity.properties | 4 ++-- + .../apache/velocity/runtime/log/LogManager.java | 2 +- + 3 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 77a8e38..f453208 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -197,12 +197,6 @@ + <scope>provided</scope> + </dependency> + <dependency> +- <groupId>logkit</groupId> +- <artifactId>logkit</artifactId> +- <version>2.0</version> +- <scope>provided</scope> +- </dependency> +- <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6</version> +diff --git a/src/java/org/apache/velocity/runtime/defaults/velocity.properties b/src/java/org/apache/velocity/runtime/defaults/velocity.properties +index 750a59a..7fac119 100644 +--- a/src/java/org/apache/velocity/runtime/defaults/velocity.properties ++++ b/src/java/org/apache/velocity/runtime/defaults/velocity.properties +@@ -20,10 +20,10 @@ + # ---------------------------------------------------------------------------- + + # ---------------------------------------------------------------------------- +-# default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute ++# default LogChute to use: default: Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute + # ---------------------------------------------------------------------------- + +-runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogChute,org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute ++runtime.log.logsystem.class = org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute + + # --------------------------------------------------------------------------- + # This is the location of the Velocity Runtime log. +diff --git a/src/java/org/apache/velocity/runtime/log/LogManager.java b/src/java/org/apache/velocity/runtime/log/LogManager.java +index 19d1016..97dceef 100644 +--- a/src/java/org/apache/velocity/runtime/log/LogManager.java ++++ b/src/java/org/apache/velocity/runtime/log/LogManager.java +@@ -119,7 +119,7 @@ public class LogManager + * classes, and we use the first one we find. + * + * Note that the default value of this property contains the +- * AvalonLogChute, the Log4JLogChute, CommonsLogLogChute, ++ * Log4JLogChute, CommonsLogLogChute, + * ServletLogChute, and the JdkLogChute for + * convenience - so we use whichever we works first. + */ +-- +1.7.4 + diff --git a/0002-Fix-servlet25-testcase.patch b/0002-Fix-servlet25-testcase.patch new file mode 100644 index 0000000..c4d3454 --- /dev/null +++ b/0002-Fix-servlet25-testcase.patch @@ -0,0 +1,64 @@ +From 29a4b2d7cca447279d91cd7ff9a2ed13436f82a7 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Mon, 21 Feb 2011 15:56:54 +0100 +Subject: [PATCH 2/3] Fix servlet25 testcase + +--- + .../velocity/test/VelocityServletTestCase.java | 21 +++++++++++++++++++- + 1 files changed, 20 insertions(+), 1 deletions(-) + +diff --git a/src/test/org/apache/velocity/test/VelocityServletTestCase.java b/src/test/org/apache/velocity/test/VelocityServletTestCase.java +index 700a453..ac0ab5c 100644 +--- a/src/test/org/apache/velocity/test/VelocityServletTestCase.java ++++ b/src/test/org/apache/velocity/test/VelocityServletTestCase.java +@@ -16,7 +16,7 @@ package org.apache.velocity.test; + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations +- * under the License. ++ * under the License. + */ + + import java.io.IOException; +@@ -149,6 +149,11 @@ public class VelocityServletTestCase extends TestCase + return this; + } + ++ public String getContextPath() ++ { ++ return ""; ++ } ++ + public String getServletContextName() + { + return "VelocityTestContext"; +@@ -250,6 +255,11 @@ public class VelocityServletTestCase extends TestCase + public void setAttribute(String name, Object value) + { + } ++ ++ public Set getResourcePath(String path) ++ { ++ return null; ++ } + } + + static class MockHttpServletResponse implements HttpServletResponse +@@ -408,5 +418,14 @@ public class VelocityServletTestCase extends TestCase + public void setStatus(int i , String s) + { + } ++ ++ public void setCharacterEncoding(String charset) ++ { ++ } ++ ++ public String getContentType() ++ { ++ return null; ++ } + } + } +-- +1.7.4 + diff --git a/velocity-use-system-jars.patch b/0003-Use-system-jars.patch similarity index 85% rename from velocity-use-system-jars.patch rename to 0003-Use-system-jars.patch index 8ce6ba6..3d37ee8 100644 --- a/velocity-use-system-jars.patch +++ b/0003-Use-system-jars.patch @@ -1,6 +1,18 @@ ---- velocity-1.6.3.mef/build/build.xml.orig 2010-01-15 12:53:01.344906711 +0000 -+++ velocity-1.6.3.mef/build/build.xml 2010-01-15 12:53:07.537915055 +0000 -@@ -138,28 +138,6 @@ +From 813085c72e9906a53bec5954bcce7305a7c320d1 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Mon, 21 Feb 2011 17:58:39 +0100 +Subject: [PATCH 3/3] Use system jars + +--- + build/build.xml | 56 +++++++++++---------------------------------------- + build/testcases.xml | 6 ----- + 2 files changed, 12 insertions(+), 50 deletions(-) + +diff --git a/build/build.xml b/build/build.xml +index c667553..479ef2d 100644 +--- a/build/build.xml ++++ b/build/build.xml +@@ -140,28 +140,6 @@    @@ -29,7 +41,7 @@   -@@ -172,12 +150,11 @@ +@@ -174,12 +152,11 @@ <target name="prepare-jdbc" depends="check-jdbc,check-jdbc-true,check-jdbc-false"/> <target name="prepare-jdk14" depends="check-jdk14,check-jdk14-true,check-jdk14-false"/> @@ -43,7 +55,7 @@ </available> </target> -@@ -208,10 +185,9 @@ +@@ -210,10 +187,9 @@ </echo> </target> @@ -55,7 +67,7 @@ </available> </target> -@@ -246,7 +222,7 @@ +@@ -248,7 +224,7 @@  <target name="compile" depends="compile-src,compile-test"/> @@ -64,7 +76,7 @@ description="Compiles the Velocity source"> <javac srcdir="${build.src}" destdir="${build.dest}" -@@ -255,8 +231,7 @@ +@@ -257,8 +233,7 @@ target="${javac.target}" source="${javac.source}" deprecation="${deprecation}" @@ -74,7 +86,7 @@ <copy todir="${build.dest}" filtering="yes"> <fileset dir="${src.java.dir}"> -@@ -266,7 +241,7 @@ +@@ -268,7 +243,7 @@ </target> @@ -83,7 +95,7 @@ description="Compiles the Velocity test classes"> <javac srcdir="${build.test.src}" destdir="${build.test.dest}" -@@ -277,8 +252,6 @@ +@@ -279,8 +254,6 @@  <classpath> @@ -92,7 +104,7 @@ <pathelement location="${build.dest}"/> </classpath> </javac> -@@ -503,7 +476,7 @@ +@@ -561,7 +534,7 @@    @@ -101,7 +113,7 @@ description="Compiles the Velocity Example code"> <echo> -@@ -527,8 +500,7 @@ +@@ -585,8 +558,7 @@ encoding="UTF-8" debug="${debug}" deprecation="${deprecation}" @@ -111,7 +123,7 @@ </target> <target name="examples-clean" depends="examples-clean-anakia"> -@@ -546,7 +518,7 @@ +@@ -604,7 +576,7 @@    @@ -120,7 +132,7 @@ description="Creates the Javadoc API documentation"> <mkdir dir="${build.javadoc}"/> -@@ -562,8 +534,7 @@ +@@ -620,8 +592,7 @@ doctitle="${name} ${version} API" encoding="UTF-8" docencoding="UTF-8" @@ -130,7 +142,7 @@ <link href="${javadocs.ref.jsdk}"/> <link href="http://www.jdom.org/docs/apidocs"/> -@@ -918,12 +889,11 @@ +@@ -1024,12 +995,11 @@   @@ -145,16 +157,16 @@ <echo> ####################################################### -@@ -1106,7 +1076,7 @@ +@@ -1231,7 +1201,7 @@    -- <target name="test" depends="build-prepare,compile-test" -+ <target name="test" depends="compile-test" +- <target name="test-main" depends="build-prepare,compile-test" ++ <target name="test-main" depends="compile-test" description="Run the Velocity testcases"> - <mkdir dir="${build.test.reports}"/> -@@ -1120,8 +1090,6 @@ +  +@@ -1264,8 +1234,6 @@  <classpath> @@ -163,8 +175,10 @@ <pathelement path="${build.dest}"/> <pathelement path="${build.test.dest}"/> </classpath> ---- velocity-1.6.3.mef/build/testcases.xml.orig 2010-01-15 13:09:06.265907075 +0000 -+++ velocity-1.6.3.mef/build/testcases.xml 2010-01-15 13:09:08.356067618 +0000 +diff --git a/build/testcases.xml b/build/testcases.xml +index 06bb36e..f3749bc 100644 +--- a/build/testcases.xml ++++ b/build/testcases.xml @@ -36,12 +36,6 @@  @@ -178,3 +192,6 @@ <pathelement location="${build.dest}"/> <pathelement location="${build.test.dest}"/> </path> +-- +1.7.4 + diff --git a/sources b/sources index 8f5d166..1e62099 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ba4363ac104301db59075dae0c9e7d0 velocity-1.6.4.tar.gz +6af13ea297dee7ddbabeaa8e3963c184 velocity-1.7.tar.gz diff --git a/velocity-1.6.4.pom b/velocity-1.7.pom similarity index 92% rename from velocity-1.6.4.pom rename to velocity-1.7.pom index 18aa4f5..77a8e38 100644 --- a/velocity-1.6.4.pom +++ b/velocity-1.7.pom @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +  -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -29,10 +33,10 @@ <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - <version>1.6.4</version> + <version>1.7</version> <name>Apache Velocity</name> - <url>http://velocity.apache.org/engine/releases/velocity-1.6.2/</url> + <url>http://velocity.apache.org/engine/devel/</url> <description>Apache Velocity is a general purpose template engine.</description> <inceptionYear>2000</inceptionYear> <packaging>jar</packaging> @@ -69,7 +73,7 @@ <distributionManagement> <site> <id>velocity.apache.org</id> - <url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/veloci...</url> + <url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/veloci...</url> </site> <repository> <id>apache.releases</id> @@ -152,6 +156,7 @@ <groupId>oro</groupId> <artifactId>oro</artifactId> <version>2.0.8</version> + <optional>true</optional> </dependency> <dependency> <groupId>jdom</groupId> @@ -312,14 +317,22 @@ <findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> </plugins> </reporting> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/branches/1.6.x</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/branches/1.6.x</developerConnection> + <connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk</developerConnection> <tag>HEAD</tag> - <url>http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x</url> + <url>http://svn.apache.org/viewvc/velocity/engine/trunk</url> </scm> <properties> @@ -330,4 +343,4 @@ <system>JIRA</system> <url>${jira.browse.url}/VELOCITY</url> </issueManagement> -</project> \ No newline at end of file +</project> diff --git a/velocity.spec b/velocity.spec index 1d761c5..9933474 100644 --- a/velocity.spec +++ b/velocity.spec @@ -29,26 +29,24 @@ # Name: velocity -Version: 1.6.4 -Release: 3%{?dist} +Version: 1.7 +Release: 1%{?dist} Epoch: 0 Summary: Java-based template engine License: ASL 2.0 URL: http://velocity.apache.org/ Source0: http://www.apache.org/dist/%{name}/engine/%{version}/%{name}-%{version}.t... Source1: http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{nam... -Patch0: velocity-remove-avalon-logkit.patch -Patch1: velocity-use-system-jars.patch -Patch2: velocity-servletapi5.patch -Patch3: velocity-cleanup-pom.patch -Patch4: velocity-tomcat6.patch +Patch0: 0001-Remove-avalon-logkit.patch +Patch1: 0002-Fix-servlet25-testcase.patch +Patch2: 0003-Use-system-jars.patch Group: Development/Libraries Requires: apache-commons-collections Requires: apache-commons-logging Requires: apache-commons-lang Requires: tomcat6-servlet-2.5-api -Requires: oro -Requires: werken-xpath +Requires: jakarta-oro +Requires: werken-xpath Requires: junit Requires: hsqldb Requires: jdom @@ -67,7 +65,7 @@ BuildRequires: apache-commons-collections BuildRequires: apache-commons-logging BuildRequires: apache-commons-lang BuildRequires: tomcat6-servlet-2.5-api -BuildRequires: oro +BuildRequires: jakarta-oro BuildRequires: jdom BuildRequires: bcel BuildRequires: log4j @@ -133,20 +131,18 @@ find . -name '*.jar' -o -name '*.class' -not -path '*test*' -print -delete rm -f src/java/org/apache/velocity/runtime/log/AvalonLogChute.java rm -f src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java rm -f src/java/org/apache/velocity/runtime/log/VelocityFormatter.java + +cp %{SOURCE1} ./pom.xml + +# remove rest of avalon logkit refences %patch0 -p1 -# Use system jars instead of downloading +# Fix test cases for servlet25 %patch1 -p1 -#Apply patch to remove explicit dependency on servletapi3 +# Use system jar files instead of downloading from net %patch2 -p1 -# Remove (unavailable) parent reference and avalon-logkit from POM -cp %{SOURCE1} ./pom.xml -%patch3 -p1 - -# fix test for servlet api 2.5 -%patch4 -p1 # ----------------------------------------------------------------------------- @@ -158,11 +154,11 @@ commons-lang \ commons-logging \ tomcat6-servlet-2.5-api \ junit \ -oro \ +jakarta-oro \ log4j \ jdom \ bcel \ -werken.xpath \ +werken-xpath \ hsqldb \ junit) ant \ @@ -176,7 +172,6 @@ sed -i 's/\r//' docs/api/stylesheet.css docs/api/package-list # ----------------------------------------------------------------------------- %install -rm -rf %{buildroot} # jars install -d -m 755 %{buildroot}%{_javadir} @@ -188,7 +183,7 @@ cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name} # data install -d -m 755 %{buildroot}%{_datadir}/%{name} -cp -pr convert examples test %{buildroot}%{_datadir}/%{name} +cp -pr examples test %{buildroot}%{_datadir}/%{name} # Maven metadata install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom @@ -228,6 +223,10 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %{_datadir}/%{name} %changelog +* Mon Feb 21 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.7-1 +- Update to latest version +- Drop old patches + * Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.6.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

13 years, 2 months

1
0
0 / 0

File velocity-1.7.tar.gz uploaded to lookaside cache by sochotni

by Stanislav Ochotnicky

A file has been added to the lookaside cache for velocity: 6af13ea297dee7ddbabeaa8e3963c184 velocity-1.7.tar.gz

13 years, 2 months

1
0
0 / 0

[Bug 652183] Java SIG tracker bug

by Red Hat Bugzilla

Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=652183 Stanislav Ochotnicky <sochotni(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |679027 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug. You are the assignee for the bug.

13 years, 2 months

1
0
0 / 0

[httpcomponents-client] Don't use basename as an identifier.

by Alexander Kurtakov

commit 4c7fbe5cde2135f65301009e5e0f1bbe41b014ed Author: Alexander Kurtakov <akurtako(a)redhat.com> Date: Fri Feb 18 18:02:38 2011 +0200 Don't use basename as an identifier. httpcomponents-client.spec | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) --- diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index bcade7f..7ab4896 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,9 +1,9 @@ -%global basename httpcomponents +%global base_name httpcomponents Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore Version: 4.1 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ @@ -54,17 +54,17 @@ popd %install cd httpclient # jars -install -D -m 0644 target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{basename}/httpclient.jar +install -D -m 0644 target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpclient.jar # pom install -D -m 0644 pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-httpclient.pom -%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{basename} httpclient + %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpclient.pom +%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{base_name} httpclient # main pom install -D -m 0644 ../pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-httpcomponents-client.pom -%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{basename} httpcomponents-client + %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom +%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{base_name} httpcomponents-client # javadocs install -dm 755 %{buildroot}%{_javadocdir}/%{name} @@ -80,8 +80,8 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(-,root,root,-) %doc README.txt LICENSE.txt RELEASE_NOTES.txt -%{_mavendepmapfragdir}/%{basename} -%{_mavenpomdir}/JPP.%{basename}*.pom +%{_mavendepmapfragdir}/%{name} +%{_mavenpomdir}/JPP.%{base_name}*.pom %{_javadir}/%{basename} %files javadoc @@ -91,6 +91,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-3 +- Don't use basename as an identifier. + * Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-2 - OSGify properly. - Install into %{_javadir}/%{basename}.

13 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits February 2011