You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/10/07 20:38:07 UTC
[1/2] git commit: Fixing merge error and removing unnecessary file.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o ba47088b9 -> dbfb3db42
Fixing merge error and removing unnecessary file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0af27bd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0af27bd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0af27bd3
Branch: refs/heads/two-dot-o
Commit: 0af27bd336180cac1a452c2b63c793aafc703443
Parents: 43f1930
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Oct 7 14:37:29 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Oct 7 14:37:29 2014 -0400
----------------------------------------------------------------------
.../usergrid/corepersistence/GuiceModule.java | 1 +
.../core/util/AvailablePortFinder.java | 188 -------------------
2 files changed, 1 insertion(+), 188 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0af27bd3/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
index 9637e8e..2221f80 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceModule.java
@@ -23,6 +23,7 @@ import org.apache.usergrid.persistence.core.guice.CommonModule;
import org.apache.usergrid.persistence.graph.guice.GraphModule;
import org.apache.usergrid.persistence.index.guice.IndexModule;
import org.apache.usergrid.persistence.map.guice.MapModule;
+import org.apache.usergrid.persistence.queue.guice.QueueModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0af27bd3/stack/corepersistence/core/src/main/java/org/apache/usergrid/persistence/core/util/AvailablePortFinder.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/core/src/main/java/org/apache/usergrid/persistence/core/util/AvailablePortFinder.java b/stack/corepersistence/core/src/main/java/org/apache/usergrid/persistence/core/util/AvailablePortFinder.java
deleted file mode 100644
index 958893c..0000000
--- a/stack/corepersistence/core/src/main/java/org/apache/usergrid/persistence/core/util/AvailablePortFinder.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.usergrid.persistence.core.util;
-
-
-import java.io.IOException;
-import java.net.DatagramSocket;
-import java.net.ServerSocket;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.TreeSet;
-
-
-/**
- * Finds currently available server ports.
- *
- * @author <a href="http://mina.apache.org">Apache MINA Project</a>
- * @see <a href="http://www.iana.org/assignments/port-numbers">IANA.org</a>
- *
- * TODO: move this to test packages once Query Index uses it correctly.
- */
-public class AvailablePortFinder {
- /** The minimum number of server port number. */
- public static final int MIN_PORT_NUMBER = 1;
-
- /** The maximum number of server port number. */
- public static final int MAX_PORT_NUMBER = 49151;
-
-
- /** Creates a new instance. */
- private AvailablePortFinder() {
- // Do nothing
- }
-
-
- /**
- * Returns the {@link java.util.Set} of currently available port numbers ({@link Integer}). This method is identical to
- * <code>getAvailablePorts(MIN_PORT_NUMBER, MAX_PORT_NUMBER)</code>.
- * <p/>
- * WARNING: this can take a very long time.
- */
- public static Set<Integer> getAvailablePorts() {
- return getAvailablePorts( MIN_PORT_NUMBER, MAX_PORT_NUMBER );
- }
-
-
- /**
- * Gets an available port, MAY be outside of MIN_PORT_NUMBER to MAX_PORT_NUMBER range.
- *
- * @throws java.util.NoSuchElementException if there are no ports available
- */
- public static int getNextAvailable() {
- ServerSocket serverSocket = null;
-
- try {
- // Here, we simply return an available port found by the system
- serverSocket = new ServerSocket( 0 );
- int port = serverSocket.getLocalPort();
-
- // Don't forget to close the socket...
- serverSocket.close();
-
- return port;
- }
- catch ( IOException ioe ) {
- throw new NoSuchElementException( ioe.getMessage() );
- }
- }
-
-
- /**
- * Gets the next available port starting at a port.
- *
- * @param fromPort the port to scan for availability
- *
- * @throws java.util.NoSuchElementException if there are no ports available
- */
- public static int getNextAvailable( int fromPort ) {
- if ( fromPort < MIN_PORT_NUMBER || fromPort > MAX_PORT_NUMBER ) {
- throw new IllegalArgumentException( "Invalid start port: " + fromPort );
- }
-
- for ( int i = fromPort; i <= MAX_PORT_NUMBER; i++ ) {
- if ( available( i ) ) {
- return i;
- }
- }
-
- throw new NoSuchElementException( "Could not find an available port " + "above " + fromPort );
- }
-
-
- /**
- * Checks to see if a specific port is available.
- *
- * @param port the port to check for availability
- */
- public static boolean available( int port ) {
- if ( port < MIN_PORT_NUMBER || port > MAX_PORT_NUMBER ) {
- throw new IllegalArgumentException( "Invalid start port: " + port );
- }
-
- ServerSocket ss = null;
- DatagramSocket ds = null;
-
- try {
- ss = new ServerSocket( port );
- ss.setReuseAddress( true );
- ds = new DatagramSocket( port );
- ds.setReuseAddress( true );
- return true;
- }
- catch ( IOException e ) {
- // Do nothing
- }
- finally {
- if ( ds != null ) {
- ds.close();
- }
-
- if ( ss != null ) {
- try {
- ss.close();
- }
- catch ( IOException e ) {
- /* should not be thrown */
- }
- }
- }
-
- return false;
- }
-
-
- /**
- * Returns the {@link java.util.Set} of currently avaliable port numbers ({@link Integer}) between the specified port range.
- *
- * @throws IllegalArgumentException if port range is not between {@link #MIN_PORT_NUMBER} and {@link
- * #MAX_PORT_NUMBER} or <code>fromPort</code> if greater than <code>toPort</code>.
- */
- public static Set<Integer> getAvailablePorts( int fromPort, int toPort ) {
- if ( fromPort < MIN_PORT_NUMBER || toPort > MAX_PORT_NUMBER || fromPort > toPort ) {
- throw new IllegalArgumentException( "Invalid port range: " + fromPort + " ~ " + toPort );
- }
-
- Set<Integer> result = new TreeSet<Integer>();
-
- for ( int i = fromPort; i <= toPort; i++ ) {
- ServerSocket s = null;
-
- try {
- s = new ServerSocket( i );
- result.add( new Integer( i ) );
- }
- catch ( IOException e ) {
- // Do nothing
- }
- finally {
- if ( s != null ) {
- try {
- s.close();
- }
- catch ( IOException e ) {
- /* should not be thrown */
- }
- }
- }
- }
-
- return result;
- }
-}
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dbfb3db4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dbfb3db4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dbfb3db4
Branch: refs/heads/two-dot-o
Commit: dbfb3db42b01ad0db12bcb8dff71a338e51860e4
Parents: 0af27bd ba47088
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Oct 7 14:37:54 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Oct 7 14:37:54 2014 -0400
----------------------------------------------------------------------
.../notifications/ApplicationQueueManager.java | 22 +++----
.../notifications/NotificationsService.java | 3 +-
.../services/notifications/QueueListener.java | 22 +++++--
.../services/notifications/TaskManager.java | 33 +++++-----
.../usergrid/services/TestQueueManager.java | 67 ++++++++++++++++++++
.../AbstractServiceNotificationIT.java | 1 -
.../apns/NotificationsServiceIT.java | 9 ++-
.../gcm/NotificationsServiceIT.java | 7 +-
8 files changed, 122 insertions(+), 42 deletions(-)
----------------------------------------------------------------------