Nabble - Netty Commit Logs

r668 - trunk/src/main/java/org/jboss/netty/container/guice.

2009-01-08T05:38:45Z

Author: trustin
Date: 2009-01-08 08:38:45 -0500 (Thu, 08 Jan 2009)
New Revision: 668

Modified:
trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java
Log:
ChannelFactoryResource annotation is documented to help a user figure out how it is used

Modified: trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java 2009-01-08 13:18:49 UTC (rev 667)
+++ trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java 2009-01-08 13:38:45 UTC (rev 668)
@@ -22,6 +22,7 @@
*/
package org.jboss.netty.container.guice;

+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -37,6 +38,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.PARAMETER})
@BindingAnnotation
+@Documented
public @interface ChannelFactoryResource {
// No value required
}

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r667 - trunk/src/main/java/org/jboss/netty/container/guice.

2009-01-08T05:18:49Z

Author: trustin
Date: 2009-01-08 08:18:49 -0500 (Thu, 08 Jan 2009)
New Revision: 667

Added:
trunk/src/main/java/org/jboss/netty/container/guice/AbstractChannelFactoryProvider.java
trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryModule.java
trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java
trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResources.java
trunk/src/main/java/org/jboss/netty/container/guice/DefaultChannelFactoryResource.java
trunk/src/main/java/org/jboss/netty/container/guice/ExecutorModule.java
trunk/src/main/java/org/jboss/netty/container/guice/NioClientSocketChannelFactoryProvider.java
trunk/src/main/java/org/jboss/netty/container/guice/NioServerSocketChannelFactoryProvider.java
trunk/src/main/java/org/jboss/netty/container/guice/OioClientSocketChannelFactoryProvider.java
trunk/src/main/java/org/jboss/netty/container/guice/OioServerSocketChannelFactoryProvider.java
Log:
Finished Google Guice integration

Added: trunk/src/main/java/org/jboss/netty/container/guice/AbstractChannelFactoryProvider.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/AbstractChannelFactoryProvider.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/AbstractChannelFactoryProvider.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.ChannelFactory;
+
+import com.google.inject.Provider;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public abstract class AbstractChannelFactoryProvider<T extends ChannelFactory> implements Provider<T> {
+
+ protected final Executor executor;
+
+ protected AbstractChannelFactoryProvider(Executor executor) {
+ if (executor == null) {
+ throw new NullPointerException("executor");
+ }
+ this.executor = executor;
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/AbstractChannelFactoryProvider.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryModule.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryModule.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryModule.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public class ChannelFactoryModule extends AbstractModule {
+
+ @Override
+ protected void configure() {
+ bind(ClientSocketChannelFactory.class).
+ toProvider(NioClientSocketChannelFactoryProvider.class).
+ in(Scopes.SINGLETON);
+
+ bind(ServerSocketChannelFactory.class).
+ toProvider(NioServerSocketChannelFactoryProvider.class).
+ in(Scopes.SINGLETON);
+
+ bind(NioClientSocketChannelFactory.class).
+ toProvider(NioClientSocketChannelFactoryProvider.class).
+ in(Scopes.SINGLETON);
+
+ bind(NioServerSocketChannelFactory.class).
+ toProvider(NioServerSocketChannelFactoryProvider.class).
+ in(Scopes.SINGLETON);
+
+ bind(OioClientSocketChannelFactory.class).
+ toProvider(OioClientSocketChannelFactoryProvider.class).
+ in(Scopes.SINGLETON);
+
+ bind(OioServerSocketChannelFactory.class).
+ toProvider(OioServerSocketChannelFactoryProvider.class).
+ in(Scopes.SINGLETON);
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryModule.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.google.inject.BindingAnnotation;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.PARAMETER})
+@BindingAnnotation
+public @interface ChannelFactoryResource {
+ // No value required
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResource.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResources.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResources.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResources.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public class ChannelFactoryResources {
+
+ private static final ChannelFactoryResource INSTANCE =
+ new DefaultChannelFactoryResource();
+
+ public static ChannelFactoryResource getInstance() {
+ return INSTANCE;
+ }
+
+ private ChannelFactoryResources() {
+ super();
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/ChannelFactoryResources.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/container/guice/DefaultChannelFactoryResource.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/DefaultChannelFactoryResource.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/DefaultChannelFactoryResource.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+@SuppressWarnings("all")
+class DefaultChannelFactoryResource implements ChannelFactoryResource {
+
+ DefaultChannelFactoryResource() {
+ super();
+ }
+
+ @Override
+ public int hashCode() {
+ return 0; // Must be 0 for the annotation with no property
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof ChannelFactoryResource;
+ }
+
+ @Override
+ public String toString() {
+ return "@" + ChannelFactoryResource.class.getName();
+ }
+
+ public Class<? extends Annotation> annotationType() {
+ return ChannelFactoryResource.class;
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/DefaultChannelFactoryResource.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/container/guice/ExecutorModule.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/ExecutorModule.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/ExecutorModule.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.util.ExecutorShutdownUtil;
+
+import com.google.inject.AbstractModule;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public class ExecutorModule extends AbstractModule {
+
+ private final Executor executor;
+
+ public ExecutorModule(Executor executor) {
+ if (executor == null) {
+ throw new NullPointerException("executor");
+ }
+ this.executor = executor;
+ }
+
+ public void terminateExecutor() {
+ ExecutorShutdownUtil.shutdown(executor);
+ }
+
+ @Override
+ protected void configure() {
+ bind(Executor.class).
+ annotatedWith(ChannelFactoryResources.getInstance()).
+ toInstance(executor);
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/ExecutorModule.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/container/guice/NioClientSocketChannelFactoryProvider.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/NioClientSocketChannelFactoryProvider.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/NioClientSocketChannelFactoryProvider.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+
+import com.google.inject.Inject;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public class NioClientSocketChannelFactoryProvider extends
+ AbstractChannelFactoryProvider<NioClientSocketChannelFactory> {
+
+ @Inject
+ public NioClientSocketChannelFactoryProvider(@ChannelFactoryResource Executor executor) {
+ super(executor);
+ }
+
+ public NioClientSocketChannelFactory get() {
+ return new NioClientSocketChannelFactory(executor, executor);
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/NioClientSocketChannelFactoryProvider.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/container/guice/NioServerSocketChannelFactoryProvider.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/NioServerSocketChannelFactoryProvider.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/NioServerSocketChannelFactoryProvider.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+
+import com.google.inject.Inject;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public class NioServerSocketChannelFactoryProvider extends
+ AbstractChannelFactoryProvider<NioServerSocketChannelFactory> {
+
+ @Inject
+ public NioServerSocketChannelFactoryProvider(@ChannelFactoryResource Executor executor) {
+ super(executor);
+ }
+
+ public NioServerSocketChannelFactory get() {
+ return new NioServerSocketChannelFactory(executor, executor);
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/NioServerSocketChannelFactoryProvider.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/container/guice/OioClientSocketChannelFactoryProvider.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/OioClientSocketChannelFactoryProvider.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/OioClientSocketChannelFactoryProvider.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+
+import com.google.inject.Inject;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public class OioClientSocketChannelFactoryProvider extends
+ AbstractChannelFactoryProvider<OioClientSocketChannelFactory> {
+
+ @Inject
+ public OioClientSocketChannelFactoryProvider(@ChannelFactoryResource Executor executor) {
+ super(executor);
+ }
+
+ public OioClientSocketChannelFactory get() {
+ return new OioClientSocketChannelFactory(executor);
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/OioClientSocketChannelFactoryProvider.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/container/guice/OioServerSocketChannelFactoryProvider.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/guice/OioServerSocketChannelFactoryProvider.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/guice/OioServerSocketChannelFactoryProvider.java 2009-01-08 13:18:49 UTC (rev 667)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.guice;
+
+import java.util.concurrent.Executor;
+
+import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+
+import com.google.inject.Inject;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public class OioServerSocketChannelFactoryProvider extends
+ AbstractChannelFactoryProvider<OioServerSocketChannelFactory> {
+
+ @Inject
+ public OioServerSocketChannelFactoryProvider(@ChannelFactoryResource Executor executor) {
+ super(executor);
+ }
+
+ public OioServerSocketChannelFactory get() {
+ return new OioServerSocketChannelFactory(executor, executor);
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/guice/OioServerSocketChannelFactoryProvider.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r666 - trunk/src/main/java/org/jboss/netty/container/osgi.

2009-01-08T03:23:58Z

Author: trustin
Date: 2009-01-08 06:23:58 -0500 (Thu, 08 Jan 2009)
New Revision: 666

Modified:
trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
Log:
Clean-up

Modified: trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java 2009-01-08 11:21:49 UTC (rev 665)
+++ trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java 2009-01-08 11:23:58 UTC (rev 666)
@@ -70,6 +70,7 @@
public void stop(BundleContext ctx) throws Exception {
unregisterAll();
ExecutorShutdownUtil.shutdown(executor);
+ executor = null;
}

private void register(BundleContext ctx, ChannelFactory factory, Class<?>... factoryTypes) {

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r665 - trunk/src/main/java/org/jboss/netty/container/osgi.

2009-01-08T03:21:49Z

Author: trustin
Date: 2009-01-08 06:21:49 -0500 (Thu, 08 Jan 2009)
New Revision: 665

Modified:
trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
Log:
Added more registrations

Modified: trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java 2009-01-08 11:16:14 UTC (rev 664)
+++ trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java 2009-01-08 11:21:49 UTC (rev 665)
@@ -29,6 +29,8 @@
import java.util.concurrent.Executors;

import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
@@ -52,8 +54,15 @@

public void start(BundleContext ctx) throws Exception {
executor = Executors.newCachedThreadPool();
- register(ctx, new NioClientSocketChannelFactory(executor, executor));
- register(ctx, new NioServerSocketChannelFactory(executor, executor));
+
+ // The default transport is NIO.
+ register(ctx,
+ new NioClientSocketChannelFactory(executor, executor),
+ ClientSocketChannelFactory.class);
+ register(ctx,
+ new NioServerSocketChannelFactory(executor, executor),
+ ServerSocketChannelFactory.class);
+
register(ctx, new OioClientSocketChannelFactory(executor));
register(ctx, new OioServerSocketChannelFactory(executor, executor));
}
@@ -63,16 +72,15 @@
ExecutorShutdownUtil.shutdown(executor);
}

- private void register(BundleContext ctx, ChannelFactory factory) {
- register(ctx, factory, factory.getClass());
- }
-
- private void register(BundleContext ctx, ChannelFactory factory, Class<?> factoryType) {
+ private void register(BundleContext ctx, ChannelFactory factory, Class<?>... factoryTypes) {
Properties props = new Properties();
props.setProperty("category", "netty");

- registrations.add(
- ctx.registerService(factoryType.getName(), factory, props));
+ registrations.add(ctx.registerService(factory.getClass().getName(), factory, props));
+
+ for (Class<?> t: factoryTypes) {
+ registrations.add(ctx.registerService(t.getName(), factory, props));
+ }
}

private void unregisterAll() {

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r664 - in trunk: src/main/java/org/jboss/netty/container/osgi and 1 other directory.

2009-01-08T03:16:14Z

Author: trustin
Date: 2009-01-08 06:16:14 -0500 (Thu, 08 Jan 2009)
New Revision: 664

Added:
trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
Removed:
trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java
Modified:
trunk/pom.xml
Log:
Renamed the OSGi bundle activator implementation

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-08 10:50:42 UTC (rev 663)
+++ trunk/pom.xml 2009-01-08 11:16:14 UTC (rev 664)
@@ -178,7 +178,7 @@
<Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
<Bundle-Activator>
- ${project.groupId}.container.osgi.BundleActivatorImpl
+ ${project.groupId}.container.osgi.NettyBundleActivator
</Bundle-Activator>
<Export-Package>
!${project.groupId}.example.*,

Deleted: trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java 2009-01-08 10:50:42 UTC (rev 663)
+++ trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java 2009-01-08 11:16:14 UTC (rev 664)
@@ -1,86 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @author tags. See the COPYRIGHT.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.netty.container.osgi;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
-import org.jboss.netty.util.ExecutorShutdownUtil;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * @author The Netty Project (netty-dev@...)
- * @author Trustin Lee (tlee@...)
- * @version $Rev$, $Date$
- */
-public class BundleActivatorImpl implements BundleActivator {
-
- private final List<ServiceRegistration> registrations =
- new ArrayList<ServiceRegistration>();
-
- private Executor executor;
-
- public void start(BundleContext ctx) throws Exception {
- executor = Executors.newCachedThreadPool();
- register(ctx, new NioClientSocketChannelFactory(executor, executor));
- register(ctx, new NioServerSocketChannelFactory(executor, executor));
- register(ctx, new OioClientSocketChannelFactory(executor));
- register(ctx, new OioServerSocketChannelFactory(executor, executor));
- }
-
- public void stop(BundleContext ctx) throws Exception {
- unregisterAll();
- ExecutorShutdownUtil.shutdown(executor);
- }
-
- private void register(BundleContext ctx, ChannelFactory factory) {
- register(ctx, factory, factory.getClass());
- }
-
- private void register(BundleContext ctx, ChannelFactory factory, Class<?> factoryType) {
- Properties props = new Properties();
- props.setProperty("category", "netty");
-
- registrations.add(
- ctx.registerService(factoryType.getName(), factory, props));
- }
-
- private void unregisterAll() {
- List<ServiceRegistration> registrationsCopy =
- new ArrayList<ServiceRegistration>(registrations);
- registrations.clear();
- for (ServiceRegistration r: registrationsCopy) {
- r.unregister();
- }
- }
-}

Copied: trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java (from rev 663, trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java)
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java 2009-01-08 11:16:14 UTC (rev 664)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.osgi;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import org.jboss.netty.util.ExecutorShutdownUtil;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public class NettyBundleActivator implements BundleActivator {
+
+ private final List<ServiceRegistration> registrations =
+ new ArrayList<ServiceRegistration>();
+
+ private Executor executor;
+
+ public void start(BundleContext ctx) throws Exception {
+ executor = Executors.newCachedThreadPool();
+ register(ctx, new NioClientSocketChannelFactory(executor, executor));
+ register(ctx, new NioServerSocketChannelFactory(executor, executor));
+ register(ctx, new OioClientSocketChannelFactory(executor));
+ register(ctx, new OioServerSocketChannelFactory(executor, executor));
+ }
+
+ public void stop(BundleContext ctx) throws Exception {
+ unregisterAll();
+ ExecutorShutdownUtil.shutdown(executor);
+ }
+
+ private void register(BundleContext ctx, ChannelFactory factory) {
+ register(ctx, factory, factory.getClass());
+ }
+
+ private void register(BundleContext ctx, ChannelFactory factory, Class<?> factoryType) {
+ Properties props = new Properties();
+ props.setProperty("category", "netty");
+
+ registrations.add(
+ ctx.registerService(factoryType.getName(), factory, props));
+ }
+
+ private void unregisterAll() {
+ List<ServiceRegistration> registrationsCopy =
+ new ArrayList<ServiceRegistration>(registrations);
+ registrations.clear();
+ for (ServiceRegistration r: registrationsCopy) {
+ r.unregister();
+ }
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r663 - in trunk: src/main/java/org/jboss/netty/container/osgi and 1 other directory.

2009-01-08T02:50:42Z

Author: trustin
Date: 2009-01-08 05:50:42 -0500 (Thu, 08 Jan 2009)
New Revision: 663

Added:
trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java
Modified:
trunk/pom.xml
Log:
* Fixed OSGi manifest file
* Added BundleActivator implementation for easier OSGi integration

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-08 10:48:49 UTC (rev 662)
+++ trunk/pom.xml 2009-01-08 10:50:42 UTC (rev 663)
@@ -177,9 +177,26 @@
<instructions>
<Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Export-Package>!${project.groupId}.util.*,${project.groupId}.*</Export-Package>
- <Private-Package>${project.groupId}.util.*</Private-Package>
- <Import-Package>org.slf4j.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional,org.jboss.logging.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,*</Import-Package>
+ <Bundle-Activator>
+ ${project.groupId}.container.osgi.BundleActivatorImpl
+ </Bundle-Activator>
+ <Export-Package>
+ !${project.groupId}.example.*,
+ !${project.groupId}.logging.*,
+ !${project.groupId}.util.*,
+ ${project.groupId}.*
+ </Export-Package>
+ <Private-Package>
+ ${project.groupId}.example.*,
+ ${project.groupId}.logging.*,
+ ${project.groupId}.util.*,
+ </Private-Package>
+ <Import-Package>
+ *;resolution:=optional
+ </Import-Package>
+ 
</instructions>
</configuration>
</plugin>

Added: trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java 2009-01-08 10:50:42 UTC (rev 663)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.netty.container.osgi;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import org.jboss.netty.util.ExecutorShutdownUtil;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * @author The Netty Project (netty-dev@...)
+ * @author Trustin Lee (tlee@...)
+ * @version $Rev$, $Date$
+ */
+public class BundleActivatorImpl implements BundleActivator {
+
+ private final List<ServiceRegistration> registrations =
+ new ArrayList<ServiceRegistration>();
+
+ private Executor executor;
+
+ public void start(BundleContext ctx) throws Exception {
+ executor = Executors.newCachedThreadPool();
+ register(ctx, new NioClientSocketChannelFactory(executor, executor));
+ register(ctx, new NioServerSocketChannelFactory(executor, executor));
+ register(ctx, new OioClientSocketChannelFactory(executor));
+ register(ctx, new OioServerSocketChannelFactory(executor, executor));
+ }
+
+ public void stop(BundleContext ctx) throws Exception {
+ unregisterAll();
+ ExecutorShutdownUtil.shutdown(executor);
+ }
+
+ private void register(BundleContext ctx, ChannelFactory factory) {
+ register(ctx, factory, factory.getClass());
+ }
+
+ private void register(BundleContext ctx, ChannelFactory factory, Class<?> factoryType) {
+ Properties props = new Properties();
+ props.setProperty("category", "netty");
+
+ registrations.add(
+ ctx.registerService(factoryType.getName(), factory, props));
+ }
+
+ private void unregisterAll() {
+ List<ServiceRegistration> registrationsCopy =
+ new ArrayList<ServiceRegistration>(registrations);
+ registrations.clear();
+ for (ServiceRegistration r: registrationsCopy) {
+ r.unregister();
+ }
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/container/osgi/BundleActivatorImpl.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r662 - trunk/src/main/java/org/jboss/netty/channel/group.

2009-01-08T02:48:49Z

Author: trustin
Date: 2009-01-08 05:48:49 -0500 (Thu, 08 Jan 2009)
New Revision: 662

Modified:
trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java
trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFactory.java
trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java
Log:
Fixed apiviz errors

Modified: trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java 2009-01-08 09:59:35 UTC (rev 661)
+++ trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java 2009-01-08 10:48:49 UTC (rev 662)
@@ -34,7 +34,7 @@
* @version $Rev$, $Date$
*
* @apiviz.landmark
- * @apiviz.has org.jboss.netty.group.ChannelGroupFuture oneway - - returns
+ * @apiviz.has org.jboss.netty.channel.group.ChannelGroupFuture oneway - - returns
*/
public interface ChannelGroup extends Set<Channel>, Comparable<ChannelGroup> {
String getName();

Modified: trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFactory.java 2009-01-08 09:59:35 UTC (rev 661)
+++ trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFactory.java 2009-01-08 10:48:49 UTC (rev 662)
@@ -32,7 +32,7 @@
* @version $Rev$, $Date$
*
* @apiviz.landmark
- * @apiviz.has org.jboss.netty.group.ChannelGroup oneway - - creates
+ * @apiviz.has org.jboss.netty.channel.group.ChannelGroup oneway - - creates
*/
public class ChannelGroupFactory {

Modified: trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java 2009-01-08 09:59:35 UTC (rev 661)
+++ trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java 2009-01-08 10:48:49 UTC (rev 662)
@@ -33,7 +33,7 @@
* @author Trustin Lee (tlee@...)
* @version $Rev$, $Date$
*
- * @apiviz.owns org.jboss.netty.group.ChannelGroupFutureListener - - notifies
+ * @apiviz.owns org.jboss.netty.channel.group.ChannelGroupFutureListener - - notifies
*/
public interface ChannelGroupFuture extends Iterable<ChannelFuture>{

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r661 - in trunk/src/main/java/org/jboss/netty: container and 1 other directory.

2009-01-08T01:59:35Z

Author: trustin
Date: 2009-01-08 04:59:35 -0500 (Thu, 08 Jan 2009)
New Revision: 661

Added:
trunk/src/main/java/org/jboss/netty/container/
trunk/src/main/java/org/jboss/netty/container/guice/
trunk/src/main/java/org/jboss/netty/container/microcontainer/
trunk/src/main/java/org/jboss/netty/container/osgi/
trunk/src/main/java/org/jboss/netty/container/spring/
Log:
Created rooms for IoC/DI container integration

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r660 - trunk.

2009-01-07T21:48:11Z

Author: trustin
Date: 2009-01-08 00:48:10 -0500 (Thu, 08 Jan 2009)
New Revision: 660

Modified:
trunk/pom.xml
Log:
Updated Javadoc group list

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-08 05:47:26 UTC (rev 659)
+++ trunk/pom.xml 2009-01-08 05:48:10 UTC (rev 660)
@@ -307,7 +307,7 @@
-bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
-link http://java.sun.com/javase/6/docs/api/
-group "Low-level data representation" ${project.groupId}.buffer*
- -group "Central interface for all I/O operations" ${project.groupId}.channel*:${project.groupId}.group*
+ -group "Central interface for all I/O operations" ${project.groupId}.channel*
-group "Client & Server bootstrapping utilities" ${project.groupId}.bootstrap*
-group "Reusable I/O event interceptors" ${project.groupId}.handler*
-group "Miscellaneous" ${project.groupId}.logging*

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r659 - in trunk/src/main/java/org/jboss/netty: channel and 1 other directories.

2009-01-07T21:47:26Z

Author: trustin
Date: 2009-01-08 00:47:26 -0500 (Thu, 08 Jan 2009)
New Revision: 659

Added:
trunk/src/main/java/org/jboss/netty/channel/group/
Removed:
trunk/src/main/java/org/jboss/netty/group/
Modified:
trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java
trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFactory.java
trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java
trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFutureListener.java
trunk/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
trunk/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java
trunk/src/main/java/org/jboss/netty/channel/group/package-info.java
Log:
Renamed org.jboss.netty.group org.jboss.netty.channel.group

Copied: trunk/src/main/java/org/jboss/netty/channel/group (from rev 627, trunk/src/main/java/org/jboss/netty/group)

Property changes on: trunk/src/main/java/org/jboss/netty/channel/group
___________________________________________________________________
Name: svn:mergeinfo
+

Modified: trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/group/ChannelGroup.java 2009-01-02 16:57:15 UTC (rev 627)
+++ trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java 2009-01-08 05:47:26 UTC (rev 659)
@@ -20,7 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.netty.group;
+package org.jboss.netty.channel.group;

import java.net.SocketAddress;
import java.util.Set;

Modified: trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/group/ChannelGroupFactory.java 2009-01-02 16:57:15 UTC (rev 627)
+++ trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFactory.java 2009-01-08 05:47:26 UTC (rev 659)
@@ -20,7 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.netty.group;
+package org.jboss.netty.channel.group;

import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

Modified: trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/group/ChannelGroupFuture.java 2009-01-02 16:57:15 UTC (rev 627)
+++ trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java 2009-01-08 05:47:26 UTC (rev 659)
@@ -20,7 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.netty.group;
+package org.jboss.netty.channel.group;

import java.util.UUID;
import java.util.concurrent.TimeUnit;

Modified: trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFutureListener.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/group/ChannelGroupFutureListener.java 2009-01-02 16:57:15 UTC (rev 627)
+++ trunk/src/main/java/org/jboss/netty/channel/group/ChannelGroupFutureListener.java 2009-01-08 05:47:26 UTC (rev 659)
@@ -20,7 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.netty.group;
+package org.jboss.netty.channel.group;

import java.util.EventListener;

Modified: trunk/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/group/DefaultChannelGroup.java 2009-01-02 16:57:15 UTC (rev 627)
+++ trunk/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java 2009-01-08 05:47:26 UTC (rev 659)
@@ -20,7 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.netty.group;
+package org.jboss.netty.channel.group;

import java.net.SocketAddress;
import java.util.AbstractSet;

Modified: trunk/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/group/DefaultChannelGroupFuture.java 2009-01-02 16:57:15 UTC (rev 627)
+++ trunk/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java 2009-01-08 05:47:26 UTC (rev 659)
@@ -20,7 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.netty.group;
+package org.jboss.netty.channel.group;

import static java.util.concurrent.TimeUnit.*;

Modified: trunk/src/main/java/org/jboss/netty/channel/group/package-info.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/group/package-info.java 2009-01-02 16:57:15 UTC (rev 627)
+++ trunk/src/main/java/org/jboss/netty/channel/group/package-info.java 2009-01-08 05:47:26 UTC (rev 659)
@@ -28,4 +28,4 @@
* @apiviz.exclude ^java
* @apiviz.exclude \.(Abstract|Default).*$
*/
-package org.jboss.netty.group;
+package org.jboss.netty.channel.group;

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r658 - trunk/src/main/java/org/jboss/netty/util.

2009-01-07T21:44:33Z

Author: trustin
Date: 2009-01-08 00:44:33 -0500 (Thu, 08 Jan 2009)
New Revision: 658

Modified:
trunk/src/main/java/org/jboss/netty/util/MapUtil.java
trunk/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java
Log:
Removed cyclic dependencies

Modified: trunk/src/main/java/org/jboss/netty/util/MapUtil.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/util/MapUtil.java 2009-01-08 05:24:27 UTC (rev 657)
+++ trunk/src/main/java/org/jboss/netty/util/MapUtil.java 2009-01-08 05:44:33 UTC (rev 658)
@@ -28,9 +28,6 @@
import java.util.List;
import java.util.Map;

-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-
/**
* A set of utility methods related with a {@link Map}.
*
@@ -40,8 +37,6 @@
* @version $Rev$, $Date$
*/
public class MapUtil {
- private static final InternalLogger logger =
- InternalLoggerFactory.getInstance(MapUtil.class);

/**
* Returns {@code true} if and only if the specified {@code map} is an
@@ -51,81 +46,53 @@
public static boolean isOrderedMap(Map<?, ?> map) {
Class<?> mapType = map.getClass();
if (LinkedHashMap.class.isAssignableFrom(mapType)) {
- if (logger.isDebugEnabled()) {
- logger.debug(mapType.getSimpleName() + " is an ordered map.");
- }
+ // LinkedHashMap is an ordered map.
return true;
}

- if (logger.isDebugEnabled()) {
- logger.debug(
- mapType.getName() + " is not a " +
- LinkedHashMap.class.getSimpleName());
- }
+ // Not a LinkedHashMap - start autodetection.

// Detect Apache Commons Collections OrderedMap implementations.
Class<?> type = mapType;
while (type != null) {
for (Class<?> i: type.getInterfaces()) {
if (i.getName().endsWith("OrderedMap")) {
- if (logger.isDebugEnabled()) {
- logger.debug(
- mapType.getSimpleName() +
- " is an ordered map (guessed from that it " +
- " implements OrderedMap interface.)");
- }
+ // Seems like it's an ordered map - guessed from that
+ // it implements OrderedMap interface.
return true;
}
}
type = type.getSuperclass();
}

- if (logger.isDebugEnabled()) {
- logger.debug(
- mapType.getName() +
- " does not implement OrderedMap interface.");
- }
-
- // Last resort: try to create a new instance and test if it maintains
- // the insertion order.
- logger.debug(
- "Last resort; trying to create a new map instance with a " +
- "default constructor and test if insertion order is " +
- "maintained.");
-
+ // Does not implement OrderedMap interface. As a last resort, try to
+ // create a new instance and test if the insertion order is maintained.
Map newMap;
try {
newMap = (Map) mapType.newInstance();
} catch (Exception e) {
- if (logger.isDebugEnabled()) {
- logger.debug(
- "Failed to create a new map instance of '" +
- mapType.getName() +"'.", e);
- }
+ // No default constructor - cannot proceed anymore.
return false;
}

+ // Run some tests.
List<String> expectedKeys = new ArrayList<String>();
String dummyValue = "dummyValue";
- for (int i = 0; i < ORDER_TEST_SAMPLES.length; i ++) {
- String key = String.valueOf(ORDER_TEST_SAMPLES[i]);
+ for (short element: ORDER_TEST_SAMPLES) {
+ String key = String.valueOf(element);
newMap.put(key, dummyValue);
expectedKeys.add(key);

Iterator<String> it = expectedKeys.iterator();
for (Object actualKey: newMap.keySet()) {
if (!it.next().equals(actualKey)) {
- if (logger.isDebugEnabled()) {
- logger.debug(
- "The specified map didn't pass the insertion " +
- "order test after " + (i + 1) + " tries.");
- }
+ // Did not pass the test.
return false;
}
}
}

- logger.debug("The specified map passed the insertion order test.");
+ // The specified map passed the insertion order test.
return true;
}

Modified: trunk/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java 2009-01-08 05:24:27 UTC (rev 657)
+++ trunk/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java 2009-01-08 05:44:33 UTC (rev 658)
@@ -22,8 +22,6 @@
*/
package org.jboss.netty.util;

-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;

/**
* Meta {@link Runnable} that changes the current thread name and reverts it
@@ -36,8 +34,6 @@
*
*/
public class ThreadRenamingRunnable implements Runnable {
- private static final InternalLogger logger =
- InternalLoggerFactory.getInstance(ThreadRenamingRunnable.class);

private final Runnable runnable;
private final String threadName;
@@ -69,8 +65,6 @@
renamed = true;
} catch (Exception e) {
// Probably SecurityException.
- logger.warn(
- "Failed to set the current thread name.", e);
}

// Run the actual runnable and revert the name back when it ends.

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r657 - trunk.

2009-01-07T21:24:28Z

Author: trustin
Date: 2009-01-08 00:24:27 -0500 (Thu, 08 Jan 2009)
New Revision: 657

Modified:
trunk/pom.xml
Log:
Added dependencies for container integrations

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-08 00:37:46 UTC (rev 656)
+++ trunk/pom.xml 2009-01-08 05:24:27 UTC (rev 657)
@@ -42,6 +42,36 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
+
+ 
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>2.0.2.GA</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.0.8</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>


<dependency>

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits

r656 - trunk/src/main/java/org/jboss/netty/channel.

2009-01-07T16:37:46Z

Author: trustin
Date: 2009-01-07 19:37:46 -0500 (Wed, 07 Jan 2009)
New Revision: 656

Modified:
trunk/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
Log:
Updated Javadoc regarding previous deprecation of interestOps value in channelInterestChanged event

Modified: trunk/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java 2009-01-08 00:29:09 UTC (rev 655)
+++ trunk/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java 2009-01-08 00:37:46 UTC (rev 656)
@@ -89,7 +89,7 @@
* </tr>
* <tr>
* <td>{@code "channelInterestChanged"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#INTEREST_OPS INTEREST_OPS}, value = {@code int}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#INTEREST_OPS INTEREST_OPS}, no value)</td>
* <td>a {@link Channel}'s {@link Channel#getInterestOps() interestOps} was changed</td>
* </tr>
* </table>

_______________________________________________
netty-commits mailing list
netty-commits@...
https://lists.jboss.org/mailman/listinfo/netty-commits