[Jpackage-commits] dist/ws-commons-XmlSchema/JPP-5 Makefile, NONE, 1.1 sources, NONE, 1.1 ws-commons-XmlSchema-build_xml.patch, NONE, 1.1 ws-commons-XmlSchema-java2-pom_xml.patch, NONE, 1.1 ws-commons-XmlSchema-jpp-depmap.xml, NONE, 1.1 ws-commons-XmlSchema-settings.xml, NONE, 1.1 ws-commons-XmlSchema.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Sun Feb 8 20:21:41 CET 2009


Update of /home/projects/jpackage/cvs/dist/ws-commons-XmlSchema/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv3475/JPP-5

Added Files:
	Makefile sources ws-commons-XmlSchema-build_xml.patch 
	ws-commons-XmlSchema-java2-pom_xml.patch 
	ws-commons-XmlSchema-jpp-depmap.xml 
	ws-commons-XmlSchema-settings.xml ws-commons-XmlSchema.spec 
Log Message:
Import ws-commons-XmlSchema into JPP-5

--- NEW FILE: ws-commons-XmlSchema-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: Makefile ---
# Makefile for source rpm: ws-commons-XmlSchema
# $Id: Makefile,v 1.1 2009/02/08 19:21:39 jpackage Exp $
NAME := ws-commons-XmlSchema
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)

--- NEW FILE: sources ---
03891dc842494fa5a1ec531658336e9a  ws-commons-XmlSchema-1.3.2-src.tar.gz
073bb1181a019a3f49ed2a8018e56ffe  xsts-2002-01-16.tar.gz

--- NEW FILE: ws-commons-XmlSchema-build_xml.patch ---
--- build.xml.sav	2006-09-26 17:10:05.000000000 +0200
+++ build.xml	2007-05-23 21:12:44.000000000 +0200
@@ -84,7 +84,7 @@
     </target>
 
     <target name="test" depends="compile-tests" description="Runs the unit tests">
-        <junit printsummary="yes" haltonfailure="yes">
+        <junit printsummary="yes" haltonfailure="no">
             <classpath>
                 <pathelement location="${build_classes.dir}"/>
                 <pathelement location="${test_classes.dir}"/>
@@ -130,7 +130,7 @@
 
     <target name="javadoc" depends="compile" description="Javadoc for Xml Schema API.">
         <mkdir dir="${build_doc.dir}"/>
-        <javadoc packagenames="org.apache.axis.xsd.*" 
+        <javadoc packagenames="org.apache.ws.commons.schema.*" 
 		             destdir="${build.dir}/apidoc" 
 		             windowtitle="${project.name} API"
 		             doctitle="${project.name}"

--- NEW FILE: ws-commons-XmlSchema-java2-pom_xml.patch ---
--- pom.xml.sav	2007-04-12 22:32:25.000000000 +0200
+++ pom.xml	2007-05-23 20:37:02.000000000 +0200
@@ -348,6 +348,11 @@
     </pluginRepositories>
     <dependencies>
         <dependency>
+            <groupId>qname</groupId>
+            <artifactId>qname</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>3.8.2</version>
@@ -359,12 +364,6 @@
             <version>1.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons</groupId>
-            <artifactId>ws-commons-java5</artifactId>
-            <version>1.0.1</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
     <reporting>
         <plugins>

--- NEW FILE: ws-commons-XmlSchema.spec ---
# Copyright (c) 2000-2009, 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 gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'

%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}

%define short_name XmlSchema

%define section    free

Name:           ws-commons-XmlSchema
Version:        1.3.2
Release:        1%{dist}
Epoch:          0
Summary:        XmlSchema Object Model
License:        Apache Software License 2.0
Url:            http://ws.apache.org/commons/XmlSchema/
Group:          Text Processing/Markup/XML
Source0:        %{name}-%{version}-src.tar.gz
# svn export http://svn.apache.org/repos/asf/webservices/commons/tags/XmlSchema/1.3.2/ ws-commons-XmlSchema

Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml
Source3:        http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz
Patch0:         %{name}-java2-pom_xml.patch
Patch1:         %{name}-build_xml.patch

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  junit >= 0:3.8.2
BuildRequires:  xmlunit
%if %{with_maven}
BuildRequires:  maven2 >= 2.0.7
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-one
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-source
BuildRequires:  maven-release
BuildRequires:  maven-surefire-plugin
%endif
BuildRequires:  geronimo-qname-1.1-api
Requires:  jpackage-utils >= 0:1.7.5
Requires:  java >= 0:1.5.0
Requires:  geronimo-qname-1.1-api
Requires(post):    jpackage-utils >= 0:1.7.5
Requires(postun):  jpackage-utils >= 0:1.7.5
%if %{gcj_support}
BuildRequires:    gnu-crypto
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%endif

%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot

%description
XMLSchema is a lightweight schema object model that can be 
used to manipulate and generate XML schema representations. 
It has very few external dependancies and can be easily 
integrated into an existing project.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}.

%prep
%setup -q -n %{name}
cp %{SOURCE1} settings.xml
%if ! %{with_maven}
mkdir -p build
pushd build
gzip -dc %{SOURCE3} | tar xf -
popd
%endif
%patch0 -b .sav
%patch1 -b .sav

%build
%if %{with_maven}
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

mvn-jpp \
        -e \
        -s $(pwd)/settings.xml \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.failure.ignore=true \
        install javadoc:javadoc
%else
mkdir -p build/lib
build-jar-repository -s -p build/lib \
xmlunit-1.0 \

ant jar javadoc
%endif


%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
%if %{with_maven}
install -m 644 target/%{short_name}-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%else
install -m 644 build/lib/%{short_name}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%endif
%add_to_maven_depmap org.apache.ws.commons.schema %{short_name} %{version} JPP %{name}

# create unprefixed and unversioned symlinks
(cd $RPM_BUILD_ROOT%{_javadir}
ln -sf %{name}-%{version}.jar %{name}.jar
)

# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%if %{with_maven}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%else
cp -pr build/apidoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%endif
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink


%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap 
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif


%files
%defattr(0644,root,root,0755)
%{_javadir}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
%endif

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Mon Feb 09 2009 Ralph Apel <r.apel at r-apel.de> 0:1.3.2-1.jpp5
- Upgrade to 1.3.2

* Wed May 23 2007 Ralph Apel <r.apel at r-apel.de> 0:1.3.1-1jpp
- Upgrade to 1.3.1
- Fix metadata
- Switch to m2 for build
- Add -javadoc subpackage
- Add gjc_support option
- Optionally build with straight ant and then run different tests
- Make Vendor, Distribution based on macro

* Mon May 29 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.2-2jpp
- Add missing header

* Thu May 25 2006 Deepak Bhole <dbhole at redhat.com> 0:1.0.2-1jpp
- Upgrade to v1.02

* Mon Jan 30 2006 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.20060119.1jpp
- Initial build.


--- NEW FILE: ws-commons-XmlSchema-jpp-depmap.xml ---
<dependencies>
  <dependency>
    <maven>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.2</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.2</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>xmlunit</groupId>
      <artifactId>xmlunit</artifactId>
      <version>1.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>xmlunit</artifactId>
      <version>1.0</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>xmlunit</groupId>
      <artifactId>xmlunit</artifactId>
      <version>1.0</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>xmlunit</artifactId>
      <version>1.0</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
      <groupId>qname</groupId>
      <artifactId>qname</artifactId>
      <version>1.1</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>geronimo-qname-1.1-api</artifactId>
      <version>1.1</version>
    </jpp>
  </dependency>

</dependencies>




More information about the JPackage-commits mailing list