[Jpackage-commits] dist/ws-woden/JPP-6 Makefile, NONE, 1.1 sources, NONE, 1.1 ws-woden-TestDescription1001.patch, NONE, 1.1 ws-woden-jpp-depmap.xml, NONE, 1.1 ws-woden-pom_xml.patch, NONE, 1.1 ws-woden-settings.xml, NONE, 1.1 ws-woden.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed Dec 22 22:17:59 CET 2010


Update of /home/projects/jpackage/cvs/dist/ws-woden/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv2757/JPP-6

Added Files:
	Makefile sources ws-woden-TestDescription1001.patch 
	ws-woden-jpp-depmap.xml ws-woden-pom_xml.patch 
	ws-woden-settings.xml ws-woden.spec 
Log Message:
Import ws-woden into JPP-6

--- NEW FILE: ws-woden-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: ws-woden-TestDescription1001.patch ---
--- ./test/org/apache/woden/internal/wsdl20/assertions/TestDescription1001.java.sav	2009-03-25 12:30:20.000000000 +0100
+++ ./test/org/apache/woden/internal/wsdl20/assertions/TestDescription1001.java	2009-03-25 12:31:48.000000000 +0100
@@ -114,13 +114,13 @@
 		DescriptionElement descEl = factory.newDescription();
 		descEl.setTargetNamespace(URI.create("http://ws.apache.org"));
 
-		try {
-			assertion.validate(descEl, wodenContext);
-		} catch(WSDLException e){
-			fail("Assertion Description1001 threw the following WSDLException for target namespace http://apache.org, which should resolve: " + e.toString());
-		}
-		if(handler.messageHasBeenReported()) {
-			fail("Assertion Description1001 reports an error or warning for an target namespace that should resolve. Note that this test will fail without network connectivity.");
-		}
+//		try {
+//			assertion.validate(descEl, wodenContext);
+//		} catch(WSDLException e){
+//			fail("Assertion Description1001 threw the following WSDLException for target namespace http://apache.org, which should resolve: " + e.toString());
+//		}
+//		if(handler.messageHasBeenReported()) {
+//			fail("Assertion Description1001 reports an error or warning for an target namespace that should resolve. Note that this test will fail without network connectivity.");
+//		}
 	}
 }

--- NEW FILE: Makefile ---
# Makefile for source rpm: ws-woden
# $Id: Makefile,v 1.1 2010/12/22 21:17:57 jpackage Exp $
NAME := ws-woden
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 ---
91472b72312037f3d874d700753763e3  woden-1.0M8_20080423.tar.gz

--- NEW FILE: ws-woden.spec ---
# Copyright (c) 2000-2010, 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 run the online tests
# give rpmbuild option '--without online_tests'

%define with_online_tests %{!?_with_online_tests:0}%{?_with_online_tests:1}
%define without_online_tests %{?_with_online_tests:0}%{!?_with_online_tests:1}

%define section         free
%define namedversion    1.0M8
%define short_name      woden

Name:           ws-woden
Version:        1.0
Release:        0.m8.2%{?dist}
Epoch:          0
Summary:        WSDL document library
License:        Apache Software License 2.0
Url:            http://ws.apache.org/woden/
Group:          Development/Libraries/Java
Source0:        woden-1.0M8_20080423.tar.gz
# svn export http://svn.apache.org/repos/asf/webservices/woden/tags/1.0M8_20080423/ woden-1.0M8_20080423

Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml
Patch0:         %{name}-pom_xml.patch
Patch1:         %{name}-TestDescription1001.patch


BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.6.0
BuildRequires:  ant >= 0:1.7.1
BuildRequires:  junit >= 0:3.8.2
BuildRequires:  maven2 >= 2.0.8
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-surefire
BuildRequires:  felix-maven2
BuildRequires:  apache-commons-logging
BuildRequires:  stax_1_0_api
BuildRequires:  ws-commons-XmlSchema
BuildRequires:  ws-commons-axiom
BuildRequires:  wsdl4j
BuildRequires:  wstx
Requires:  java >= 0:1.6.0
Requires:  ant >= 0:1.7.1
Requires:  stax_1_0_api
Requires:  ws-commons-XmlSchema
Requires:  ws-commons-axiom
Requires:  wsdl4j
Requires:  wstx

Requires(post):    jpackage-utils >= 0:1.7.5
Requires(postun):  jpackage-utils >= 0:1.7.5
%if %{gcj_support}
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
The Woden project is an incubation subproject of the Apache
Web Services Project to develop a Java class library for
reading, manipulating, creating and writing WSDL documents,
initially to support WSDL 2.0 but with the longer term aim
of supporting past, present and future versions of WSDL.

There are two main deliverables: an API and an implementation.
The Woden API will consist of a set of Java interfaces. The
WSDL 2.0-specific portion of the Woden API will conform to the
W3C WSDL 2.0 specification. The implementation will be a high
performance implementation directly usable in other Apache
projects such as Axis2.


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

%description javadoc
%{summary}.

%prep
%setup -q -n woden-1.0M8_20080423/
cp %{SOURCE1} settings.xml
mkdir -p .m2/repository/JPP/maven2/default_poms/
%patch0 -b .sav
%if ! %{with_online_tests}
%patch1 -b .noonline
%endif

%build
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 \
        install 

mvn-jpp \
        -e \
        -s $(pwd)/settings.xml \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:aggregate

mkdir tmpdir
pushd tmpdir
jar xf ../woden-api/target/woden-api-%{namedversion}.jar
jar xf ../woden-dom/target/woden-impl-dom-%{namedversion}.jar
jar xf ../woden-om/target/woden-impl-om-%{namedversion}.jar
rm -rf META-INF
jar cf ../woden-%{namedversion}.jar *
popd
rm -rf tmpdir

%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 woden-api/target/woden-api-%{namedversion}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
install -m 644 woden-dom/target/woden-impl-dom-%{namedversion}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}-impl-dom-%{version}.jar
install -m 644 woden-om/target/woden-impl-om-%{namedversion}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}-impl-om-%{version}.jar
install -m 644 woden-%{namedversion}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%add_to_maven_depmap org.apache.woden woden %{namedversion} JPP %{name}
%add_to_maven_depmap org.apache.woden woden-api %{namedversion} JPP %{name}-api
%add_to_maven_depmap org.apache.woden woden-impl-dom %{namedversion} JPP %{name}-impl-dom
%add_to_maven_depmap org.apache.woden woden-impl-om %{namedversion} JPP %{name}-impl-om

(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)


# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
install -m 644 woden-api/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-api.pom
install -m 644 woden-dom/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-impl-dom.pom
install -m 644 woden-om/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-impl-om.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%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
* Wed Dec 22 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.m8.2
- First JPP-6 release

* Wed Mar 25 2009 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.m8.1.jpp5
- First JPP-5 release

* Wed Jun 06 2007 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.m7a.1jpp
- Initial build.


--- NEW FILE: ws-woden-jpp-depmap.xml ---
<dependencies>
<!--
	<dependency>
		<maven>
			<groupId>org.apache.ws.commons.schema</groupId>
			<artifactId>XmlSchema</artifactId>
			<version>1.2</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>ws-commons-XmlSchema</artifactId>
			<version>1.2</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.apache.ant</groupId>
			<artifactId>ant</artifactId>
			<version>1.7.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>ant</artifactId>
			<version>1.6.5</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>wsdl4j</groupId>
			<artifactId>wsdl4j</artifactId>
			<version>1.6.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>wsdl4j</artifactId>
			<version>1.6.1</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>xerces</groupId>
			<artifactId>xercesImpl</artifactId>
			<version>2.8.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xerces-j2</artifactId>
			<version>2.8.1</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>xerces</groupId>
			<artifactId>xmlParserAPIs</artifactId>
			<version>2.6.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xml-commons-jaxp-1.3-apis</artifactId>
			<version>1.3.03</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.apache.ws.commons.axiom</groupId>
			<artifactId>axiom-api</artifactId>
			<version>1.2.2</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>ws-commons-axiom-api</artifactId>
			<version>1.2.4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.apache.ws.commons.axiom</groupId>
			<artifactId>axiom-impl</artifactId>
			<version>1.2.2</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>ws-commons-axiom-impl</artifactId>
			<version>1.2.4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>org.codehaus.woodstox</groupId>
			<artifactId>wstx-asl</artifactId>
			<version>3.2.0</version>
		</maven>
		<jpp>
			<groupId>JPP/wstx</groupId>
			<artifactId>wstx-asl</artifactId>
			<version>2.9.3</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
                        <version>1.0.4</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-logging</artifactId>
			<version>1.1</version>
		</jpp>
	</dependency>
	<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>qname</groupId>
			<artifactId>qname</artifactId>
			<version>1.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>qname_1_1_api</artifactId>
			<version>1.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
                        <groupId>stax</groupId>
                        <artifactId>stax-api</artifactId>
                        <version>1.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>stax_1_0_api</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
                        <groupId>javax.xml.stream</groupId>
                        <artifactId>stax-api</artifactId>
                        <version>1.2.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>stax_1_0_api</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
                        <groupId>xmlpull</groupId>
                        <artifactId>xmlpull</artifactId>
                        <version>1.1.3.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.8</version>
		</jpp>
	</dependency>

</dependencies>

--- NEW FILE: ws-woden-pom_xml.patch ---
--- pom.xml.sav	2010-12-22 22:03:50.000000000 +0100
+++ pom.xml	2010-12-22 22:04:23.000000000 +0100
@@ -141,6 +141,16 @@
       <version>3.2.4</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.stream</groupId>
+      <artifactId>stax-api</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>




More information about the JPackage-commits mailing list