rpms/jakarta-commons-modeler/devel pom.xml, NONE, 1.1 jakarta-commons-modeler.spec, 1.41, 1.42 sources, 1.3, 1.4 .cvsignore, 1.5, 1.6 jakarta-commons-modeler.build.properties.default.patch, 1.2, NONE jakarta-commons-modeler.build.xml.patch, 1.2, NONE
mbooth
mbooth at fedoraproject.org
Wed Dec 2 23:20:51 UTC 2009
Author: mbooth
Update of /cvs/pkgs/rpms/jakarta-commons-modeler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2044/jakarta-commons-modeler/devel
Modified Files:
jakarta-commons-modeler.spec sources .cvsignore
Added Files:
pom.xml
Removed Files:
jakarta-commons-modeler.build.properties.default.patch
jakarta-commons-modeler.build.xml.patch
Log Message:
* Wed Dec 2 2009 Mat Booth <fedora at matbooth.co.uk> - 2.0.1-1
- Update to 2.0.1
- Rewrite spec file to build using upstream-preferred maven instead of ant
- Drop patches to build script
- Now with OSGi manifest (comes free with the maven build)
- Now installs pom and fettles the maven dep-map, see RHBZ #542730
- Fix javadoc package requires
--- NEW FILE pom.xml ---
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "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.
-->
<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">
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
<version>11</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-modeler</groupId>
<artifactId>commons-modeler</artifactId>
<version>2.0.1</version>
<name>Commons Modeler</name>
<inceptionYear>2002</inceptionYear>
<description>
Commons Modeler makes the process of setting up JMX (Java
Management Extensions) MBeans easier by configuring the required meta
data using an XML descriptor. In addition, Modeler provides a factory
mechanism to create the actual Model MBean instances.
</description>
<url>http://commons.apache.org/modeler/</url>
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/MODELER</url>
</issueManagement>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/modeler/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/modeler/trunk</developerConnection>
<url>http://svn.apache.org/viewvc/commons/proper/modeler/trunk</url>
</scm>
<developers>
<developer>
<name>Craig McClanahan</name>
<id>craigmcc</id>
<email>craigmcc at apache.org</email>
<organization>Apache</organization>
</developer>
<developer>
<name>Yoav Shapira</name>
<id>yoavs</id>
<email>yoavs at apache.org</email>
<organization>Apache</organization>
</developer>
<developer>
<name>Bill Barker</name>
<id>billbarker</id>
<email>billbarker at apache.org</email>
<organization>Apache</organization>
</developer>
<developer>
<name>Davanum Srinivas</name>
<id>dims</id>
<email>dims at apache.org</email>
<organization>Apache</organization>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.4.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
<version>2.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>2.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.5</version>
<optional>true</optional>
</dependency>
</dependencies>
<properties>
<commons.componentid>modeler</commons.componentid>
<commons.release.version>2.0.1</commons.release.version>
<commons.binary.suffix></commons.binary.suffix>
<commons.jira.id>MODELER</commons.jira.id>
<commons.jira.pid>12310486</commons.jira.pid>
</properties>
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<resources>
<resource>
<directory>.</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
<include>LICENSE.txt</include>
</includes>
</resource>
<resource>
<directory>src/java/org/apache/commons/modeler/ant</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>ant.properties</include>
</includes>
</resource>
<resource>
<directory>src/java</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>**/ant.properties</include>
<include>**/mbeans-descriptors.dtd</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test</directory>
<filtering>false</filtering>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*TestCase.java</include>
</includes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
<descriptor>src/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.0</version>
<configuration>
<xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
</configuration>
<reportSets>
<reportSet>
<reports>
<report>changes-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
</project>
Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- jakarta-commons-modeler.spec 25 Jul 2009 03:51:27 -0000 1.41
+++ jakarta-commons-modeler.spec 2 Dec 2009 23:20:50 -0000 1.42
@@ -1,183 +1,145 @@
-# Copyright (c) 2000-2007, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define base_name modeler
-%define short_name commons-%{base_name}
-
-Name: jakarta-%{short_name}
-Epoch: 0
-Version: 2.0
-Release: 6.3%{?dist}
-Summary: Model MBeans utilty classes
-Group: Development/Libraries/Java
-License: ASL 2.0
-Url: http://jakarta.apache.org/commons/%{base_name}
-Source0: http://www.ibiblio.org/pub/mirrors/apache/jakarta/commons/modeler/source/commons-modeler-2.0-src.tar.gz
-Patch0: %{name}.build.properties.default.patch
-Patch1: %{name}.build.xml.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-BuildRequires: ant
-BuildRequires: findutils
-BuildRequires: jakarta-commons-beanutils >= 0:1.3
-BuildRequires: jakarta-commons-collections >= 0:2.0
-BuildRequires: jakarta-commons-digester >= 0:1.2
-BuildRequires: jakarta-commons-logging >= 0:1.0
-BuildRequires: jaxp_parser_impl
-BuildRequires: jaxp_transform_impl
-BuildRequires: jmxri
-BuildRequires: junit >= 0:3.7
-BuildRequires: xml-commons-apis >= 1.3
-Requires: jakarta-commons-beanutils >= 0:1.3
-Requires: jakarta-commons-collections >= 0:2.0
-Requires: jakarta-commons-digester >= 0:1.2
-Requires: jakarta-commons-logging >= 0:1.0
-Requires: jaxp_parser_impl
-Requires: jaxp_transform_impl
-Requires: jmxri
-Requires: xml-commons-apis
-%if ! %{gcj_support}
-BuildArch: noarch
-%endif
-Provides: %{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{short_name} < %{epoch}:%{version}-%{release}
+%global short_name commons-modeler
+
+# TODO - Drop "jakarta-" from the package name
+Name: jakarta-%{short_name}
+Version: 2.0.1
+Release: 1%{?dist}
+Summary: Model MBeans utility classes
+Group: Development/Libraries/Java
+License: ASL 2.0
+URL: http://commons.apache.org/modeler/
+
+Source0: http://archive.apache.org/dist/commons/modeler/source/%{short_name}-%{version}-src.tar.gz
+
+# a maven2 pom is not supplied, so supply one based on the one from source control:
+# $ svn export -r 678495 http://svn.apache.org/repos/asf/commons/proper/modeler/trunk/pom.xml
+Source1: pom.xml
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: noarch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: jakarta-commons-beanutils >= 1.6
+BuildRequires: jakarta-commons-collections >= 2.1
+BuildRequires: jakarta-commons-digester >= 1.4.1
+BuildRequires: jakarta-commons-logging >= 1.0.4
+BuildRequires: mx4j >= 2.1.1
+BuildRequires: xml-commons-apis
+BuildRequires: maven2-plugin-antrun
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-idea
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+Requires: java
+Requires: jpackage-utils
+Requires: jakarta-commons-beanutils >= 1.6
+Requires: jakarta-commons-collections >= 2.1
+Requires: jakarta-commons-digester >= 1.4.1
+Requires: jakarta-commons-logging >= 1.0.4
+Requires: mx4j >= 2.1.1
+Requires: xml-commons-apis
+
+Provides: %{short_name} = %{version}-%{release}
+Obsoletes: %{short_name} < %{version}-%{release}
%description
-The Modeler project shall create and maintain a set of Java
-classes to provide support for configuring and instantiating Model
-MBeans, plus unit tests and small examples of using these facilities
-to instrument Java classes with Model MBean support.
+Commons Modeler makes the process of setting up JMX (Java Management
+Extensions) MBeans easier by configuring the required meta data using an
+XML descriptor. In addition, Modeler provides a factory mechanism to
+create the actual Model MBean instances.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Documentation
+Summary: Javadocs for %{name}
+Group: Development/Documentation
+Requires: %{name} = %{version}-%{release}
%description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0
-%patch1
-# remove all binary files
-find . \( -name "*.jar" -o -name "*.class" -o -name "*.zip" \) \
- | xargs %{__rm} -f
-
-
-# fix eol encodings
-%{__sed} -i 's/\r//' xdocs/downloads.xml
-%{__sed} -i 's/\r//' xdocs/cvs-usage.xml
-%{__sed} -i 's/\r//' xdocs/issue-tracking.xml
-%{__sed} -i 's/\r//' LICENSE.txt
-%{__sed} -i 's/\r//' xdocs/navigation.xml
-%{__sed} -i 's/\r//' xdocs/style/project.css
-%{__sed} -i 's/\r//' xdocs/index.xml
-%{__sed} -i 's/\r//' xdocs/building.xml
-%{__sed} -i 's/\r//' NOTICE.txt
-%{__sed} -i 's/\r//' RELEASE-NOTES.txt
+
+cp -p %{SOURCE1} pom.xml
%build
-export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transform_impl jmxri junit commons-beanutils commons-collections commons-digester commons-logging)
-%{ant} dist
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+# TODO: remove the hack below when 543686 is fixed
+mkdir -p $MAVEN_REPO_LOCAL/mx4j/mx4j-jmx/2.1.1
+pushd $MAVEN_REPO_LOCAL/mx4j/mx4j-jmx/2.1.1
+ln -s %{_javadir}/mx4j/mx4j-jmx.jar mx4j-jmx-2.1.1.jar
+cat <<HEREDOC > mx4j-jmx-2.1.1.pom
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>2.1.1</version>
+</project>
+HEREDOC
+popd
+# TODO: remove the hack above when 543686 is fixed
+
+# TODO: disable tests for now because they need internet access -- they run fine locally
+mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven.test.skip=true install javadoc:javadoc
%install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
+
# jars
-%{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -a dist/%{short_name}.jar \
- %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(
- cd %{buildroot}%{_javadir}
- for jar in *-%{version}*; do
- %{__ln_s} ${jar} `echo $jar | %{__sed} "s|jakarta-||g"`
- done
-)
-(
- cd %{buildroot}%{_javadir}
- for jar in *-%{version}*; do
- %{__ln_s} ${jar} `echo $jar | %__sed "s|-%{version}||g"`
- done
-)
-# javadoc
-%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(
- cd %{buildroot}%{_javadocdir}
- %{__ln_s} %{name}-%{version} %{name}
-)
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+install -pD -T target/%{short_name}-%{version}.jar \
+ %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# javadocs
+mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+
+# pom
+install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
-%if %{gcj_support}
%post
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
-%if %{gcj_support}
%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
%files
-%defattr(0644,root,root,0755)
-%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
+%defattr(-,root,root,-)
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES*
+%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*
%{_javadir}/*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
-
%files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
%changelog
+* Wed Dec 2 2009 Mat Booth <fedora at matbooth.co.uk> - 2.0.1-1
+- Update to 2.0.1
+- Rewrite spec file to build using upstream-preferred maven instead of ant
+- Drop patches to build script
+- Now with OSGi manifest (comes free with the maven build)
+- Now installs pom and fettles the maven dep-map, see RHBZ #542730
+- Fix javadoc package requires
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0-6.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 26 Apr 2007 00:25:06 -0000 1.3
+++ sources 2 Dec 2009 23:20:50 -0000 1.4
@@ -1 +1 @@
-43983c66113ddaa9880e4a7ea7d38db4 commons-modeler-2.0-src.tar.gz
+9ad2dc25be91c38b93346653736856dd commons-modeler-2.0.1-src.tar.gz
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-modeler/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 26 Apr 2007 00:25:06 -0000 1.5
+++ .cvsignore 2 Dec 2009 23:20:50 -0000 1.6
@@ -1 +1 @@
-commons-modeler-2.0-src.tar.gz
+commons-modeler-2.0.1-src.tar.gz
--- jakarta-commons-modeler.build.properties.default.patch DELETED ---
--- jakarta-commons-modeler.build.xml.patch DELETED ---
More information about the scm-commits
mailing list