rpms/jetty/devel disable-modules.patch, NONE, 1.1 jetty-settings.xml, NONE, 1.1 jetty-depmap.xml, NONE, 1.1 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 jetty.spec, 1.16, 1.17 jetty-OSGi-MANIFEST.MF, 1.3, NONE jetty-webdefault.patch, 1.1, NONE jetty-TestRFC2616-libgcj-bad-date-parser.patch, 1.1, NONE jetty-libgcj-bad-serialization.patch, 1.1, NONE jetty-CERT438616-CERT237888-CERT21284.patch, 1.1, NONE jetty-PostFileFilter.patch, 1.1, NONE jetty-extra-j2ee-build_xml.patch, 1.1, NONE
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Sep 15 12:51:06 UTC 2009
- Previous message (by thread): rpms/libvirt/devel .cvsignore, 1.46, 1.47 libvirt.spec, 1.175, 1.176 sources, 1.48, 1.49
- Next message (by thread): rpms/bind/devel .cvsignore, 1.55, 1.56 bind-9.3.2b2-sdbsrc.patch, 1.1, 1.2 bind-9.5-sdb.patch, 1.3, 1.4 bind-96-dyndb.patch, 1.9, 1.10 bind.spec, 1.324, 1.325 sources, 1.64, 1.65 bind-96-db_unregister.patch, 1.1, NONE bind96-rh507469.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: akurtakov
Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10222/devel
Modified Files:
sources .cvsignore jetty.spec
Added Files:
disable-modules.patch jetty-settings.xml jetty-depmap.xml
Removed Files:
jetty-OSGi-MANIFEST.MF jetty-webdefault.patch
jetty-TestRFC2616-libgcj-bad-date-parser.patch
jetty-libgcj-bad-serialization.patch
jetty-CERT438616-CERT237888-CERT21284.patch
jetty-PostFileFilter.patch jetty-extra-j2ee-build_xml.patch
Log Message:
Update to upstream 6.1.20.
disable-modules.patch:
pom.xml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
--- NEW FILE disable-modules.patch ---
--- pom.xml.sav 2009-09-01 21:19:01.000000000 +0300
+++ pom.xml 2009-09-14 12:59:01.723285440 +0300
@@ -61,12 +61,12 @@
<target>1.4</target>
</configuration>
</plugin>
- <plugin>
+ <!--plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>https://svn.codehaus.org/jetty/jetty/tags</tagBase>
</configuration>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -110,47 +110,47 @@
<module>modules/util</module>
<module>modules/util5</module>
<module>modules/jetty</module>
- <module>modules/jsp-2.1</module>
+ <!--module>modules/jsp-2.1</module-->
<module>modules/jsp-api-2.0</module>
<module>modules/jsp-2.0</module>
<module>modules/management</module>
<module>modules/start</module>
<module>modules/maven-plugin</module>
- <module>modules/jspc-maven-plugin</module>
+ <!--module>modules/jspc-maven-plugin</module-->
<module>modules/naming</module>
<module>modules/plus</module>
<module>modules/html</module>
- <module>modules/annotations</module>
+ <!--module>modules/annotations</module-->
<module>extras/servlet-tester</module>
- <module>extras/xbean</module>
- <module>extras/spring</module>
+ <!--module>extras/xbean</module>
+ <module>extras/spring</module-->
<module>extras/sslengine</module>
- <module>extras/ajp</module>
- <module>extras/win32service</module>
+ <!--module>extras/ajp</module>
+ <module>extras/win32service</module-->
<!--module>extras/gwt</module-->
- <module>extras/threadpool</module>
+ <!--module>extras/threadpool</module-->
<module>extras/client</module>
- <module>extras/jetty-java5-stats</module>
+ <!--module>extras/jetty-java5-stats</module-->
<module>examples/test-webapp</module>
- <module>examples/test-jaas-webapp</module>
+ <!--module>examples/test-jaas-webapp</module>
<module>examples/test-jndi-webapp</module>
- <module>examples/embedded</module>
+ <module>examples/embedded</module-->
<!-- <module>examples/spring-ebj3-demo</module> -->
- <module>examples/tests</module>
+ <!--module>examples/tests</module>
<module>contrib/cometd</module>
<module>contrib/jetty-ant</module>
<module>contrib/jetty-rewrite-handler</module>
<module>contrib/jetty-ldap-jaas</module>
- <module>contrib/start-daemon</module>
+ <module>contrib/start-daemon</module-->
<!--module>contrib/grizzly</module-->
<!--module>contrib/wadi</module-->
<!--<module>contrib/terracotta</module-->
- <module>extras/setuid</module>
+ <!--module>extras/setuid</module-->
</modules>
<dependencyManagement>
<dependencies>
--- NEW FILE jetty-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 jetty-depmap.xml ---
<dependencies>
<dependency>
<maven>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.1</version>
</maven>
<jpp>
<groupId>JPP/objectweb-asm</groupId>
<artifactId>asm</artifactId>
<version>3.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5-20081211</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>tomcat6-servlet-2.5-api</artifactId>
<version>6.0.18</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
<version>9.1.1.B60.25.p2</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>tomcat6-jsp-2.1-api</artifactId>
<version>6.0.18</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1-glassfish</artifactId>
<version>9.1.1.B60.25.p2</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>tomcat6-jsp-2.1-api</artifactId>
<version>6.0.18</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>tomcat6-jsp-2.1-api</artifactId>
<version>6.0.18</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-jetty</artifactId>
<version>9.1.1.B60.25.p2</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>tomcat6-jsp-2.1-api</artifactId>
<version>6.0.18</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler-jdt</artifactId>
<version>5.5.15</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>jasper5-compiler</artifactId>
<version>5.5.27</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
<version>1.0</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>commons-el</artifactId>
<version>1.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>3.0.1</version>
</maven>
<jpp>
<groupId>JPP/mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>1.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
<version>3.0.1</version>
</maven>
<jpp>
<groupId>JPP/mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
<version>1.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
<version>1.0.1B-rc4</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>jta</artifactId>
<version>1.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>1.0.1</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-apacheds</artifactId>
<version>1.0-alpha-1</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.1.0</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
<version>1.0</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>6.1.20</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-default-skin</artifactId>
<version>2.0.8</version>
</maven>
</dependency>
</dependencies>
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 21 May 2009 21:10:35 -0000 1.4
+++ sources 15 Sep 2009 12:51:05 -0000 1.5
@@ -1 +1 @@
-09d5e3204f5c74efcd3ae9330f92838b jetty-5.1.15.fedora.tgz
+716cc87428b90ef88b0461bc54856379 jetty-6.1.20-src.zip
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 21 May 2009 21:10:34 -0000 1.4
+++ .cvsignore 15 Sep 2009 12:51:05 -0000 1.5
@@ -1,3 +1,4 @@
jetty-5.1.12.fedora.zip
jetty-5.1.14.fedora.tgz
jetty-5.1.15.fedora.tgz
+jetty-6.1.20-src.zip
Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- jetty.spec 25 Jul 2009 03:59:44 -0000 1.16
+++ jetty.spec 15 Sep 2009 12:51:05 -0000 1.17
@@ -28,18 +28,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%bcond_without fedora
-
-%define gcj_support 1
-%define bootstrap 0
-
-# If you don't want the -extras subpackage to be built
-# in order to avoid its (Build)Requires
-# give rpmbuild option '--without extra'
-
-%define with_extra 0
-
-%define section free
%define jettyname jetty
%define jtuid 110
%define username %{name}
@@ -50,89 +38,55 @@
%define tempdir %{jettycachedir}/temp
%define rundir %{_localstatedir}/run/%{name}
%define jettylibdir %{_localstatedir}/lib/%{name}
-%define libdir %{jettylibdir}/lib
%define appdir %{jettylibdir}/webapps
-%define demodir %{jettylibdir}/demo
Name: jetty
-Version: 5.1.15
-Release: 4%{?dist}
+Version: 6.1.20
+Release: 1%{?dist}
Summary: The Jetty Webserver and Servlet Container
Group: Applications/Internet
License: ASL 2.0
URL: http://jetty.mortbay.org/jetty/
-# Following source tarball was originally taken from the following location:
-# http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.15.tgz
-# The tarball was modified by removing all jars and BCLA licenses.
-# tar -xzf jetty-5.1.15.tgz
-# pushd jetty-5.1.15
-# find . -name *.jar -exec rm {} \;
-# rm ./etc/LICENSE.javax.xml.html ./etc/LICENSE.jsse.txt
-# popd
-# tar -czf jetty-5.1.15.fedora.tgz jetty-5.1.15/*
-Source0: %{jettyname}-%{version}.fedora.tgz
-Source1: jetty.script
+Source0: http://dist.codehaus.org/jetty/jetty-6.1.20/jetty-6.1.20-src.zip
Source2: jetty.init
Source3: jetty.logrotate
-Source4: jetty-OSGi-MANIFEST.MF
-Patch0: jetty-extra-j2ee-build_xml.patch
-Patch1: jetty-PostFileFilter.patch
-Patch2: jetty-libgcj-bad-serialization.patch
-Patch3: jetty-TestRFC2616-libgcj-bad-date-parser.patch
-Patch4: jetty-webdefault.patch
+Source4: %{name}-depmap.xml
+Source7: %{name}-settings.xml
+Patch0: disable-modules.patch
Patch5: jetty-unix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
BuildRequires: fedora-usermgmt-devel
%{?FE_USERADD_REQ}
BuildRequires: jpackage-utils >= 0:1.6
-#BuildRequires: perl >= 0:5.005
# build only
-BuildRequires: ant-junit
-BuildRequires: jakarta-commons-collections
-BuildRequires: junit
-BuildRequires: xdoclet
-BuildRequires: xjavadoc
-# main
-BuildRequires: ant >= 0:1.6
-BuildRequires: jakarta-commons-el
-BuildRequires: jakarta-commons-logging
-BuildRequires: jsse
-BuildRequires: mx4j >= 0:3.0
-BuildRequires: tomcat5-jasper >= 5.5.26-1.5
-BuildRequires: tomcat5-servlet-2.4-api >= 5.5.26-1.5
-BuildRequires: xerces-j2 >= 0:2.7
-BuildRequires: xml-commons-apis
-
-# extra
-%if %{with_extra}
-BuildRequires: carol
-BuildRequires: geronimo-j2ee-connector-1.5-api
-BuildRequires: geronimo-j2ee-management-1.0-api
-BuildRequires: howl-logger
-BuildRequires: hsqldb
-BuildRequires: jaf
-BuildRequires: jakarta-commons-cli
-BuildRequires: javamail
-BuildRequires: jboss4-cluster
-BuildRequires: jboss4-common
-BuildRequires: jboss4-j2ee
-BuildRequires: jboss4-jmx
-BuildRequires: jboss4-security
-BuildRequires: jboss4-server
-BuildRequires: jboss4-system
-BuildRequires: jgroups
-BuildRequires: jotm
-BuildRequires: geronimo-jta-1.0.1B-api
-BuildRequires: log4j
-BuildRequires: openorb-ots
-BuildRequires: xapool
-%endif
-#
+BuildRequires: maven2-plugin-antrun
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-dependency
+BuildRequires: maven2-plugin-enforcer
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-plugin
+BuildRequires: maven2-plugin-project-info-reports
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven2-plugin-site
+BuildRequires: maven2-plugin-source
+BuildRequires: maven2-plugin-remote-resources
+BuildRequires: maven2-plugin-war
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-shared-dependency-tree
+BuildRequires: tomcat5
+BuildRequires: tomcat5-jasper
+BuildRequires: tomcat6-servlet-2.5-api
+BuildRequires: tomcat6-jsp-2.1-api
+BuildRequires: slf4j
+BuildRequires: objectweb-asm
+BuildRequires: jakarta-commons-el
+
Requires: chkconfig
Requires: jpackage-utils >= 0:1.6
Requires: ant >= 0:1.6
@@ -147,12 +101,6 @@ Requires: xml-commons-apis
Provides: group(%username) = %jtuid
Provides: user(%username) = %jtuid
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description
Jetty is a 100% Java HTTP Server and Servlet Container.
This means that you do not need to configure and run a
@@ -175,56 +123,6 @@ Requires: %{name} = %{version}
%description javadoc
%{summary}.
-%if %{with_extra}
-%package extra
-Summary: Extras for %{name}
-Group: Applications/Internet
-Requires: %{name} = %{version}
-Requires: carol
-Requires: geronimo-j2ee-connector-1.5-api
-Requires: geronimo-j2ee-management-1.0-api
-Requires: howl-logger
-Requires: hsqldb
-Requires: jaf
-Requires: jakarta-commons-cli
-Requires: javamail
-Requires: jboss4-cluster
-Requires: jboss4-common
-Requires: jboss4-j2ee
-Requires: jboss4-jmx
-Requires: jboss4-system
-Requires: jboss4-security
-Requires: jboss4-server
-Requires: jgroups
-# jonas_timer
-# objectweb-datasource
-Requires: jotm
-Requires: geronimo-jta-1.0.1B-api
-Requires: log4j
-Requires: openorb-ots
-Requires: xapool
-Requires: xdoclet
-Requires: xjavadoc
-
-%description extra
-The purpose of this project is to enrich Jetty by
-selectively incorporating useful J2EE and non-J2EE
-features. The result is JettyPlus, an environment
-offering additional facilities to core web and servlet
-services, but which does not entail a full-blown
-application server (such as JettyJBoss and JettyJOnAS).
-The feature set currently contains:
-Java Transaction API (JTA) and Resource references, eg DataSources
-Java Naming and Directory Interface API (JNDI)
-Log4J
-Java Authentication and Authorization Service (JAAS)
-Java Mail
-These features have been implemented as a pluggable,
-Service-based architecture. This means that it is
-possible to develop and use alternative services to
-those provided.
-%endif
-
%package manual
Summary: Documents for %{name}
Group: Documentation
@@ -233,106 +131,67 @@ Requires: %{name} = %{version}
%description manual
%{summary}.
-
%prep
%setup -q -n %{jettyname}-%{version}
-mv demo/webapps/servlets-examples.war \
- demo/webapps/servlets-examples-dontdelete
-mv demo/webapps/jsp-examples.war \
- demo/webapps/jsp-examples-dontdelete
for f in $(find . -name "*.?ar"); do rm $f; done
find . -name "*.class" -exec rm {} \;
-# .war files needed for tests
-mv demo/webapps/servlets-examples-dontdelete \
- demo/webapps/servlets-examples.war
-mv demo/webapps/jsp-examples-dontdelete \
- demo/webapps/jsp-examples.war
-
-%if %{bootstrap}
-rm src/org/mortbay/util/jmx/MX4JHttpAdaptor.java
-%endif
%patch0 -b .sav
-%patch1 -b .sav
-%patch2 -b .sav
-%patch3 -b .sav
-%patch4
-%patch5
-
-# Delete this Sun specific file.
-rm src/org/mortbay/http/SunJsseListener.java
-
-# Convert line endings...
-%{__sed} -i 's/\r//' demo/webapps/jetty/auth/logon.html
-%{__sed} -i 's/\r//' demo/webapps/jetty/auth/logon.jsp
-%{__sed} -i 's/\r//' demo/webapps/jetty/auth/logonError.html
+#%patch5
-%build
+cp %{SOURCE7} settings.xml
+
+#remove glassfish specific file
+rm -fr modules/jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/JettyLog.java
+
+sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/management/pom.xml
+sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/management/pom.xml
+sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/jsp-2.0/pom.xml
+sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/jsp-2.0/pom.xml
+sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/naming/pom.xml
+sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/naming/pom.xml
+sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/annotations/pom.xml
+sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/annotations/pom.xml
+
+sed -i "s|mvn|mvn-jpp|g" distribution/jetty-assembly/pom.xml
-pushd ext
- ln -s $(build-classpath ant) .
- ln -s $(build-classpath commons-el) .
- ln -s $(build-classpath commons-logging) .
- ln -s $(build-classpath jasper5-compiler) jasper-compiler.jar
- ln -s $(build-classpath jasper5-runtime) jasper-runtime.jar
- ln -s $(build-classpath mx4j/mx4j) .
- ln -s $(build-classpath mx4j/mx4j-jmx) .
- ln -s $(build-classpath mx4j/mx4j-remote) .
- ln -s $(build-classpath mx4j/mx4j-tools) .
- ln -s $(build-classpath xerces-j2) xercesImpl.jar
- ln -s $(build-classpath xml-commons-apis) xml-apis.jar
-popd
-%if %{with_extra}
-pushd extra/ext
- ln -s $(build-classpath jaf) activation.jar
- ln -s $(build-classpath commons-cli) .
- ln -s $(build-classpath geronimo-j2ee-connector-1.5-api) connector-1_5.jar
- ln -s $(build-classpath hsqldb) .
- ln -s $(build-classpath geronimo-j2ee-management-1.0-api) javax77.jar
- ln -s $(build-classpath geronimo-jta-1.0.1B-api) jta-spec1_0_1.jar
- ln -s $(build-classpath log4j) .
- ln -s $(build-classpath javamail/mailapi) mail.jar
- ln -s $(build-classpath carol/ow_carol) .
- ln -s $(build-classpath howl-logger) .
-# #jonas_timer.jar
- ln -s $(build-classpath jotm/jotm) .
- ln -s $(build-classpath jotm/iiop-stubs) jotm_iiop_stubs.jar
- ln -s $(build-classpath jotm/jrmp-stubs) jotm_jrmp_stubs.jar
- ln -s $(build-classpath openorb-ots) jts1_0.jar
- #objectweb-datasource.jar
- ln -s $(build-classpath xapool) .
-popd
-%endif
-
-export CLASSPATH=$(build-classpath \
-xjavadoc \
-)
-
-%if %{with_extra}
-CLASSPATH=$CLASSPATH:$(build-classpath \
-jboss4/jboss-j2ee \
-jboss4/jboss-common \
-jboss4/jboss-system \
-jboss4/jboss-jmx \
-jboss4/jboss \
-jboss4/jbosssx \
-jboss4/jbossha \
-jgroups \
-log4j \
-)
-%endif
-
-%if %{with_extra}
-ant -Dxdoclet.home=%{_javadir}/xdoclet -Dbuild.sysclasspath=first all extra
-%else
-ant -Dxdoclet.home=%{_javadir}/xdoclet -Dbuild.sysclasspath=first all
-%endif
-
-# inject OSGi manifests
-mkdir -p META-INF
-cp %{SOURCE4} META-INF/MANIFEST.MF
-zip -u lib/org.mortbay.jetty.jar META-INF/MANIFEST.MF
+sed -i "s|zip \$D/\$N|zip \$D/\$N/\$N|g" bin/build_release_bundles.sh
+sed -i "s|# look for JETTY_HOME|export JETTY_HOME=/usr/share/jetty|g" bin/jetty-xinetd.sh
+
+%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 \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven2.jpp.depmap.file=%{SOURCE4} \
+ -Dmaven.test.skip=true \
+ install
+
+#pushd distribution/jetty-assembly
+# mvn-jpp \
+# -e \
+# -s $(pwd)/settings.xml \
+# -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+# -Dmaven2.jpp.depmap.file=%{SOURCE4} \
+# -Dmaven.test.skip=true \
+# install
+#popd
+
+sh bin/build_release_bundles.sh .
%install
rm -rf $RPM_BUILD_ROOT
@@ -341,50 +200,26 @@ install -dm 755 $RPM_BUILD_ROOT%{_bindir
install -dm 755 $RPM_BUILD_ROOT%{_initrddir}
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
install -dm 755 $RPM_BUILD_ROOT%{confdir}
-install -dm 755 $RPM_BUILD_ROOT%{confdir}/extra
-install -dm 755 $RPM_BUILD_ROOT%{demodir}
install -dm 755 $RPM_BUILD_ROOT%{homedir}
-install -dm 755 $RPM_BUILD_ROOT%{homedir}/bin
-install -dm 755 $RPM_BUILD_ROOT%{homedir}/ext
-install -dm 755 $RPM_BUILD_ROOT%{homedir}/extra
-install -dm 755 $RPM_BUILD_ROOT%{homedir}/extra/ext
-install -dm 755 $RPM_BUILD_ROOT%{libdir}
-install -dm 755 $RPM_BUILD_ROOT%{libdir}/extra
install -dm 755 $RPM_BUILD_ROOT%{logdir}
install -dm 755 $RPM_BUILD_ROOT%{rundir}
install -dm 755 $RPM_BUILD_ROOT%{tempdir}
install -dm 755 $RPM_BUILD_ROOT%{appdir}
# main pkg
-install -pm 755 extra/unix/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/d%{name}
-install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
+unzip -q %{name}-%{version}.zip -d $RPM_BUILD_ROOT%{homedir}
+mv $RPM_BUILD_ROOT%{homedir}/%{name}-%{version}/* $RPM_BUILD_ROOT%{homedir}/
+rm -fr $RPM_BUILD_ROOT%{homedir}/%{name}-%{version}
+
+chmod +x $RPM_BUILD_ROOT%{homedir}/bin/jetty-xinetd.sh
+ln -s %{homedir}/bin/jetty-xinetd.sh $RPM_BUILD_ROOT%{_bindir}/d%{name}
+ln -s %{homedir}/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name}
install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
-install -pm 644 start.jar $RPM_BUILD_ROOT%{homedir}/bin
-install -pm 644 stop.jar $RPM_BUILD_ROOT%{homedir}/bin
-cp -pr etc/* $RPM_BUILD_ROOT%{confdir}
echo '# Placeholder configuration file. No default is provided.' > $RPM_BUILD_ROOT%{confdir}/jetty.conf
-install -pm 644 lib/org.mortbay.jetty.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar
-install -pm 644 lib/org.mortbay.jmx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmx-%{version}.jar
-install -pm 644 lib/javax.servlet.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-servlet-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-pushd $RPM_BUILD_ROOT%{libdir}
- ln -sf %{_javadir}/%{name}/%{name}.jar org.mortbay.jetty.jar
- ln -sf %{_javadir}/%{name}/%{name}-jmx.jar org.mortbay.jmx.jar
-popd
-pushd $RPM_BUILD_ROOT%{homedir}/ext
-ln -s $(build-classpath ant)
-ln -s $(build-classpath jasper5-compiler)
-ln -s $(build-classpath jasper5-runtime)
-ln -s $(build-classpath commons-el)
-ln -s $(build-classpath commons-logging)
-ln -s $(build-classpath mx4j/mx4j-jmx)
-ln -s $(build-classpath mx4j/mx4j-tools)
-ln -s $(build-classpath servletapi5)
-ln -s $(build-classpath jspapi)
-ln -s $(build-classpath xerces-j2)
-ln -s $(build-classpath xml-commons-apis)
-popd
+ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar
+ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util-%{version}.jar
( cat << EO_RC
JAVA_HOME=/usr/lib/jvm/java
JAVA_OPTIONS=
@@ -396,98 +231,40 @@ JETTY_PID=\$JETTY_RUN/jetty.pid
EO_RC
) > $RPM_BUILD_ROOT%{homedir}/.jettyrc
-# extra
-%if %{with_extra}
-cp -pr extra/etc/* $RPM_BUILD_ROOT%{confdir}/extra
-rm $RPM_BUILD_ROOT%{confdir}/extra/LICENSE.apache.txt
-rm $RPM_BUILD_ROOT%{confdir}/extra/LICENSE.hsqldb.html
-rm $RPM_BUILD_ROOT%{confdir}/extra/LICENSE.p6spy.html
-
-install -pm 644 extra/lib/org.jboss.jetty.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jboss-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.ftp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-ftp-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.j2ee.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-j2ee-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.jaas.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jaas-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.jsr77.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsr77-%{version}.jar
-# omit for 1.6
-# install -pm 644 extra/lib/org.mortbay.jetty-jdk1.2.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jetty-jdk1.2-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.jetty.plus.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-plus-%{version}.jar
-# omit for 1.6
-# install -pm 644 extra/lib/org.mortbay.jmx-jdk1.2.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmx-jdk1.2-%{version}.jar
-install -pm 644 extra/lib/org.mortbay.loadbalancer.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-loadbalancer-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-pushd $RPM_BUILD_ROOT%{libdir}/extra
- ln -sf %{_javadir}/%{name}/%{name}-jboss.jar org.jboss.jetty.jar
- ln -sf %{_javadir}/%{name}/%{name}-ftp.jar org.mortbay.ftp.jar
- ln -sf %{_javadir}/%{name}/%{name}-j2ee.jar org.mortbay.j2ee.jar
- ln -sf %{_javadir}/%{name}/%{name}-jaas.jar org.mortbay.jaas.jar
- ln -sf %{_javadir}/%{name}/%{name}-jsr77.jar org.mortbay.jsr77.jar
- ln -sf %{_javadir}/%{name}/%{name}-plus.jar org.mortbay.jetty.plus.jar
- ln -sf %{_javadir}/%{name}/%{name}-loadbalancer.jar org.mortbay.loadbalancer.jar
-popd
-pushd $RPM_BUILD_ROOT%{homedir}/extra/ext
- #jonas_timer.jar
- #objectweb-datasource.jar
-ln -s $(build-classpath jaf)
-ln -s $(build-classpath carol/carol)
-ln -s $(build-classpath commons-cli)
-ln -s $(build-classpath hsqldb)
-ln -s $(build-classpath jotm/jotm)
-ln -s $(build-classpath jotm/iiop-stubs)
-ln -s $(build-classpath jotm/jrmp-stubs)
-ln -s $(build-classpath jta)
-ln -s $(build-classpath openorb-ots)
-ln -s $(build-classpath log4j)
-ln -s $(build-classpath javamail/mailapi)
-ln -s $(build-classpath xapool)
-popd
-%endif
-
-cp -pr demo/* $RPM_BUILD_ROOT%{demodir}
-
# javadoc
-cp -pr webapps/* $RPM_BUILD_ROOT%{appdir}
-rm $RPM_BUILD_ROOT/%{appdir}/template/WEB-INF/lib/.keepme
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-pushd $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-unzip -q $RPM_BUILD_ROOT%{appdir}/javadoc.war
-%{__sed} -i 's/\r//' META-INF/MANIFEST.MF
-popd
+mv $RPM_BUILD_ROOT%{homedir}/jxr/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
# manual
install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p {LICENSE.TXT,VERSION.TXT} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-mv $RPM_BUILD_ROOT%{demodir}/webapps/jetty/* \
- $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-rm $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/WEB-INF/.cvsignore
-rm -rf $RPM_BUILD_ROOT%{appdir}/jetty
-# Remaining files in demodir are not built into any subpackage.
-rm -rf $RPM_BUILD_ROOT%{demodir}/*
-
-
-pushd $RPM_BUILD_ROOT%{homedir}
- [ -d etc ] || ln -fs %{confdir} etc
- [ -d demo ] || ln -fs %{demodir} demo
- [ -d logs ] || ln -fs %{logdir} logs
- [ -d lib ] || ln -fs %{libdir} lib
- [ -d temp ] || ln -fs %{tempdir} temp
- [ -d webapps ] || ln -fs %{appdir} webapps
-%if %{with_extra}
- pushd extra
- [ -d etc ] || ln -fs %{confdir}/extra etc
- [ -d lib ] || ln -fs %{libdir}/extra lib
- popd
-%endif
-popd
-
-# no need to fix paths
-#perl -pi -e 's#etc/#conf/#g;' $RPM_BUILD_ROOT%{confdir}/*.xml
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm \
- --exclude /var/lib/jetty/webapps/javadoc.war \
- --exclude /usr/share/doc/jetty-%{version}/WEB-INF/classes \
- --exclude /var/lib/jetty/webapps/template/WEB-INF/classes
-%endif
+
+rm -fr $RPM_BUILD_ROOT%{homedir}/logs
+ln -s %{logdir} $RPM_BUILD_ROOT%{homedir}/logs
+
+mv $RPM_BUILD_ROOT%{homedir}/etc/* $RPM_BUILD_ROOT/%{confdir}
+rm -fr $RPM_BUILD_ROOT%{homedir}/etc
+ln -s %{confdir} $RPM_BUILD_ROOT%{homedir}/etc
+
+mv $RPM_BUILD_ROOT%{homedir}/webapps/* $RPM_BUILD_ROOT/%{appdir}
+rm -fr $RPM_BUILD_ROOT%{homedir}/webapps
+ln -s %{appdir} $RPM_BUILD_ROOT%{homedir}/webapps
+
+rm -fr $RPM_BUILD_ROOT%{homedir}/contrib
+rm -fr $RPM_BUILD_ROOT%{homedir}/distribution
+rm -fr $RPM_BUILD_ROOT%{homedir}/examples
+rm -fr $RPM_BUILD_ROOT%{homedir}/extras
+rm -fr $RPM_BUILD_ROOT%{homedir}/modules
+rm -fr $RPM_BUILD_ROOT%{homedir}/patches
+rm -fr $RPM_BUILD_ROOT%{homedir}/jxr
+rm -fr $RPM_BUILD_ROOT%{homedir}/project-website
+rm -fr $RPM_BUILD_ROOT%{homedir}/LICENSES
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/jetty-service.conf
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/Jetty-Service.exe
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/README.jetty-cygwin.txt.txt
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/build_release_bundles.sh
+rm -fr $RPM_BUILD_ROOT%{homedir}/bin/jetty-cygwin.sh
+rm -fr $RPM_BUILD_ROOT%{homedir}/*.txt
+rm -fr $RPM_BUILD_ROOT%{homedir}/pom.*
+rm -fr $RPM_BUILD_ROOT%{homedir}/*.zip
%clean
rm -rf $RPM_BUILD_ROOT
@@ -501,22 +278,10 @@ rm -rf $RPM_BUILD_ROOT
%post
[ -x /sbin/chkconfig ] && /sbin/chkconfig --add %{name}
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
%postun
%__fe_userdel %username &>/dev/null || :
%__fe_groupdel %username &>/dev/null || :
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
%preun
@@ -532,80 +297,34 @@ fi
%{_bindir}/*
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/%{name}-%{version}.jar
-%{_javadir}/%{name}/%{name}-jmx-%{version}.jar
-%{_javadir}/%{name}/%{name}-servlet-%{version}.jar
-%{_javadir}/%{name}/%{name}.jar
-%{_javadir}/%{name}/%{name}-jmx.jar
-%{_javadir}/%{name}/%{name}-servlet.jar
+%{_javadir}/%{name}/%{name}-util-%{version}.jar
%config(noreplace) %{confdir}
%dir %{jettylibdir}
%dir %{jettycachedir}
-%dir %{libdir}
-%{libdir}/org.mortbay.jetty.jar
-%{libdir}/org.mortbay.jmx.jar
-%dir %{homedir}
-%{homedir}/[^e]*
-%{homedir}/ext
-%{homedir}/etc
-%{homedir}/.jettyrc
-%dir %{demodir}
+%{homedir}
+%{appdir}
%attr(755, jetty, jetty) %{logdir}
%attr(755, jetty, jetty) %{tempdir}
%attr(755, jetty, jetty) %{rundir}
%dir %{appdir}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/LICENSE.TXT
-%doc %{_docdir}/%{name}-%{version}/VERSION.TXT
+%doc NOTICE.txt
+%doc README.txt
+%doc VERSION.txt
%{_initrddir}/%{name}
%{_sysconfdir}/logrotate.d/%{name}
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}/
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*.so
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*.db
-%endif
%files javadoc
%defattr(-,root,root,-)
-%{appdir}/template
-%{appdir}/javadoc.war
%doc %{_javadocdir}/%{name}-%{version}
%files manual
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}
-%if %{with_extra}
-%files extra
-%defattr(-,root,root,-)
-%{_javadir}/%{name}/%{name}-ftp-%{version}.jar
-%{_javadir}/%{name}/%{name}-ftp.jar
-%{_javadir}/%{name}/%{name}-j2ee-%{version}.jar
-%{_javadir}/%{name}/%{name}-j2ee.jar
-%{_javadir}/%{name}/%{name}-jaas-%{version}.jar
-%{_javadir}/%{name}/%{name}-jaas.jar
-%{_javadir}/%{name}/%{name}-jboss-%{version}.jar
-%{_javadir}/%{name}/%{name}-jboss.jar
-%{_javadir}/%{name}/%{name}-jsr77-%{version}.jar
-%{_javadir}/%{name}/%{name}-jsr77.jar
-%{_javadir}/%{name}/%{name}-loadbalancer-%{version}.jar
-%{_javadir}/%{name}/%{name}-loadbalancer.jar
-%{_javadir}/%{name}/%{name}-plus-%{version}.jar
-%{_javadir}/%{name}/%{name}-plus.jar
-%{confdir}/extra
-%{homedir}/extra
-%{libdir}/extra
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-ftp-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-j2ee-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jaas-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jboss-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jsr77-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-loadbalancer-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-plus-%{version}.jar.*
-%endif
-%endif
-
%changelog
+* Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.20-1
+- Update to upstream 6.1.20.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.15-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--- jetty-OSGi-MANIFEST.MF DELETED ---
--- jetty-webdefault.patch DELETED ---
--- jetty-TestRFC2616-libgcj-bad-date-parser.patch DELETED ---
--- jetty-libgcj-bad-serialization.patch DELETED ---
--- jetty-CERT438616-CERT237888-CERT21284.patch DELETED ---
--- jetty-PostFileFilter.patch DELETED ---
--- jetty-extra-j2ee-build_xml.patch DELETED ---
- Previous message (by thread): rpms/libvirt/devel .cvsignore, 1.46, 1.47 libvirt.spec, 1.175, 1.176 sources, 1.48, 1.49
- Next message (by thread): rpms/bind/devel .cvsignore, 1.55, 1.56 bind-9.3.2b2-sdbsrc.patch, 1.1, 1.2 bind-9.5-sdb.patch, 1.3, 1.4 bind-96-dyndb.patch, 1.9, 1.10 bind.spec, 1.324, 1.325 sources, 1.64, 1.65 bind-96-db_unregister.patch, 1.1, NONE bind96-rh507469.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list