andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prepared merge with upstream

Browse Source
This commit is contained in:
Jestan Nirojan 2011-12-08 00:27:23 +05:30
parent f62bb850ec
commit 0a99e8bb57
3 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pom.xml
View File

@ -54,20 +54,6 @@
<developerConnection>scm:git:ssh://git@github.com/netty/netty.git</developerConnection> <developerConnection>scm:git:ssh://git@github.com/netty/netty.git</developerConnection>
</scm> </scm>
<repositories>
<repository>
<id>JBoss-Public</id>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>JBoss-Public</id>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
</pluginRepository>
</pluginRepositories>
<dependencies> <dependencies>
<!-- Google Protocol Buffers - completely optional --> <!-- Google Protocol Buffers - completely optional -->
<dependency> <dependency>
@ -586,25 +572,7 @@
<addVersionToProjectName>true</addVersionToProjectName> <addVersionToProjectName>true</addVersionToProjectName>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
</plugin>
</plugins> </plugins>
</build> </build>
<distributionManagement>
<repository>
<id>archiva.internal</id>
<name>Internal Release Repository</name>
<url>http://192.168.0.7:8080/archiva/repository/internal/</url>
</repository>
<snapshotRepository>
<id>archiva.snapshots</id>
<name>Internal Snapshot Repository</name>
<url>http://192.168.0.7:8080/archiva/repository/snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project> </project>

1
src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
View File

@ -18,7 +18,6 @@ package org.jboss.netty.handler.execution;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;

2
src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java
View File

@ -71,4 +71,4 @@ public class ConversionUtilTest {
assertFalse(ConversionUtil.toBoolean("FALSE")); assertFalse(ConversionUtil.toBoolean("FALSE"));
assertFalse(ConversionUtil.toBoolean("0")); assertFalse(ConversionUtil.toBoolean("0"));
} }
} }