rpms/jetty/devel jetty.spec, 1.20, 1.21 disable-modules.patch, 1.1, 1.2 jetty-depmap.xml, 1.1, 1.2

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17946/devel

Modified Files:
	jetty.spec disable-modules.patch jetty-depmap.xml 
Log Message:
Update to upstream 6.1.21 release.


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- jetty.spec	18 Sep 2009 19:42:06 -0000	1.20
+++ jetty.spec	29 Sep 2009 08:29:09 -0000	1.21
@@ -41,14 +41,14 @@
 %define appdir      %{jettylibdir}/webapps
 
 Name:           jetty
-Version:        6.1.20
-Release:        3%{?dist}
+Version:        6.1.21
+Release:        1%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
 License:        ASL 2.0
 URL:            http://jetty.mortbay.org/jetty/
-Source0:        http://dist.codehaus.org/jetty/jetty-6.1.20/jetty-6.1.20-src.zip
+Source0:        http://dist.codehaus.org/%{name}/%{name}-%{version}/%{name}-%{version}-src.zip
 Source1:	djetty.script
 Source2:        jetty.init
 Source3:        jetty.logrotate
@@ -87,6 +87,7 @@ BuildRequires: tomcat6-jsp-2.1-api
 BuildRequires: slf4j
 BuildRequires: objectweb-asm
 BuildRequires: jakarta-commons-el
+BuildRequires: jakarta-commons-daemon
 
 Requires:  chkconfig
 Requires:  jpackage-utils >= 0:1.6
@@ -96,8 +97,6 @@ Requires:  jakarta-commons-logging
 Requires:  tomcat5-jasper >= 5.5.26-1.5
 Requires:  jsp
 Requires:  mx4j >= 0:3.0
-Requires: tomcat5
-Requires: tomcat5-jasper
 Requires: tomcat6-servlet-2.5-api
 Requires: tomcat6-jsp-2.1-api
 Requires: slf4j
@@ -363,6 +362,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.21-1
+- Update to upstream 6.1.21 release.
+
 * Fri Sep 18 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-3
 - Add djetty script source and fix init script to work properly.
 

disable-modules.patch:
 pom.xml |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Index: disable-modules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/disable-modules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- disable-modules.patch	15 Sep 2009 12:51:05 -0000	1.1
+++ disable-modules.patch	29 Sep 2009 08:29:09 -0000	1.2
@@ -1,5 +1,5 @@
---- pom.xml.sav	2009-09-01 21:19:01.000000000 +0300
-+++ pom.xml	2009-09-14 12:59:01.723285440 +0300
+--- pom.xml.sav	2009-09-22 10:17:54.000000000 +0300
++++ pom.xml	2009-09-29 11:01:34.323185945 +0300
 @@ -61,12 +61,12 @@
            <target>1.4</target>
          </configuration>
@@ -15,7 +15,7 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-jar-plugin</artifactId>
-@@ -110,47 +110,47 @@
+@@ -110,24 +110,24 @@
      <module>modules/util</module>
      <module>modules/util5</module>
      <module>modules/jetty</module>
@@ -45,35 +45,25 @@
 +    <!--module>extras/ajp</module>
 +    <module>extras/win32service</module-->
      <!--module>extras/gwt</module-->
--    <module>extras/threadpool</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-->
+@@ -141,16 +141,16 @@
+     <module>examples/tests</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/cometd</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/start-daemon</module>
      <!--module>contrib/grizzly</module-->
      <!--module>contrib/wadi</module-->
-     <!--<module>contrib/terracotta</module-->
- 
+-    <module>contrib/terracotta</module>
++    <!--module>contrib/terracotta</module>
+     <module>contrib/sweeper</module>
 -    <module>extras/setuid</module>
-+    <!--module>extras/setuid</module-->
++    <module>extras/setuid</module-->
    </modules>
    <dependencyManagement>
      <dependencies>


Index: jetty-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jetty-depmap.xml	15 Sep 2009 12:51:05 -0000	1.1
+++ jetty-depmap.xml	29 Sep 2009 08:29:09 -0000	1.2
@@ -133,6 +133,18 @@
 	</dependency>
 	<dependency>
 		<maven>
+			<groupId>commons-daemon</groupId>
+			<artifactId>commons-daemon</artifactId>
+			<version>1.0.1</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>commons-daemon</artifactId>
+			<version>1.0.1</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-release-plugin</artifactId>
 			<version>1.0.1</version>