[RPM (6.0)] [DIST generic] grizzly-1.9.55-1.jpp6
Ralph Apel <[email protected]> Tue, 15 Jan 2013 16:46:14 +0100
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : grizzly Relocations: (not relocatable) Version : 1.9.55 Vendor: JPackage Project Release : 1.jpp6 Build Date: Tue 15 Jan 2013 04:31:57 PM CET Install Date: (not installed) Build Host: linux.fritz.box Group : Networking/Daemons Source RPM: (none) Size : 2432466 License: CDDL Signature : (none) Packager : Ralph Apel <[email protected]> URL : https://grizzly.dev.java.net/ Summary : Grizzly - Java NIO Server Framework Description : Writing scalable server applications in the Java programming language has always been difficult. Before the advent of the Java New I/O API (NIO), thread management issues made it impossible for a server to scale to thousands of users. The Grizzly framework has been designed to help developers to take advantage of the Java NIO API. Originally developed under the GlassFish umbrella, the framework is now available as a standalone project. Grizzly goals is to help developers to build scalable and robust servers using NIO. --------------- Ralph Apel <r.apel at r-apel.de> 0:1.9.55-1 - 1.9.55 --------------- grizzly.src: W: source-or-patch-not-bzipped grizzly-pom.patch grizzly.src: W: source-or-patch-not-bzipped grizzly-modules-config-pom.patch grizzly.src: W: source-or-patch-not-bzipped grizzly-extras-pom.patch grizzly.src: W: source-or-patch-not-bzipped grizzly-config-Utils.patch grizzly.src: W: source-or-patch-not-bzipped grizzly-cometd-client-BayeuxClient.patch grizzly.src: W: source-or-patch-not-bzipped grizzly-cometd-client-BayeuxLoadGenerator.patch grizzly.src: W: non-standard-group Networking/Daemons grizzly.src: W: no-signature grizzly.src: W: name-repeated-in-summary Grizzly grizzly.src: W: invalid-license CDDL 1 packages and 0 specfiles checked; 0 errors, 10 warnings. --------------- Index: grizzly-cometd-client-BayeuxClient.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/grizzly/grizzly-cometd-client-BayeuxClient.patch,v retrieving revision 1.1 diff -u -r1.1 grizzly-cometd-client-BayeuxClient.patch --- grizzly-cometd-client-BayeuxClient.patch 5 Aug 2012 22:37:24 -0000 1.1 +++ grizzly-cometd-client-BayeuxClient.patch 15 Jan 2013 15:46:12 -0000 @@ -1,22 +1,6 @@ ---- extras/cometd-client/src/main/java/org/mortbay/cometd/client/BayeuxClient.java.sav3 2011-02-07 19:37:24.000000000 +0100 -+++ extras/cometd-client/src/main/java/org/mortbay/cometd/client/BayeuxClient.java 2011-06-07 18:19:07.000000000 +0200 -@@ -63,6 +63,7 @@ - import java.util.LinkedList; - import java.util.List; - import java.util.Map; -+import java.util.Queue; - import java.util.concurrent.ConcurrentHashMap; - - import java.util.logging.Level; -@@ -75,6 +76,7 @@ - import org.mortbay.io.ByteArrayBuffer; - import org.mortbay.jetty.HttpHeaders; - import org.mortbay.jetty.HttpSchemes; -+import org.mortbay.jetty.client.Address; - import org.mortbay.jetty.client.HttpClient; - import org.mortbay.jetty.client.HttpExchange; - import org.mortbay.log.Log; -@@ -82,12 +84,14 @@ +--- extras/cometd-client/src/main/java/org/mortbay/cometd/client/BayeuxClient.java.sav4 2012-12-12 22:43:18.000000000 +0100 ++++ extras/cometd-client/src/main/java/org/mortbay/cometd/client/BayeuxClient.java 2013-01-05 09:45:52.356592263 +0100 +@@ -82,12 +82,12 @@ import org.mortbay.util.UrlEncoded; import org.mortbay.util.ajax.JSON; @@ -28,8 +12,6 @@ -import dojox.cometd.MessageListener; +import org.cometd.Bayeux; +import org.cometd.Client; -+import org.cometd.ClientListener; -+import org.cometd.Extension; +import org.cometd.Listener; +import org.cometd.RemoveListener; +import org.cometd.Message; @@ -37,26 +19,25 @@ /* ------------------------------------------------------------ */ /** Bayeux protocol Client. -@@ -436,7 +440,7 @@ +@@ -436,7 +436,7 @@ { setMethod("POST"); setScheme(HttpSchemes.HTTP_BUFFER); - setAddress(_address); -+ setAddress(new Address(_address.getHostName(), _address.getPort())); ++ setAddress(new org.mortbay.jetty.client.Address(_address.getHostName(), _address.getPort())); setURI(_uri+"/"+info); setRequestContentType(_formEncoded?"application/x-www-form-urlencoded;charset=utf-8":"text/json;charset=utf-8"); -@@ -844,4 +848,13 @@ +@@ -844,4 +844,12 @@ return nextNumber; } -+ public int getMaxQueue() { return 0; } -+ public void setMaxQueue(int mx) { } -+ public Queue<Message> getQueue() { return (Queue<Message>)null; } -+ public void disconnect() {} -+ public void addListener(ClientListener listener) {} -+ public void removeListener(ClientListener listener) {} -+ public void addExtension(Extension ext) {} -+ public void removeExtension(Extension ext) {} -+ ++ public int getMaxQueue() { return -1; } ++ public void setMaxQueue(int i) { } ++ public java.util.Queue<Message> getQueue() { return null; } ++ public void disconnect() { } ++ public void addExtension(org.cometd.Extension e) { } ++ public void removeExtension(org.cometd.Extension e) { } ++ public void addListener(org.cometd.ClientListener l) { } ++ public void removeListener(org.cometd.ClientListener l) { } } Index: grizzly-cometd-client-BayeuxLoadGenerator.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/grizzly/grizzly-cometd-client-BayeuxLoadGenerator.patch,v retrieving revision 1.1 diff -u -r1.1 grizzly-cometd-client-BayeuxLoadGenerator.patch --- grizzly-cometd-client-BayeuxLoadGenerator.patch 5 Aug 2012 22:37:24 -0000 1.1 +++ grizzly-cometd-client-BayeuxLoadGenerator.patch 15 Jan 2013 15:46:12 -0000 @@ -1,5 +1,5 @@ ---- extras/cometd-client/src/main/java/org/mortbay/cometd/client/BayeuxLoadGenerator.java.sav 2011-06-07 17:52:33.000000000 +0200 -+++ extras/cometd-client/src/main/java/org/mortbay/cometd/client/BayeuxLoadGenerator.java 2011-06-07 17:52:53.000000000 +0200 +--- extras/cometd-client/src/main/java/org/mortbay/cometd/client/BayeuxLoadGenerator.java.sav 2013-01-05 09:33:07.659779747 +0100 ++++ extras/cometd-client/src/main/java/org/mortbay/cometd/client/BayeuxLoadGenerator.java 2013-01-05 09:33:23.271592001 +0100 @@ -52,10 +52,10 @@ import org.mortbay.thread.QueuedThreadPool; import org.mortbay.util.ajax.JSON; Index: grizzly-extras-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/grizzly/grizzly-extras-pom.patch,v retrieving revision 1.1 diff -u -r1.1 grizzly-extras-pom.patch --- grizzly-extras-pom.patch 5 Aug 2012 22:37:24 -0000 1.1 +++ grizzly-extras-pom.patch 15 Jan 2013 15:46:12 -0000 @@ -1,5 +1,5 @@ ---- extras/pom.xml.sav 2011-06-07 14:17:48.000000000 +0200 -+++ extras/pom.xml 2011-06-07 14:18:05.000000000 +0200 +--- extras/pom.xml.sav 2013-01-05 08:51:53.821592580 +0100 ++++ extras/pom.xml 2013-01-05 08:52:12.473594067 +0100 @@ -59,7 +59,7 @@ </properties> <modules> Index: grizzly-jpp-depmap.xml =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/grizzly/grizzly-jpp-depmap.xml,v retrieving revision 1.2 diff -u -r1.2 grizzly-jpp-depmap.xml --- grizzly-jpp-depmap.xml 5 Aug 2012 22:37:24 -0000 1.2 +++ grizzly-jpp-depmap.xml 15 Jan 2013 15:46:12 -0000 @@ -1,5 +1,57 @@ <dependencies> +<dependency> + <maven> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>validation_1_0_api</artifactId> + <version>1.0</version> + </jpp> +</dependency> + + <dependency> + <maven> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + <version>1.0-2</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>stax_1_0_api</artifactId> + <version>1.0</version> + </jpp> + </dependency> + + <dependency> + <maven> + <groupId>stax</groupId> + <artifactId>stax</artifactId> + <version>1.2.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>bea-stax-api</artifactId> + <version>1.2.0</version> + </jpp> + </dependency> + + <dependency> + <maven> + <groupId>org.osgi</groupId> + <artifactId>osgi_R4_core</artifactId> + <version>1.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>org.osgi.core</artifactId> + <version>4.2.0</version> + </jpp> + </dependency> + <dependency> <maven> <groupId>org.mortbay.jetty</groupId> Index: grizzly-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/grizzly/grizzly-pom.patch,v retrieving revision 1.2 diff -u -r1.2 grizzly-pom.patch --- grizzly-pom.patch 5 Aug 2012 22:37:24 -0000 1.2 +++ grizzly-pom.patch 15 Jan 2013 15:46:12 -0000 @@ -1,32 +1,80 @@ ---- pom.xml.sav0 2011-04-20 06:55:26.000000000 +0200 -+++ pom.xml 2011-06-01 20:02:49.000000000 +0200 -@@ -138,11 +138,13 @@ - <outputDirectory>target/classes</outputDirectory> - <testOutputDirectory>target/test-classes</testOutputDirectory> - <extensions> -+<!-- - <extension> - <groupId>org.jvnet.wagon-svn</groupId> - <artifactId>wagon-svn</artifactId> - <version>1.9</version> - </extension> -+--> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> -@@ -377,6 +379,7 @@ - <artifactId>cometd-bayeux</artifactId> +--- pom.xml.sav0 2012-12-12 22:43:18.000000000 +0100 ++++ pom.xml 2013-01-05 09:49:04.875592006 +0100 +@@ -152,16 +152,6 @@ + </pluginManagement> + <plugins> + <plugin> +- <groupId>org.sonatype.plugins</groupId> +- <artifactId>nexus-maven-plugin</artifactId> +- <version>2.0.6</version> +- </plugin> +- <plugin> +- <groupId>org.sonatype.plugins</groupId> +- <artifactId>nexus-maven-plugin</artifactId> +- <version>2.0.6</version> +- </plugin> +- <plugin> + <inherited>true</inherited> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> +@@ -227,17 +217,6 @@ + <findbugsXmlWithMessages>true</findbugsXmlWithMessages> + </configuration> + </plugin> +- <plugin> +- <groupId>org.glassfish.copyright</groupId> +- <artifactId>glassfish-copyright-maven-plugin</artifactId> +- <version>1.28</version> +- <configuration> +- <excludeFile>copyright-exclude</excludeFile> +- <scm>git</scm> +- <scmOnly>true</scmOnly> +- <warn>false</warn> +- </configuration> +- </plugin> + </plugins> + </build> + <profiles> +@@ -324,7 +303,7 @@ + <module>extras</module> + <module>samples</module> + <module>contribs</module> +- <module>documentation</module> ++ <!--<module>documentation</module>--> + </modules> + <reporting> + <outputDirectory>target/site</outputDirectory> +@@ -410,19 +389,19 @@ <version>6.1.11</version> </dependency> -+<!-- <dependency> - <groupId>com.sun.enterprise</groupId> +- <groupId>com.sun.enterprise</groupId> ++ <groupId>org.glassfish.hk2</groupId> <artifactId>hk2</artifactId> -@@ -392,6 +395,7 @@ - <artifactId>osgi-adapter</artifactId> <version>${hk2.version}</version> + <scope>provided</scope> + </dependency> + <dependency> +- <groupId>com.sun.enterprise</groupId> ++ <groupId>org.glassfish.hk2</groupId> + <artifactId>config-types</artifactId> + <version>${hk2.version}</version> + <scope>provided</scope> </dependency> -+--> <dependency> - <groupId>stax</groupId> - <artifactId>stax</artifactId> +- <groupId>com.sun.enterprise</groupId> ++ <groupId>org.glassfish.hk2</groupId> + <artifactId>osgi-adapter</artifactId> + <version>${hk2.version}</version> + <scope>provided</scope> +@@ -525,8 +504,8 @@ + <felix-version>2.3.6</felix-version> + <grizzly-next-version>2.0.0</grizzly-next-version> + <grizzly-released-version>1.9.36</grizzly-released-version> +- <hk2.version>1.0.25</hk2.version> +- <hk2.plugin.version>1.0.25</hk2.plugin.version> ++ <hk2.version>2.1.18</hk2.version> ++ <hk2.plugin.version>2.1.18</hk2.plugin.version> + <jersey-version>1.1.5</jersey-version> + <junit-version>4.7</junit-version> + <maven-plugin.version>1.0.0</maven-plugin.version> Index: grizzly.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/grizzly/grizzly.spec,v retrieving revision 1.2 diff -u -r1.2 grizzly.spec --- grizzly.spec 5 Aug 2012 22:37:24 -0000 1.2 +++ grizzly.spec 15 Jan 2013 15:46:12 -0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2012, JPackage Project +# Copyright (c) 2000-2013, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -38,24 +38,24 @@ Name: grizzly Summary: Grizzly - Java NIO Server Framework Url: https://grizzly.dev.java.net/ -Version: 1.9.34 -Release: 2%{?dist} +Version: 1.9.55 +Release: 1%{?dist} Epoch: 0 License: CDDL Group: Networking/Daemons -Source0: grizzly-1.9.34.tgz +Source0: grizzly-1.9.55.tar.bz2 # Steps to reproduce -# svn export https://svn.java.net/svn/grizzly~svn/tags/1_9_34 grizzly-1.9.34 -# tar czf ../SOURCES/grizzly-1.9.34.tgz grizzly-1.9.34/ +# git clone git://java.net/grizzly~git +# git archive --prefix="grizzly-1.9.55/" --format=tar 1_9_55 | bzip2 > ../../SOURCES/grizzly-1.9.55.tar.bz2 Source1: %{name}-settings.xml Source2: %{name}-jpp-depmap.xml Patch0: %{name}-pom.patch -Patch1: %{name}-modules-pom.patch -Patch2: %{name}-extras-pom.patch -Patch3: %{name}-cometd-client-BayeuxClient.patch -Patch4: %{name}-cometd-client-BayeuxLoadGenerator.patch - +Patch1: %{name}-modules-config-pom.patch +Patch2: %{name}-config-Utils.patch +Patch3: %{name}-extras-pom.patch +Patch4: %{name}-cometd-client-BayeuxClient.patch +Patch5: %{name}-cometd-client-BayeuxLoadGenerator.patch BuildRequires: jpackage-utils >= 0:1.7.5 BuildRequires: java-devel >= 0:1.6.0 @@ -82,16 +82,21 @@ BuildRequires: jvnet-parent BuildRequires: apache-felix-maven-bundle-plugin BuildRequires: istack-commons-maven-plugin +BuildRequires: glassfish-parent BuildRequires: oss-parent BuildRequires: testng BuildRequires: annotation_1_0_api BuildRequires: apache-commons-modeler +BuildRequires: bea-stax-api BuildRequires: ecj3 +BuildRequires: geronimo-validation-1.0-api +BuildRequires: hk2 +BuildRequires: hk2-osgi-resource-locator BuildRequires: jaf_1_1_api BuildRequires: jetty6-cometd BuildRequires: jetty6-ext -BuildRequires: jruby >= 0:1.1.1 +BuildRequires: jtype BuildRequires: ops4j-pax-exam BuildRequires: org.osgi.core BuildRequires: org.osgi.compendium @@ -104,9 +109,13 @@ Requires: java >= 0:1.6.0 Requires: apache-commons-modeler +Requires: hk2 +Requires: hk2-osgi-resource-locator +Requires: jtype Requires: org.osgi.core Requires: org.osgi.compendium Requires: servlet_2_5_api +Requires: validation_1_0_api Requires(post): jpackage-utils >= 0:1.7.5 Requires(postun): jpackage-utils >= 0:1.7.5 @@ -145,6 +154,7 @@ %patch2 -b .sav2 %patch3 -b .sav3 %patch4 -b .sav4 +%patch5 -b .sav5 %build @@ -169,7 +179,6 @@ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -Dmaven.test.skip=true \ install -# -Dmaven.test.failure.ignore=true \ mvn-jpp \ -e \ @@ -432,6 +441,9 @@ %doc %{_javadocdir}/%{name} %changelog +* Tue Jan 15 2013 Ralph Apel <r.apel at r-apel.de> 0:1.9.55-1 +- 1.9.55 + * Sun Aug 05 2012 Ralph Apel <r.apel at r-apel.de> 0:1.9.34-2 - Promote to free