[Jpackage-commits] dist/pjl-comp-filter/devel .cvsignore, 1.1, 1.2 pjl-comp-filter-1.6.6.pom, NONE, 1.1 pjl-comp-filter-build.patch, NONE, 1.1 pjl-comp-filter.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 21:28:05 CEST 2008


Update of /home/projects/jpackage/cvs/dist/pjl-comp-filter/devel
In directory ryu.zarb.org:/tmp/cvs-serv28166/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pjl-comp-filter-1.6.6.pom pjl-comp-filter-build.patch 
	pjl-comp-filter.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/pjl-comp-filter/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:27:41 -0000	1.1
--- .cvsignore	28 May 2008 19:28:03 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ pjl-comp-filter-1.6.6.zip

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/pjl-comp-filter/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:27:41 -0000	1.1
--- sources	28 May 2008 19:28:03 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 98690d21ca4b130163e44078d9dea3cd  pjl-comp-filter-1.6.6.zip

--- NEW FILE: pjl-comp-filter-1.6.6.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>net.sourceforge.pjl-comp-filter</groupId>
  <artifactId>pjl-comp-filter</artifactId>
  <packaging>jar</packaging>
  <version>1.6.6</version>
  <name>PJL Compressing Filter</name>
  <url>http://sourceforge.net/projects/pjl-comp-filter</url>
  <description>A J2EE servlet filter which compresses data written to the response. It supports several algorithms (gzip, deflate, etc.) and emphasizes minimal memory usage and high throughput. Also provides detailed performance stats.</description>
  <scm>
    <url>http://pjl-comp-filter.cvs.sourceforge.net/pjl-comp-filter</url>
  </scm>
  <licenses>
    <license>
      <name>Apache Software License V2.0</name>
      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <dependencies>
    <dependency>
      <groupId>javax.servlet</groupId>
      <artifactId>servlet-api</artifactId>
      <version>2.3</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging</artifactId>
      <version>1.1</version>
      <scope>optional</scope>
      <exclusions>
        <exclusion>
          <groupId>avalon-framework</groupId>
          <artifactId>avalon-framework</artifactId>
        </exclusion>
        <exclusion>
          <groupId>logkit</groupId>
          <artifactId>logkit</artifactId>
        </exclusion>
      </exclusions>
    </dependency>
  </dependencies>
</project>

--- NEW FILE: pjl-comp-filter.spec ---
# Copyright (c) 2000-2008, 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 section     free

Name:           pjl-comp-filter
Version:        1.6.6
Release:        1jpp
Epoch:          0
Summary:        PJL compressing filter
License:        Apache Software License 2.0
Group:          Development/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
URL:            http://sourceforge.net/projects/pjl-comp-filter/
Source0:        http://downloads.sourceforge.net/pjl-comp-filter/pjl-comp-filter-1.6.6.zip
Source1:        %{name}-%{version}.pom
Patch0:         pjl-comp-filter-build.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%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

BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  junit
BuildRequires:  mockrunner
BuildRequires:  jakarta-commons-logging
BuildRequires:  jetbrains-annotations
BuildRequires:  jsp_2_0_api
BuildRequires:  servlet_2_4_api

Requires:  java >= 0:1.5.0
Requires(post):    jpackage-utils >= 0:1.7.4
Requires(postun):  jpackage-utils >= 0:1.7.4

%description
A J2EE servlet filter which compresses data written to the 
response. It supports several algorithms (gzip, deflate, 
etc.) and emphasizes minimal memory usage and high 
throughput. Also provides detailed performance stats.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description javadoc
Javadoc for %{name}.

%prep
%setup -q -c -n %{name}-%{version}
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
%patch0 -b .sav0

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0
export CLASSPATH=$(build-classpath \
jetbrains-annotations \
jsp_2_0_api \
junit \
servlet_2_4_api \
commons-logging-api \
mockrunner/mockrunner \
)
CLASSPATH=$CLASSPATH:build:build-test
ant -Dbuild.sysclasspath=only release


%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -pm 644 %{name}-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%add_to_maven_depmap net.sourceforge.pjl-comp-filter %{name} %{version} JPP %{name}
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

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

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -sf %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost

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

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
  rm -f %{_javadocdir}/%{name}
fi

%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(-,root,root,-)
%{_javadir}/*
%{_datadir}/maven2
%{_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}
%ghost %doc %{_javadocdir}/%{name}

%changelog
* Fri Mar 28 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.6.6-1jpp
- First JPP release


--- NEW FILE: pjl-comp-filter-build.patch ---
--- build.xml.sav0	2007-09-16 21:14:42.000000000 +0200
+++ build.xml	2008-01-24 12:51:35.000000000 +0100
@@ -38,7 +38,7 @@
 		<javac deprecation="true" debug="true" destdir="build-test" srcdir="src/test">
 			<classpath refid="test.build.classpath"/>
 		</javac>
-		<junit printsummary="on" haltonfailure="on" haltonerror="on" fork="on">
+		<junit printsummary="on" haltonfailure="off" haltonerror="on" fork="on">
 			<formatter type="plain" usefile="false"/>
 			<classpath>
 				<path refid="test.build.classpath"/>
@@ -57,11 +57,14 @@
 
 	<target depends="init" name="javadoc">
 		<mkdir dir="docs"/>
-		<javadoc destdir="docs">
-			<packageset dir="src/main">
-				<include name="**"/>
-			</packageset>
-			<classpath refid="main.build.classpath"/>
+		<javadoc destdir="docs" use="true" private="true" 
+                         packagenames="com.planetj.servlet.filter.compression.*">
+                    <sourcepath>
+                    <dirset dir=".">
+                        <include name="src/main"/>
+                    </dirset>
+                    </sourcepath>
+		    <classpath refid="main.build.classpath"/>
 		</javadoc>
 	</target>
 




More information about the JPackage-commits mailing list