diff options
28 files changed, 252 insertions, 191 deletions
diff --git a/com.ning.async-http-client/.classpath b/com.ning.async-http-client/.classpath index d6a785de..c8a25ac0 100644 --- a/com.ning.async-http-client/.classpath +++ b/com.ning.async-http-client/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="com.ning.async-http-client_1.5.0.jar"/> + <classpathentry exported="true" kind="lib" path="async-http-client-1.6.0.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/com.ning.async-http-client/.gitignore b/com.ning.async-http-client/.gitignore new file mode 100644 index 00000000..ea8c4bf7 --- /dev/null +++ b/com.ning.async-http-client/.gitignore @@ -0,0 +1 @@ +/target diff --git a/com.ning.async-http-client/META-INF/MANIFEST.MF b/com.ning.async-http-client/META-INF/MANIFEST.MF index 71029973..82e60a45 100644 --- a/com.ning.async-http-client/META-INF/MANIFEST.MF +++ b/com.ning.async-http-client/META-INF/MANIFEST.MF @@ -1,11 +1,5 @@ Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: async-http-client -Bundle-SymbolicName: com.ning.async-http-client -Bundle-Version: 1.5.0 -Bundle-ClassPath: com.ning.async-http-client_1.5.0.jar -Bundle-Vendor: Sonatype -Export-Package: com.ning.http.client;version="1.3.4"; +Export-Package: com.ning.http.client;version="1.6.0"; uses:="org.slf4j, com.ning.http.client.filter, com.ning.http.client.providers.jdk, @@ -13,21 +7,22 @@ Export-Package: com.ning.http.client;version="1.3.4"; javax.net.ssl, com.ning.http.util, com.ning.http.client.simple", - com.ning.http.client.consumers;version="1.3.4";uses:="com.ning.http.client", - com.ning.http.client.extra;version="1.3.4"; + com.ning.http.client.consumers;version="1.6.0";uses:="com.ning.http.client", + com.ning.http.client.extra;version="1.6.0"; uses:="com.ning.http.client.resumable, org.slf4j, com.ning.http.client, com.ning.http.client.filter", - com.ning.http.client.filter;version="1.3.4";uses:="com.ning.http.client", - com.ning.http.client.generators;version="1.3.4";uses:="com.ning.http.client,org.slf4j", - com.ning.http.client.listener;version="1.3.4";uses:="com.ning.http.client,org.slf4j", - com.ning.http.client.oauth;version="1.3.4"; + com.ning.http.client.filter;version="1.6.0";uses:="com.ning.http.client", + com.ning.http.client.generators;version="1.6.0";uses:="com.ning.http.client,org.slf4j", + com.ning.http.client.listener;version="1.6.0";uses:="com.ning.http.client,org.slf4j", + com.ning.http.client.ntlm;version="1.6.0";uses:="com.ning.http.util,javax.crypto.spec,javax.crypto", + com.ning.http.client.oauth;version="1.6.0"; uses:="com.ning.http.util, com.ning.http.client, javax.crypto.spec, javax.crypto", - com.ning.http.client.providers.apache;version="1.3.4"; + com.ning.http.client.providers.apache;version="1.6.0"; uses:="org.apache.commons.httpclient.protocol, javax.net, org.apache.commons.httpclient.params, @@ -42,20 +37,21 @@ Export-Package: com.ning.http.client;version="1.3.4"; org.apache.commons.httpclient.methods.multipart, org.apache.commons.httpclient.util, com.ning.http.client.resumable", - com.ning.http.client.providers.jdk;version="1.3.4"; + com.ning.http.client.providers.jdk;version="1.6.0"; uses:="javax.net.ssl, com.ning.http.client, - javax.naming, org.jboss.netty.buffer, + javax.naming, com.ning.http.util, com.ning.http.multipart, org.slf4j, com.ning.http.client.filter", - com.ning.http.client.providers.netty;version="1.3.4"; + com.ning.http.client.providers.netty;version="1.6.0"; uses:="org.jboss.netty.buffer, org.jboss.netty.handler.stream, com.ning.http.client, org.jboss.netty.channel, + org.jboss.netty.channel.group, org.jboss.netty.handler.codec.http, javax.net.ssl, org.jboss.netty.handler.ssl, @@ -63,44 +59,60 @@ Export-Package: com.ning.http.client;version="1.3.4"; com.ning.http.util, com.ning.http.client.filter, com.ning.http.client.listener, - org.jboss.netty.util, - org.jboss.netty.channel.group, org.jboss.netty.channel.socket.oio, + com.ning.http.client.ntlm, + com.ning.http.client.providers.netty.spnego, org.jboss.netty.bootstrap, - org.jboss.netty.handler.timeout, com.ning.http.multipart, org.jboss.netty.channel.socket.nio, org.jboss.netty.channel.socket, - com.ning.http.client.providers.jdk", - com.ning.http.client.resumable;version="1.3.4"; + org.jboss.netty.util", + com.ning.http.client.providers.netty.spnego;version="1.6.0";uses:="com.ning.http.util,org.ietf.jgss,org.slf4j", + com.ning.http.client.resumable;version="1.6.0"; uses:="org.slf4j, com.ning.http.client.listener, com.ning.http.client, com.ning.http.client.filter", - com.ning.http.client.simple;version="1.3.4";uses:="com.ning.http.client", - com.ning.http.client.webdav;version="1.3.4"; + com.ning.http.client.simple;version="1.6.0";uses:="com.ning.http.client", + com.ning.http.client.webdav;version="1.6.0"; uses:="com.ning.http.client, javax.xml.parsers, org.w3c.dom, org.slf4j, org.xml.sax", - com.ning.http.multipart;version="1.3.4";uses:="com.ning.http.client,org.slf4j", - com.ning.http.util;version="1.3.4";uses:="com.ning.http.multipart,com.ning.http.client,javax.net.ssl" -Import-Package: com.ning.http.client;version="1.3", - com.ning.http.client.consumers;version="1.3", - com.ning.http.client.extra;version="1.3", - com.ning.http.client.filter;version="1.3", - com.ning.http.client.generators;version="1.3", - com.ning.http.client.listener;version="1.3", - com.ning.http.client.oauth;version="1.3", - com.ning.http.client.providers.apache;version="1.3", - com.ning.http.client.providers.jdk;version="1.3", - com.ning.http.client.providers.netty;version="1.3", - com.ning.http.client.resumable;version="1.3", - com.ning.http.client.simple;version="1.3", - com.ning.http.client.webdav;version="1.3", - com.ning.http.multipart;version="1.3", - com.ning.http.util;version="1.3", + com.ning.http.multipart;version="1.6.0";uses:="com.ning.http.client,org.slf4j", + com.ning.http.util;version="1.6.0";uses:="com.ning.http.multipart,com.ning.http.client,javax.net.ssl" +Built-By: jfarcand +Tool: Bnd-0.0.357 +Bundle-Name: async-http-client +Created-By: Apache Maven Bundle Plugin +Bundle-Vendor: Sonatype +Build-Jdk: 1.6.0_22 +Bundle-Version: 1.6.0 +Bnd-LastModified: 1297279244304 +Bundle-ManifestVersion: 2 +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.html +Bundle-Description: Async Http Client library purpose is to allow Java + applications to easily execute HTTP requests and asynchronous + ly process the HTTP responses. +Bundle-SymbolicName: com.ning.async-http-client +Import-Package: com.ning.http.client;version="1.6.0", + com.ning.http.client.consumers;version="1.6.0", + com.ning.http.client.extra;version="1.6.0", + com.ning.http.client.filter;version="1.6.0", + com.ning.http.client.generators;version="1.6.0", + com.ning.http.client.listener;version="1.6.0", + com.ning.http.client.ntlm;version="1.6.0", + com.ning.http.client.oauth;version="1.6.0", + com.ning.http.client.providers.apache;version="1.6.0", + com.ning.http.client.providers.jdk;version="1.6.0", + com.ning.http.client.providers.netty;version="1.6.0", + com.ning.http.client.providers.netty.spnego;version="1.6.0", + com.ning.http.client.resumable;version="1.6.0", + com.ning.http.client.simple;version="1.6.0", + com.ning.http.client.webdav;version="1.6.0", + com.ning.http.multipart;version="1.6.0", + com.ning.http.util;version="1.6.0", javax.crypto, javax.crypto.spec, javax.naming, @@ -114,25 +126,21 @@ Import-Package: com.ning.http.client;version="1.3", org.apache.commons.httpclient.params;resolution:=optional, org.apache.commons.httpclient.protocol;resolution:=optional, org.apache.commons.httpclient.util;resolution:=optional, - org.jboss.netty.bootstrap;version="3.2.0";resolution:=optional, - org.jboss.netty.buffer;version="3.2.0";resolution:=optional, - org.jboss.netty.channel;version="3.2.0";resolution:=optional, - org.jboss.netty.channel.group;version="3.2.0";resolution:=optional, - org.jboss.netty.channel.socket;version="3.2.0";resolution:=optional, - org.jboss.netty.channel.socket.nio;version="3.2.0";resolution:=optional, - org.jboss.netty.channel.socket.oio;version="3.2.0";resolution:=optional, - org.jboss.netty.handler.codec.http;version="3.2.0";resolution:=optional, - org.jboss.netty.handler.ssl;version="3.2.0";resolution:=optional, - org.jboss.netty.handler.stream;version="3.2.0";resolution:=optional, - org.jboss.netty.handler.timeout;version="3.2.0";resolution:=optional, - org.jboss.netty.util;version="3.2.0";resolution:=optional, - org.slf4j;version="1.6.1", + org.ietf.jgss, + org.jboss.netty.bootstrap;version="3.2";resolution:=optional, + org.jboss.netty.buffer;version="3.2";resolution:=optional, + org.jboss.netty.channel;version="3.2";resolution:=optional, + org.jboss.netty.channel.group;version="3.2";resolution:=optional, + org.jboss.netty.channel.socket;version="3.2";resolution:=optional, + org.jboss.netty.channel.socket.nio;version="3.2";resolution:=optional, + org.jboss.netty.channel.socket.oio;version="3.2";resolution:=optional, + org.jboss.netty.handler.codec.http;version="3.2";resolution:=optional, + org.jboss.netty.handler.ssl;version="3.2";resolution:=optional, + org.jboss.netty.handler.stream;version="3.2";resolution:=optional, + org.jboss.netty.util;version="3.2";resolution:=optional, + org.slf4j;version="1.5.0", org.w3c.dom, org.xml.sax -Created-By: Apache Maven Bundle Plugin -Tool: Bnd-0.0.357 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.html -Bnd-LastModified: 1296502336731 -Build-Jdk: 1.6.0_22 -Bundle-Description: Async Http Client library purpose is to allow Java applications to easily execute HTTP requests and asynchronously process the HTTP responses. -Built-By: jfarcand +Bundle-ClassPath: async-http-client-1.6.0.jar +Bundle-RequiredExecutionEnvironment: J2SE-1.5, + JavaSE-1.6 diff --git a/com.ning.async-http-client/async-http-client-1.6.0.jar b/com.ning.async-http-client/async-http-client-1.6.0.jar Binary files differnew file mode 100644 index 00000000..115838e9 --- /dev/null +++ b/com.ning.async-http-client/async-http-client-1.6.0.jar diff --git a/com.ning.async-http-client/build.properties b/com.ning.async-http-client/build.properties new file mode 100644 index 00000000..4a9758c1 --- /dev/null +++ b/com.ning.async-http-client/build.properties @@ -0,0 +1,13 @@ +# +# Copyright (c) 2008-2010 Sonatype, Inc. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Sonatype, Inc. - initial API and implementation +# + +bin.includes = META-INF/,\ + async-http-client-1.6.0.jar diff --git a/com.ning.async-http-client/com.ning.async-http-client_1.5.0.jar b/com.ning.async-http-client/com.ning.async-http-client_1.5.0.jar Binary files differdeleted file mode 100644 index b4aa1a00..00000000 --- a/com.ning.async-http-client/com.ning.async-http-client_1.5.0.jar +++ /dev/null diff --git a/com.ning.async-http-client/pom.xml b/com.ning.async-http-client/pom.xml new file mode 100644 index 00000000..a2c49050 --- /dev/null +++ b/com.ning.async-http-client/pom.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010 Sonatype, Inc. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.m2e</groupId> + <artifactId>org.eclipse.m2e.parent</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../org.eclipse.m2e.parent</relativePath> + </parent> + + <artifactId>com.ning.async-http-client</artifactId> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/org.eclipse.m2e.cliresolver30/.settings/org.eclipse.core.resources.prefs b/org.eclipse.m2e.cliresolver30/.settings/org.eclipse.core.resources.prefs index ebb4c995..04f7eab0 100644 --- a/org.eclipse.m2e.cliresolver30/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.m2e.cliresolver30/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Tue Feb 08 10:29:24 EST 2011 +#Thu Feb 10 12:53:24 EST 2011 eclipse.preferences.version=1 -encoding//target/classes/META-INF/plexus/components.xml=UTF-8 +encoding//target/classes/META-INF/plexus/components.xml=UTF-9 diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index 1ec1749e..10a56c81 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.m2e.model.edit;bundle-version="[0.13.0,0.14.0)", com.ibm.icu;bundle-version="4.0.1", org.slf4j.api;bundle-version="1.5.11", - com.ning.async-http-client;bundle-version="1.5.0", + com.ning.async-http-client;bundle-version="1.4.1", org.jboss.netty;bundle-version="3.2.3" Eclipse-LazyStart: true Bundle-ClassPath: . diff --git a/org.eclipse.m2e.maven.runtime/.classpath b/org.eclipse.m2e.maven.runtime/.classpath index 464fd685..1416a595 100644 --- a/org.eclipse.m2e.maven.runtime/.classpath +++ b/org.eclipse.m2e.maven.runtime/.classpath @@ -37,13 +37,13 @@ <classpathentry exported="true" kind="lib" path="jars/plexus-utils-2.0.6.jar"/> <classpathentry exported="true" kind="lib" path="jars/sisu-guice-2.9.4-no_aop.jar"/> <classpathentry exported="true" kind="lib" path="jars/plexus-build-api-0.0.7-SNAPSHOT.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-connector-wagon-1.10.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-api-1.10.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-spi-1.10.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-util-1.10.jar"/> + <classpathentry exported="true" kind="lib" path="jars/aether-connector-wagon-1.10.1.jar"/> + <classpathentry exported="true" kind="lib" path="jars/aether-api-1.10.1.jar"/> + <classpathentry exported="true" kind="lib" path="jars/aether-spi-1.10.1.jar"/> + <classpathentry exported="true" kind="lib" path="jars/aether-util-1.10.1.jar"/> <classpathentry exported="true" kind="lib" path="jars/wagon-provider-api-1.0-beta-6.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-impl-1.10.jar"/> - <classpathentry exported="true" kind="lib" path="jars/aether-connector-asynchttpclient-1.10.jar"/> + <classpathentry exported="true" kind="lib" path="jars/aether-impl-1.10.1.jar"/> + <classpathentry exported="true" kind="lib" path="jars/aether-connector-asynchttpclient-1.10.1.jar"/> <classpathentry exported="true" kind="lib" path="jars/wagon-ahc-1.1.0.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF index b78fe8dd..f6f802e0 100644 --- a/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF @@ -64,8 +64,8 @@ Export-Package: org.codehaus.plexus.component.factory,org.sonatype.aet .personality.plexus.lifecycle.phase,org.codehaus.plexus.component.con figurator.converters.lookup,org.apache.maven.plugin.version,org.apach e.maven.artifact.deployer,org.sonatype.aether.spi.log,org.apache.mave - n.settings.io,org.apache.maven.profiles.activation,org.apache.maven.s - ettings.io.xpp3,META-INF.plexus,org.codehaus.plexus.interpolation.uti + n.settings.io,org.apache.maven.profiles.activation,META-INF.plexus,or + g.apache.maven.settings.io.xpp3,org.codehaus.plexus.interpolation.uti l,org.apache.maven.project.validation,org.apache.maven.artifact.handl er,org.apache.maven.model.interpolation,org.sonatype.aether.util.grap h.manager,org.apache.maven.wagon.authentication,org.apache.maven.sett @@ -132,18 +132,18 @@ Bundle-ClassPath: local-patches.jar, jars/plexus-utils-2.0.6.jar, jars/sisu-guice-2.9.4-no_aop.jar, jars/plexus-build-api-0.0.7-SNAPSHOT.jar, - jars/aether-connector-wagon-1.10.jar, - jars/aether-api-1.10.jar, - jars/aether-spi-1.10.jar, - jars/aether-util-1.10.jar, + jars/aether-connector-wagon-1.10.1.jar, + jars/aether-api-1.10.1.jar, + jars/aether-spi-1.10.1.jar, + jars/aether-util-1.10.1.jar, jars/wagon-provider-api-1.0-beta-6.jar, - jars/aether-impl-1.10.jar, - jars/aether-connector-asynchttpclient-1.10.jar, + jars/aether-impl-1.10.1.jar, + jars/aether-connector-asynchttpclient-1.10.1.jar, jars/wagon-ahc-1.1.0.jar Bundle-Version: 0.13.0.qualifier Bundle-Name: Embedded Maven Runtime Bundle Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.maven.runtime;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 -Require-Bundle: com.ning.async-http-client;bundle-version="1.4.1" +Require-Bundle: com.ning.async-http-client;bundle-version="1.6.0" diff --git a/org.eclipse.m2e.maven.runtime/build.properties b/org.eclipse.m2e.maven.runtime/build.properties index f1df8928..451f3237 100644 --- a/org.eclipse.m2e.maven.runtime/build.properties +++ b/org.eclipse.m2e.maven.runtime/build.properties @@ -16,3 +16,4 @@ jars.compile.order = local-patches.jar source.local-patches.jar = src/main/java/ output.local-patches.jar = target/classes source.local-patches.jar = src/maven-3.0.3/ + diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.1.jar Binary files differindex 7ed415f8..02444da0 100644 --- a/org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.jar +++ b/org.eclipse.m2e.maven.runtime/jars/aether-api-1.10.1.jar diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.1.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.1.jar Binary files differnew file mode 100644 index 00000000..4347c315 --- /dev/null +++ b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.1.jar diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.jar Binary files differdeleted file mode 100644 index 878df1d0..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-asynchttpclient-1.10.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.1.jar Binary files differindex fd835337..a4711c75 100644 --- a/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.jar +++ b/org.eclipse.m2e.maven.runtime/jars/aether-connector-wagon-1.10.1.jar diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.1.jar Binary files differindex b5a3f0f4..5c7e82cc 100644 --- a/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.jar +++ b/org.eclipse.m2e.maven.runtime/jars/aether-impl-1.10.1.jar diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.1.jar b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.1.jar Binary files differnew file mode 100644 index 00000000..de63708d --- /dev/null +++ b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.1.jar diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.jar Binary files differdeleted file mode 100644 index af13c0de..00000000 --- a/org.eclipse.m2e.maven.runtime/jars/aether-spi-1.10.jar +++ /dev/null diff --git a/org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.jar b/org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.1.jar Binary files differindex 1ecd1457..44c0fc34 100644 --- a/org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.jar +++ b/org.eclipse.m2e.maven.runtime/jars/aether-util-1.10.1.jar diff --git a/org.eclipse.m2e.maven.runtime/update-jars-pom.xml b/org.eclipse.m2e.maven.runtime/update-jars-pom.xml index e82aee30..2fc38f99 100644 --- a/org.eclipse.m2e.maven.runtime/update-jars-pom.xml +++ b/org.eclipse.m2e.maven.runtime/update-jars-pom.xml @@ -15,6 +15,8 @@ * update <maven.version/> and related properties * run the command below from CLI + * add ``local-patches.jar'' (without quotes) at the beginning of Bundle-ClassPath manifest attribute + * add ``Require-Bundle: com.ning.async-http-client;bundle-version="1.6.0"'' (without quotes) to the manifest * right-click on the project in Eclipse, PDE->Update Classpath * project->clean...->all @@ -28,7 +30,7 @@ <!-- the following MUST match <maven.version/> above. I wish I could make scope=import do this for me --> <sisu.version>2.0.0</sisu.version> <classworlds.version>2.4</classworlds.version> - <aether.version>1.10</aether.version> + <aether.version>1.10.1</aether.version> <sisu-guice.version>2.9.4</sisu-guice.version> <!-- below are m2e-specific addons --> diff --git a/org.eclipse.m2e.parent/pom.xml b/org.eclipse.m2e.parent/pom.xml index 60841363..ab6fd829 100644 --- a/org.eclipse.m2e.parent/pom.xml +++ b/org.eclipse.m2e.parent/pom.xml @@ -73,21 +73,23 @@ <url>https://ci.sonatype.org/job/m2eclipse-with-e33/</url> </ciManagement> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>RSO-public-group</id> - <url>http://repository.sonatype.org/content/groups/sonatype-public-grid</url> - </repository> - </repositories> + <repositories> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + <id>RSO-public-group</id> + <url>http://repository.sonatype.org/content/groups/sonatype-public-grid</url> + </repository> + </repositories> <modules> <module>../org.eclipse.m2e.maven.runtime</module> + <module>../org.jboss.netty</module> + <module>../com.ning.async-http-client</module> <module>../org.eclipse.m2e.archetype.common</module> <module>../org.eclipse.m2e.maven.indexer</module> <module>../org.eclipse.m2e.model.edit</module> @@ -123,19 +125,6 @@ <module>../target-platform</module> </modules> - - <dependencies> - <dependency> - <groupId>com.ning</groupId> - <artifactId>async-http-client</artifactId> - <version>1.5.0</version> - </dependency> - <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - <version>3.2.3.Final</version> - </dependency> - </dependencies> <dependencyManagement> <dependencies> diff --git a/org.jboss.netty/.classpath b/org.jboss.netty/.classpath index 9847ab78..1056dd81 100644 --- a/org.jboss.netty/.classpath +++ b/org.jboss.netty/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="org.jboss.netty_3.2.3.Final.jar"/> + <classpathentry exported="true" kind="lib" path="netty-3.2.4.Final.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.jboss.netty/.gitignore b/org.jboss.netty/.gitignore new file mode 100644 index 00000000..ea8c4bf7 --- /dev/null +++ b/org.jboss.netty/.gitignore @@ -0,0 +1 @@ +/target diff --git a/org.jboss.netty/META-INF/MANIFEST.MF b/org.jboss.netty/META-INF/MANIFEST.MF index 47a5e0ac..eee3833e 100644 --- a/org.jboss.netty/META-INF/MANIFEST.MF +++ b/org.jboss.netty/META-INF/MANIFEST.MF @@ -1,18 +1,11 @@ Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: The Netty Project -Bundle-SymbolicName: org.jboss.netty -Bundle-Version: 3.2.3.Final -Bundle-ClassPath: org.jboss.netty_3.2.3.Final.jar -Bundle-Activator: org.jboss.netty.container.osgi.NettyBundleActivator -Bundle-Vendor: JBoss -Export-Package: org.jboss.netty.bootstrap;version="3.2.3.Final";uses:="org.jboss.netty.channel,org.jboss.netty.util", - org.jboss.netty.buffer;version="3.2.3.Final";uses:="org.jboss.netty.util", - org.jboss.netty.channel;version="3.2.3.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.util,org.jboss.netty.logging", - org.jboss.netty.channel.group;version="3.2.3.Final";uses:="org.jboss.netty.channel,org.jboss.netty.buffer,org.jboss.netty.logging", - org.jboss.netty.channel.local;version="3.2.3.Final";uses:="org.jboss.netty.channel,org.jboss.netty.logging", - org.jboss.netty.channel.socket;version="3.2.3.Final";uses:="org.jboss.netty.channel", - org.jboss.netty.channel.socket.http;version="3.2.3.Final"; +Export-Package: org.jboss.netty.bootstrap;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.util", + org.jboss.netty.buffer;version="3.2.4.Final";uses:="org.jboss.netty.util", + org.jboss.netty.channel;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.util,org.jboss.netty.logging", + org.jboss.netty.channel.group;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.buffer,org.jboss.netty.logging", + org.jboss.netty.channel.local;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.logging", + org.jboss.netty.channel.socket;version="3.2.4.Final";uses:="org.jboss.netty.channel", + org.jboss.netty.channel.socket.http;version="3.2.4.Final"; uses:="org.jboss.netty.channel, org.jboss.netty.channel.socket, org.jboss.netty.handler.codec.http, @@ -23,30 +16,30 @@ Export-Package: org.jboss.netty.bootstrap;version="3.2.3.Final";uses:="org.jboss javax.servlet, org.jboss.netty.channel.local, javax.servlet.http", - org.jboss.netty.channel.socket.nio;version="3.2.3.Final"; + org.jboss.netty.channel.socket.nio;version="3.2.4.Final"; uses:="org.jboss.netty.logging, org.jboss.netty.channel.socket, org.jboss.netty.channel, org.jboss.netty.util, org.jboss.netty.buffer", - org.jboss.netty.channel.socket.oio;version="3.2.3.Final"; + org.jboss.netty.channel.socket.oio;version="3.2.4.Final"; uses:="org.jboss.netty.channel, org.jboss.netty.channel.socket, org.jboss.netty.util, org.jboss.netty.buffer, org.jboss.netty.logging", - org.jboss.netty.container.microcontainer;version="3.2.3.Final";uses:="org.jboss.netty.logging", - org.jboss.netty.container.osgi;version="3.2.3.Final";uses:="org.jboss.netty.logging,org.osgi.framework", - org.jboss.netty.container.spring;version="3.2.3.Final";uses:="org.jboss.netty.logging", - org.jboss.netty.handler.codec.base64;version="3.2.3.Final"; + org.jboss.netty.container.microcontainer;version="3.2.4.Final";uses:="org.jboss.netty.logging", + org.jboss.netty.container.osgi;version="3.2.4.Final";uses:="org.jboss.netty.logging,org.osgi.framework", + org.jboss.netty.container.spring;version="3.2.4.Final";uses:="org.jboss.netty.logging", + org.jboss.netty.handler.codec.base64;version="3.2.4.Final"; uses:="org.jboss.netty.buffer, org.jboss.netty.channel, org.jboss.netty.handler.codec.oneone, org.jboss.netty.util", - org.jboss.netty.handler.codec.compression;version="3.2.3.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.codec.embedder;version="3.2.3.Final";uses:="org.jboss.netty.channel,org.jboss.netty.buffer", - org.jboss.netty.handler.codec.frame;version="3.2.3.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.codec.http;version="3.2.3.Final"; + org.jboss.netty.handler.codec.compression;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.handler.codec.oneone", + org.jboss.netty.handler.codec.embedder;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.buffer", + org.jboss.netty.handler.codec.frame;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.handler.codec.oneone", + org.jboss.netty.handler.codec.http;version="3.2.4.Final"; uses:="org.jboss.netty.buffer, org.jboss.netty.handler.codec.frame, org.jboss.netty.channel, @@ -55,45 +48,45 @@ Export-Package: org.jboss.netty.bootstrap;version="3.2.3.Final";uses:="org.jboss org.jboss.netty.handler.codec.embedder, org.jboss.netty.handler.codec.replay, org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.codec.http.websocket;version="3.2.3.Final"; + org.jboss.netty.handler.codec.http.websocket;version="3.2.4.Final"; uses:="org.jboss.netty.buffer, org.jboss.netty.util, org.jboss.netty.handler.codec.replay, org.jboss.netty.handler.codec.frame, org.jboss.netty.channel, org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.codec.oneone;version="3.2.3.Final";uses:="org.jboss.netty.channel", - org.jboss.netty.handler.codec.protobuf;version="3.2.3.Final"; + org.jboss.netty.handler.codec.oneone;version="3.2.4.Final";uses:="org.jboss.netty.channel", + org.jboss.netty.handler.codec.protobuf;version="3.2.4.Final"; uses:="org.jboss.netty.buffer, org.jboss.netty.channel, org.jboss.netty.handler.codec.oneone, com.google.protobuf, org.jboss.netty.handler.codec.frame", - org.jboss.netty.handler.codec.replay;version="3.2.3.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel", - org.jboss.netty.handler.codec.rtsp;version="3.2.3.Final"; + org.jboss.netty.handler.codec.replay;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel", + org.jboss.netty.handler.codec.rtsp;version="3.2.4.Final"; uses:="org.jboss.netty.buffer, org.jboss.netty.channel, org.jboss.netty.handler.codec.http, org.jboss.netty.handler.codec.embedder", - org.jboss.netty.handler.codec.serialization;version="3.2.3.Final"; + org.jboss.netty.handler.codec.serialization;version="3.2.4.Final"; uses:="org.jboss.netty.buffer, org.jboss.netty.handler.codec.replay, org.jboss.netty.channel, org.jboss.netty.handler.codec.oneone, org.jboss.netty.handler.codec.frame", - org.jboss.netty.handler.codec.string;version="3.2.3.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.handler.codec.oneone", - org.jboss.netty.handler.execution;version="3.2.3.Final";uses:="org.jboss.netty.channel,org.jboss.netty.util,org.jboss.netty.logging", - org.jboss.netty.handler.logging;version="3.2.3.Final";uses:="org.jboss.netty.logging,org.jboss.netty.buffer,org.jboss.netty.channel", - org.jboss.netty.handler.queue;version="3.2.3.Final";uses:="org.jboss.netty.channel,org.jboss.netty.buffer", - org.jboss.netty.handler.ssl;version="3.2.3.Final"; + org.jboss.netty.handler.codec.string;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.handler.codec.oneone", + org.jboss.netty.handler.execution;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.util,org.jboss.netty.logging", + org.jboss.netty.handler.logging;version="3.2.4.Final";uses:="org.jboss.netty.logging,org.jboss.netty.buffer,org.jboss.netty.channel", + org.jboss.netty.handler.queue;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.buffer", + org.jboss.netty.handler.ssl;version="3.2.4.Final"; uses:="org.jboss.netty.channel, javax.net.ssl, org.jboss.netty.logging, org.jboss.netty.buffer, org.jboss.netty.handler.codec.frame", - org.jboss.netty.handler.stream;version="3.2.3.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.logging", - org.jboss.netty.handler.timeout;version="3.2.3.Final";uses:="org.jboss.netty.channel,org.jboss.netty.util", - org.jboss.netty.logging;version="3.2.3.Final"; + org.jboss.netty.handler.stream;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.logging", + org.jboss.netty.handler.timeout;version="3.2.4.Final";uses:="org.jboss.netty.channel,org.jboss.netty.util", + org.jboss.netty.logging;version="3.2.4.Final"; uses:="org.apache.commons.logging, org.jboss.logging, org.apache.log4j, @@ -101,8 +94,30 @@ Export-Package: org.jboss.netty.bootstrap;version="3.2.3.Final";uses:="org.jboss org.osgi.util.tracker, org.osgi.framework, org.slf4j", - org.jboss.netty.util;version="3.2.3.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.logging" -SCM-Revision: 2379 + org.jboss.netty.util;version="3.2.4.Final";uses:="org.jboss.netty.buffer,org.jboss.netty.channel,org.jboss.netty.logging" +Built-By: trustin +Tool: Bnd-1.15.0 +Bundle-Name: The Netty Project +Created-By: Apache Maven Bundle Plugin +Bundle-BuddyPolicy: registered +Bundle-Vendor: JBoss +Build-Jdk: 1.6.0_23 +Bundle-Version: 3.2.4.Final +Eclipse-BuddyPolicy: registered +Bnd-LastModified: 1297082336492 +Bundle-ManifestVersion: 2 +Bundle-Activator: org.jboss.netty.container.osgi.NettyBundleActivator +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0 +Bundle-Description: The Netty project is an effort to provide an async + hronous event-driven network application framework and tools for r + apid development of maintainable high performance and high scalabi + lity protocol servers and clients. In other words, Netty is a NIO + client server framework which enables quick and easy development + of network applications such as protocol servers and clients. It g + reatly simplifies and streamlines network programming such as TCP + and UDP socket server. +Bundle-DocURL: http://www.jboss.org/netty/ +Bundle-SymbolicName: org.jboss.netty Import-Package: com.google.protobuf;resolution:=optional, javax.net.ssl;resolution:=optional, javax.servlet;resolution:=optional, @@ -110,47 +125,21 @@ Import-Package: com.google.protobuf;resolution:=optional, org.apache.commons.logging;resolution:=optional, org.apache.log4j;resolution:=optional, org.jboss.logging;resolution:=optional, - org.jboss.netty.bootstrap;version="3.2";resolution:=optional, - org.jboss.netty.buffer;version="3.2";resolution:=optional, - org.jboss.netty.channel;version="3.2";resolution:=optional, - org.jboss.netty.channel.group;version="3.2";resolution:=optional, - org.jboss.netty.channel.local;version="3.2";resolution:=optional, - org.jboss.netty.channel.socket;version="3.2";resolution:=optional, - org.jboss.netty.channel.socket.http;version="3.2";resolution:=optional, - org.jboss.netty.channel.socket.nio;version="3.2";resolution:=optional, - org.jboss.netty.channel.socket.oio;version="3.2";resolution:=optional, - org.jboss.netty.container.microcontainer;version="3.2";resolution:=optional, - org.jboss.netty.container.osgi;version="3.2";resolution:=optional, - org.jboss.netty.container.spring;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.base64;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.compression;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.embedder;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.frame;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.http;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.http.websocket;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.oneone;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.protobuf;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.replay;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.rtsp;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.serialization;version="3.2";resolution:=optional, - org.jboss.netty.handler.codec.string;version="3.2";resolution:=optional, - org.jboss.netty.handler.execution;version="3.2";resolution:=optional, - org.jboss.netty.handler.logging;version="3.2";resolution:=optional, - org.jboss.netty.handler.queue;version="3.2";resolution:=optional, - org.jboss.netty.handler.ssl;version="3.2";resolution:=optional, - org.jboss.netty.handler.stream;version="3.2";resolution:=optional, - org.jboss.netty.handler.timeout;version="3.2";resolution:=optional, - org.jboss.netty.logging;version="3.2";resolution:=optional, - org.jboss.netty.util;version="3.2";resolution:=optional, - org.osgi.framework;version="1.5";resolution:=optional, - org.osgi.service.log;version="1.3";resolution:=optional, - org.osgi.util.tracker;version="1.4";resolution:=optional, - org.slf4j;version="1.5";resolution:=optional -Build-Jdk: 1.6.0_22 -Bnd-LastModified: 1287994281632 -Created-By: Apache Maven Bundle Plugin -Bundle-DocURL: http://www.jboss.org/netty/ -Bundle-Description: The Netty project is an effort to provide an asynchronous event-driven network application framework and tools for rapid development of maintainable high performance and high scalability protocol servers and clients. In other words, Netty is a NIO client server framework which enables quick and easy development of network applications such as protocol servers and clients. It greatly simplifies and streamlines network programming such as TCP and UDP socket server. -Tool: Bnd-0.0.357 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0 -Built-By: trustin + org.jboss.netty.bootstrap;version="[3.2,4)";resolution:=optional, + org.jboss.netty.buffer;version="[3.2,4)";resolution:=optional, + org.jboss.netty.handler.codec.frame;version="[3.2,4)";resolution:=optional, + org.jboss.netty.handler.codec.http.websocket;version="[3.2,4)";resolution:=optional, + org.jboss.netty.handler.codec.oneone;version="[3.2,4)";resolution:=optional, + org.jboss.netty.handler.codec.protobuf;version="[3.2,4)";resolution:=optional, + org.jboss.netty.handler.codec.serialization;version="[3.2,4)";resolution:=optional, + org.jboss.netty.handler.codec.string;version="[3.2,4)";resolution:=optional, + org.jboss.netty.handler.logging;version="[3.2,4)";resolution:=optional, + org.jboss.netty.handler.timeout;version="[3.2,4)";resolution:=optional, + org.osgi.framework;version="[1.5,2)";resolution:=optional, + org.osgi.service.log;version="[1.3,2)";resolution:=optional, + org.osgi.util.tracker;version="[1.4,2)";resolution:=optional, + org.slf4j;version="[1.5.0,2.0.0)";resolution:=optional +Main-Class: org.jboss.netty.util.Version +Bundle-ClassPath: netty-3.2.4.Final.jar +Bundle-RequiredExecutionEnvironment: J2SE-1.5, + JavaSE-1.6 diff --git a/org.jboss.netty/build.properties b/org.jboss.netty/build.properties new file mode 100644 index 00000000..9ed25ffd --- /dev/null +++ b/org.jboss.netty/build.properties @@ -0,0 +1,13 @@ +# +# Copyright (c) 2008-2010 Sonatype, Inc. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Sonatype, Inc. - initial API and implementation +# + +bin.includes = META-INF/,\ + netty-3.2.4.Final.jar diff --git a/org.jboss.netty/org.jboss.netty_3.2.3.Final.jar b/org.jboss.netty/netty-3.2.4.Final.jar Binary files differindex 7672fcd8..391ba870 100644 --- a/org.jboss.netty/org.jboss.netty_3.2.3.Final.jar +++ b/org.jboss.netty/netty-3.2.4.Final.jar diff --git a/org.jboss.netty/pom.xml b/org.jboss.netty/pom.xml new file mode 100644 index 00000000..f82d3597 --- /dev/null +++ b/org.jboss.netty/pom.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010 Sonatype, Inc. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.m2e</groupId> + <artifactId>org.eclipse.m2e.parent</artifactId> + <version>0.13.0-SNAPSHOT</version> + <relativePath>../org.eclipse.m2e.parent</relativePath> + </parent> + + <artifactId>org.jboss.netty</artifactId> + <packaging>eclipse-plugin</packaging> + +</project> |