You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2015/11/09 23:31:44 UTC
[1/9] usergrid git commit: add wns constructor test
Repository: usergrid
Updated Branches:
refs/heads/2.1-release c3a5bc436 -> e3d1f3b6d
add wns constructor test
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5a39c05c
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5a39c05c
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5a39c05c
Branch: refs/heads/2.1-release
Commit: 5a39c05c9109cd0431d851e4498bfd51d373dfda
Parents: 70b7e27
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Nov 5 14:33:04 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Nov 5 14:33:04 2015 -0700
----------------------------------------------------------------------
stack/services/pom.xml | 6 +++
.../notifications/wns/WNSAdapterTest.java | 49 ++++++++++++++++++++
2 files changed, 55 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/5a39c05c/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 0be2bcf..d1ec212 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -438,6 +438,12 @@
<groupId>com.github.fernandospr</groupId>
<artifactId>java-wns</artifactId>
<version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackson-jaxrs</artifactId>
+ <groupId>org.codehaus.jackson</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/5a39c05c/stack/services/src/test/java/org/apache/usergrid/services/notifications/wns/WNSAdapterTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/wns/WNSAdapterTest.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/wns/WNSAdapterTest.java
new file mode 100644
index 0000000..aa60e84
--- /dev/null
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/wns/WNSAdapterTest.java
@@ -0,0 +1,49 @@
+/*
+ *
+ * * Licensed to the Apache Software Foundation (ASF) under one or more
+ * * contributor license agreements. 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. For additional information regarding
+ * * copyright in this work, please see the NOTICE file in the top level
+ * * directory of this distribution.
+ *
+ */
+package org.apache.usergrid.services.notifications.wns;
+
+import org.apache.usergrid.corepersistence.util.CpNamingUtils;
+import org.apache.usergrid.management.OrganizationInfo;
+import org.apache.usergrid.management.OrganizationOwnerInfo;
+import org.apache.usergrid.persistence.EntityManager;
+import org.apache.usergrid.persistence.entities.Notifier;
+import org.apache.usergrid.services.AbstractServiceIT;
+import org.junit.Test;
+
+import java.util.UUID;
+
+/**
+ * Classy class class.
+ */
+public class WNSAdapterTest extends AbstractServiceIT{
+ @Test
+ public void windows() throws Exception {
+
+
+ EntityManager em = setup.getEmf().getEntityManager(app.getId());
+
+ Notifier notifier = new Notifier();
+ notifier.setLogging(true);
+ notifier.setSid("ms-app://s-1-15-2-2411381248-444863693-3819932088-4077691928-1194867744-112853457-373132695");
+ notifier.setApiKey("QAHlxzMXhg5eP5q9bf/W3komtUXegf7B");
+ WNSAdapter adapter = new WNSAdapter(em, notifier);
+ adapter.testConnection();
+ }
+}
[7/9] usergrid git commit: fix queue manager impl
Posted by mr...@apache.org.
fix queue manager impl
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/9fd657b8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9fd657b8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9fd657b8
Branch: refs/heads/2.1-release
Commit: 9fd657b84ee86af50ee207e2b5d60054964c30e0
Parents: 5222b9a
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Nov 9 14:14:28 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Nov 9 14:14:28 2015 -0700
----------------------------------------------------------------------
.../persistence/queue/DefaultQueueManager.java | 61 +++++++++++++-------
1 file changed, 40 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/9fd657b8/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
index 5201279..c3b5917 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
@@ -1,3 +1,4 @@
+
/*
*
* * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,33 +19,43 @@
*
*/
-package org.apache.usergrid.persistence.queue;
+ package org.apache.usergrid.persistence.queue;
-import rx.Observable;
+ import rx.Observable;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ArrayBlockingQueue;
+ import java.io.IOException;
+ import java.util.AbstractQueue;
+ import java.io.Serializable;
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.UUID;
+ import java.util.concurrent.ArrayBlockingQueue;
+ import java.util.concurrent.LinkedBlockingQueue;
+ import java.util.concurrent.PriorityBlockingQueue;
+ import java.util.concurrent.TimeUnit;
/**
* Default queue manager implementation, uses in memory linked queue
*/
public class DefaultQueueManager implements QueueManager {
public ArrayBlockingQueue<QueueMessage> queue = new ArrayBlockingQueue<>(10000);
+
@Override
- public synchronized Observable<QueueMessage> getMessages(int limit, int transactionTimeout, int waitTime, Class klass) {
+ public Observable<QueueMessage> getMessages(int limit, int transactionTimeout, int waitTime, Class klass) {
List<QueueMessage> returnQueue = new ArrayList<>();
- for(int i=0;i<limit;i++){
- if(!queue.isEmpty()){
- returnQueue.add( queue.remove());
- }else{
- break;
- }
+ try {
+ QueueMessage message=null;
+ int count = 5;
+ do {
+ message = queue.poll(100, TimeUnit.MILLISECONDS);
+ if (message != null) {
+ returnQueue.add(message);
+ }
+ }while(message!=null && count-->0);
+ }catch (InterruptedException ie){
+ throw new RuntimeException(ie);
}
- return Observable.from( returnQueue);
+ return rx.Observable.from(returnQueue);
}
@Override
@@ -61,10 +72,14 @@ public class DefaultQueueManager implements QueueManager {
}
@Override
- public synchronized void sendMessages(List bodies) throws IOException {
+ public void sendMessages(List bodies) throws IOException {
for(Object body : bodies){
String uuid = UUID.randomUUID().toString();
- queue.add(new QueueMessage(uuid,"handle_"+uuid,body,"putappriate type here"));
+ try {
+ queue.put(new QueueMessage(uuid, "handle_" + uuid, body, "put type here"));
+ }catch (InterruptedException ie){
+ throw new RuntimeException(ie);
+ }
}
}
@@ -72,14 +87,18 @@ public class DefaultQueueManager implements QueueManager {
@Override
public <T extends Serializable> void sendMessage( final T body ) throws IOException {
String uuid = UUID.randomUUID().toString();
- queue.add(new QueueMessage(uuid,"handle_"+uuid,body,"put type here"));
-
+ try {
+ queue.offer(new QueueMessage(uuid, "handle_" + uuid, body, "put type here"),5000,TimeUnit.MILLISECONDS);
+ }catch (InterruptedException ie){
+ throw new RuntimeException(ie);
+ }
}
+
@Override
public <T extends Serializable> void sendMessageToTopic( final T body ) throws IOException {
- sendMessage( body );
+ sendMessage( body );
}
[8/9] usergrid git commit: Merge branch '2.1-release' of
https://git-wip-us.apache.org/repos/asf/usergrid into jackson-exclusion
Posted by mr...@apache.org.
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into jackson-exclusion
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d363242e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d363242e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d363242e
Branch: refs/heads/2.1-release
Commit: d363242e56571db6fa09f8be5b6753e864fb72a4
Parents: 9fd657b c3a5bc4
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Nov 9 14:15:56 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Nov 9 14:15:56 2015 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/services/AbstractCollectionService.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[9/9] usergrid git commit: remove repeated logic
Posted by mr...@apache.org.
remove repeated logic
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e3d1f3b6
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e3d1f3b6
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e3d1f3b6
Branch: refs/heads/2.1-release
Commit: e3d1f3b6d8c3be86f0d36dbf6c86321676860a34
Parents: d363242
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Nov 9 15:10:16 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Nov 9 15:10:16 2015 -0700
----------------------------------------------------------------------
.../usergrid/persistence/queue/DefaultQueueManager.java | 7 +------
.../usergrid/services/notifications/wns/WNSAdapterTest.java | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/e3d1f3b6/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
index c3b5917..ea30fc0 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/DefaultQueueManager.java
@@ -74,12 +74,7 @@ public class DefaultQueueManager implements QueueManager {
@Override
public void sendMessages(List bodies) throws IOException {
for(Object body : bodies){
- String uuid = UUID.randomUUID().toString();
- try {
- queue.put(new QueueMessage(uuid, "handle_" + uuid, body, "put type here"));
- }catch (InterruptedException ie){
- throw new RuntimeException(ie);
- }
+ sendMessage( ( Serializable )body);
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/e3d1f3b6/stack/services/src/test/java/org/apache/usergrid/services/notifications/wns/WNSAdapterTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/wns/WNSAdapterTest.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/wns/WNSAdapterTest.java
index aa60e84..35f3180 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/wns/WNSAdapterTest.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/wns/WNSAdapterTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import java.util.UUID;
/**
- * Classy class class.
+ * test windows phone.
*/
public class WNSAdapterTest extends AbstractServiceIT{
@Test
[5/9] usergrid git commit: forked was to version 1.2-USERGRID
Posted by mr...@apache.org.
forked was to version 1.2-USERGRID
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/32f805a5
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/32f805a5
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/32f805a5
Branch: refs/heads/2.1-release
Commit: 32f805a5fa2bbd6aa3a816752e601da2f7c47e57
Parents: 6ea8f6b
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Nov 9 11:22:28 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Nov 9 11:22:28 2015 -0700
----------------------------------------------------------------------
.../java-wns/1.2-USERGRID/_remote.repositories | 7 +
...a-wns-1.2-USERGRID-jar-with-dependencies.jar | Bin 0 -> 1836665 bytes
.../java-wns-1.2-USERGRID-javadoc.jar | Bin 0 -> 234289 bytes
.../java-wns-1.2-USERGRID-sources.jar | Bin 0 -> 21654 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.jar | Bin 0 -> 33164 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.pom | 128 +++++++++++++++++++
.../1.3.1-USERGRID/_remote.repositories | 9 --
...wns-1.3.1-USERGRID-jar-with-dependencies.jar | Bin 6504429 -> 0 bytes
.../java-wns-1.3.1-USERGRID-javadoc.jar | Bin 239980 -> 0 bytes
.../java-wns-1.3.1-USERGRID-sources.jar | Bin 22657 -> 0 bytes
.../1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar | Bin 34898 -> 0 bytes
.../1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom | 110 ----------------
stack/services/pom.xml | 4 +-
13 files changed, 137 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/_remote.repositories
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/_remote.repositories b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/_remote.repositories
new file mode 100644
index 0000000..dc98831
--- /dev/null
+++ b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/_remote.repositories
@@ -0,0 +1,7 @@
+#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
+#Mon Nov 09 10:18:48 MST 2015
+java-wns-1.2-USERGRID.pom>=
+java-wns-1.2-USERGRID-javadoc.jar>=
+java-wns-1.2-USERGRID-jar-with-dependencies.jar>=
+java-wns-1.2-USERGRID.jar>=
+java-wns-1.2-USERGRID-sources.jar>=
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-jar-with-dependencies.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-jar-with-dependencies.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-jar-with-dependencies.jar
new file mode 100644
index 0000000..785c1ab
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-jar-with-dependencies.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-javadoc.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-javadoc.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-javadoc.jar
new file mode 100644
index 0000000..03af259
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-javadoc.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-sources.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-sources.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-sources.jar
new file mode 100644
index 0000000..9a0fb2b
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID-sources.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID.jar
new file mode 100644
index 0000000..5e073ad
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID.pom b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID.pom
new file mode 100644
index 0000000..40a6e55
--- /dev/null
+++ b/stack/m2/repository/com/github/fernandospr/java-wns/1.2-USERGRID/java-wns-1.2-USERGRID.pom
@@ -0,0 +1,128 @@
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.fernandospr</groupId>
+ <artifactId>java-wns</artifactId>
+ <packaging>jar</packaging>
+ <version>1.2-USERGRID</version>
+ <name>java-wns</name>
+ <description>Library to send notifications using WNS</description>
+ <url>https://github.com/fernandospr/java-wns</url>
+ <licenses>
+ <license>
+ <name>New BSD License</name>
+ <url>http://www.opensource.org/licenses/bsd-license.php</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <!-- Inherit the Sonatype OSS deployment configuration -->
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <scm>
+ <connection>scm:git:git@github.com:fernandospr/java-wns.git</connection>
+ <url>scm:git:git@github.com:fernandospr/java-wns.git</url>
+ <developerConnection>scm:git:git@github.com:fernandospr/java-wns.git</developerConnection>
+ </scm>
+ <developers>
+ <developer>
+ <id>fernandospr</id>
+ <name>Fernando Sproviero</name>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.19</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
deleted file mode 100644
index 408d82f..0000000
--- a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
+++ /dev/null
@@ -1,9 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Fri Nov 06 16:50:37 MST 2015
-java-wns-1.3.1-USERGRID.pom>local-dependencies=
-java-wns-1.3.1-USERGRID-sources.jar>=
-java-wns-1.3.1-USERGRID-jar-with-dependencies.jar>=
-java-wns-1.3.1-USERGRID.jar>local-dependencies=
-java-wns-1.3.1-USERGRID.jar>=
-java-wns-1.3.1-USERGRID-javadoc.jar>=
-java-wns-1.3.1-USERGRID.pom>=
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar
deleted file mode 100644
index 465d258..0000000
Binary files a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar
deleted file mode 100644
index f0a8037..0000000
Binary files a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar
deleted file mode 100644
index 3c6c4e3..0000000
Binary files a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar
deleted file mode 100644
index e03410f..0000000
Binary files a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
deleted file mode 100644
index ece0cc3..0000000
--- a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
+++ /dev/null
@@ -1,110 +0,0 @@
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.github.fernandospr</groupId>
- <artifactId>java-wns</artifactId>
- <packaging>jar</packaging>
- <version>1.3.1-USERGRID</version>
- <name>java-wns</name>
- <description>Library to send notifications using WNS</description>
- <url>https://github.com/fernandospr/java-wns</url>
- <licenses>
- <license>
- <name>New BSD License</name>
- <url>http://www.opensource.org/licenses/bsd-license.php</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <!-- Inherit the Sonatype OSS deployment configuration -->
- <parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>7</version>
- </parent>
-
- <scm>
- <connection>scm:git:git@github.com:fernandospr/java-wns.git</connection>
- <url>scm:git:git@github.com:fernandospr/java-wns.git</url>
- <developerConnection>scm:git:git@github.com:fernandospr/java-wns.git</developerConnection>
- </scm>
- <developers>
- <developer>
- <id>fernandospr</id>
- <name>Fernando Sproviero</name>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.jersey.connectors</groupId>
- <artifactId>jersey-apache-connector</artifactId>
- <version>2.22.1</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-xml-provider</artifactId>
- <version>2.3.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.3.3</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/32f805a5/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 754b74c..853596e 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -434,11 +434,11 @@
<artifactId>stream</artifactId>
<version>2.7.0</version>
</dependency>
- <!-- fork: https://github.com/apigee/java-wns/tree/usergrid -->
+ <!-- fork: https://github.com/apigee/java-wns/tree/1.2-USERGRID -->
<dependency>
<groupId>com.github.fernandospr</groupId>
<artifactId>java-wns</artifactId>
- <version>1.3.1-USERGRID</version>
+ <version>1.2-USERGRID</version>
</dependency>
</dependencies>
</project>
[6/9] usergrid git commit: forked wns
Posted by mr...@apache.org.
forked wns
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5222b9a0
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5222b9a0
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5222b9a0
Branch: refs/heads/2.1-release
Commit: 5222b9a046d28e832397dfb3f9ebff6eb77c6bd0
Parents: 32f805a
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Nov 9 11:22:51 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Nov 9 11:22:51 2015 -0700
----------------------------------------------------------------------
stack/services/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/5222b9a0/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 853596e..a37e6ee 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -435,6 +435,7 @@
<version>2.7.0</version>
</dependency>
<!-- fork: https://github.com/apigee/java-wns/tree/1.2-USERGRID -->
+ <!-- forked to eliminate jackson dependency issues -->
<dependency>
<groupId>com.github.fernandospr</groupId>
<artifactId>java-wns</artifactId>
[2/9] usergrid git commit: fix exclusion with new version of wns lib
Posted by mr...@apache.org.
fix exclusion with new version of wns lib
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d42d82cb
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d42d82cb
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d42d82cb
Branch: refs/heads/2.1-release
Commit: d42d82cb97000581912299171690a5148df18dfa
Parents: 5a39c05
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Nov 6 15:26:29 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Nov 6 15:26:29 2015 -0700
----------------------------------------------------------------------
.../1.3.1-USERGRID/_remote.repositories | 7 ++
...wns-1.3.1-USERGRID-jar-with-dependencies.jar | Bin 0 -> 6806358 bytes
.../java-wns-1.3.1-USERGRID-javadoc.jar | Bin 0 -> 240001 bytes
.../java-wns-1.3.1-USERGRID-sources.jar | Bin 0 -> 22656 bytes
.../1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar | Bin 0 -> 34924 bytes
.../1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom | 115 +++++++++++++++++++
stack/pom.xml | 14 +--
stack/rest/pom.xml | 10 ++
stack/services/pom.xml | 3 +-
9 files changed, 141 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
new file mode 100644
index 0000000..b24cacf
--- /dev/null
+++ b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
@@ -0,0 +1,7 @@
+#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
+#Fri Nov 06 15:17:59 MST 2015
+java-wns-1.3.1-USERGRID-sources.jar>=
+java-wns-1.3.1-USERGRID-jar-with-dependencies.jar>=
+java-wns-1.3.1-USERGRID.jar>=
+java-wns-1.3.1-USERGRID-javadoc.jar>=
+java-wns-1.3.1-USERGRID.pom>=
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar
new file mode 100644
index 0000000..f118d2f
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar
new file mode 100644
index 0000000..7c902ad
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar
new file mode 100644
index 0000000..74dc5a0
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar
new file mode 100644
index 0000000..dce3b10
Binary files /dev/null and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
new file mode 100644
index 0000000..8939db3
--- /dev/null
+++ b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
@@ -0,0 +1,115 @@
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.fernandospr</groupId>
+ <artifactId>java-wns</artifactId>
+ <packaging>jar</packaging>
+ <version>1.3.1-USERGRID</version>
+ <name>java-wns</name>
+ <description>Library to send notifications using WNS</description>
+ <url>https://github.com/fernandospr/java-wns</url>
+ <licenses>
+ <license>
+ <name>New BSD License</name>
+ <url>http://www.opensource.org/licenses/bsd-license.php</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <!-- Inherit the Sonatype OSS deployment configuration -->
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <scm>
+ <connection>scm:git:git@github.com:fernandospr/java-wns.git</connection>
+ <url>scm:git:git@github.com:fernandospr/java-wns.git</url>
+ <developerConnection>scm:git:git@github.com:fernandospr/java-wns.git</developerConnection>
+ </scm>
+ <developers>
+ <developer>
+ <id>fernandospr</id>
+ <name>Fernando Sproviero</name>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.19</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jersey.connectors</groupId>
+ <artifactId>jersey-apache-connector</artifactId>
+ <version>2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-xml-provider</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index dfa5045..ae55ea1 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1647,13 +1647,13 @@
</reporting>
- <!--<repositories>-->
- <!--<repository>-->
- <!--<id>local-dependencies</id>-->
- <!--<name>local-depedendencies</name>-->
- <!--<url>file://${project.basedir}/../m2/repository</url>-->
- <!--</repository>-->
- <!--</repositories>-->
+ <repositories>
+ <repository>
+ <id>local-dependencies</id>
+ <name>local-depedendencies</name>
+ <url>file://${project.basedir}/../m2/repository</url>
+ </repository>
+ </repositories>
<scm>
<url>https://git-wip-us.apache.org/repos/asf/incubator-usergrid.git</url>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 6c47d82..7b1bad6 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -408,6 +408,16 @@
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-apache-client</artifactId>
+ <version>1.19</version>
+ </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d42d82cb/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index d1ec212..5560079 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -434,10 +434,11 @@
<artifactId>stream</artifactId>
<version>2.7.0</version>
</dependency>
+ <!-- fork: https://github.com/apigee/java-wns/tree/usergrid -->
<dependency>
<groupId>com.github.fernandospr</groupId>
<artifactId>java-wns</artifactId>
- <version>1.3</version>
+ <version>1.3.1-USERGRID</version>
<exclusions>
<exclusion>
<artifactId>jackson-jaxrs</artifactId>
[3/9] usergrid git commit: fix exclusion with new version of wns lib
Posted by mr...@apache.org.
fix exclusion with new version of wns lib
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3c20c67f
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3c20c67f
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3c20c67f
Branch: refs/heads/2.1-release
Commit: 3c20c67f50ecaad1136feea3e9a070b2a993b22f
Parents: d42d82c ad07e2b
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Nov 6 16:02:36 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Nov 6 16:02:36 2015 -0700
----------------------------------------------------------------------
.../asyncevents/AmazonAsyncEventService.java | 8 +-
.../read/traverse/AbstractReadGraphFilter.java | 8 +-
.../usergrid/corepersistence/index/RxTest.java | 5 +-
.../persistence/graph/guice/GraphModule.java | 7 -
.../impl/shard/DirectedEdgeMeta.java | 4 +-
.../impl/shard/EdgeShardStrategy.java | 10 +-
.../impl/shard/NodeShardApproximation.java | 66 --
.../impl/shard/ShardEntryGroup.java | 3 +-
.../impl/shard/ShardedEdgeSerialization.java | 2 +-
.../serialization/impl/shard/count/Counter.java | 131 ----
.../shard/count/NodeShardApproximationImpl.java | 272 --------
.../count/NodeShardCounterSerialization.java | 48 --
.../NodeShardCounterSerializationImpl.java | 186 ------
.../impl/shard/count/ShardKey.java | 75 ---
.../shard/impl/NodeShardAllocationImpl.java | 19 +-
.../impl/shard/impl/ShardGroupDeletionImpl.java | 158 ++---
.../impl/ShardedEdgeSerializationImpl.java | 28 -
.../shard/impl/SizebasedEdgeColumnFamilies.java | 4 +-
.../shard/impl/SizebasedEdgeShardStrategy.java | 13 +-
.../graph/GraphManagerShardConsistencyIT.java | 5 +
.../graph/GraphManagerShardingIT.java | 208 ------
.../impl/shard/NodeShardAllocationTest.java | 48 +-
.../impl/shard/ShardEntryGroupTest.java | 28 +
.../shard/count/NodeShardApproximationTest.java | 627 -------------------
.../NodeShardCounterSerializationTest.java | 124 ----
.../shard/impl/ShardGroupDeletionImplTest.java | 5 +
.../index/impl/IndexOperationMessage.java | 4 +-
.../exceptions/AbstractExceptionMapper.java | 8 +-
stack/services/pom.xml | 7 -
.../services/AbstractCollectionService.java | 6 +-
30 files changed, 164 insertions(+), 1953 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3c20c67f/stack/services/pom.xml
----------------------------------------------------------------------
diff --cc stack/services/pom.xml
index 5560079,2daa8f6..754b74c
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@@ -438,14 -437,13 +438,7 @@@
<dependency>
<groupId>com.github.fernandospr</groupId>
<artifactId>java-wns</artifactId>
- <version>1.3</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-jaxrs</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- </exclusions>
+ <version>1.3.1-USERGRID</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-jaxrs</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- </exclusions>
</dependency>
-
</dependencies>
</project>
[4/9] usergrid git commit: fix exclusion with new version of wns lib
Posted by mr...@apache.org.
fix exclusion with new version of wns lib
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6ea8f6b6
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6ea8f6b6
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6ea8f6b6
Branch: refs/heads/2.1-release
Commit: 6ea8f6b6feabb624ee583442eedbda55d8e78d07
Parents: 3c20c67
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Nov 6 17:01:53 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Nov 6 17:01:53 2015 -0700
----------------------------------------------------------------------
.../1.3.1-USERGRID/_remote.repositories | 4 +++-
...wns-1.3.1-USERGRID-jar-with-dependencies.jar | Bin 6806358 -> 6504429 bytes
.../java-wns-1.3.1-USERGRID-javadoc.jar | Bin 240001 -> 239980 bytes
.../java-wns-1.3.1-USERGRID-sources.jar | Bin 22656 -> 22657 bytes
.../1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar | Bin 34924 -> 34898 bytes
.../1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom | 23 ++++++++-----------
6 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6ea8f6b6/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
index b24cacf..408d82f 100644
--- a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
+++ b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/_remote.repositories
@@ -1,7 +1,9 @@
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Fri Nov 06 15:17:59 MST 2015
+#Fri Nov 06 16:50:37 MST 2015
+java-wns-1.3.1-USERGRID.pom>local-dependencies=
java-wns-1.3.1-USERGRID-sources.jar>=
java-wns-1.3.1-USERGRID-jar-with-dependencies.jar>=
+java-wns-1.3.1-USERGRID.jar>local-dependencies=
java-wns-1.3.1-USERGRID.jar>=
java-wns-1.3.1-USERGRID-javadoc.jar>=
java-wns-1.3.1-USERGRID.pom>=
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6ea8f6b6/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar
index f118d2f..465d258 100644
Binary files a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-jar-with-dependencies.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6ea8f6b6/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar
index 7c902ad..f0a8037 100644
Binary files a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-javadoc.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6ea8f6b6/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar
index 74dc5a0..3c6c4e3 100644
Binary files a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID-sources.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6ea8f6b6/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar
index dce3b10..e03410f 100644
Binary files a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar and b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid/blob/6ea8f6b6/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
index 8939db3..ece0cc3 100644
--- a/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
+++ b/stack/m2/repository/com/github/fernandospr/java-wns/1.3.1-USERGRID/java-wns-1.3.1-USERGRID.pom
@@ -41,26 +41,21 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>1.19</version>
- </dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
- <version>2.16</version>
+ <version>2.22.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-xml-provider</artifactId>
+ <version>2.3.3</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-xml-provider</artifactId>
- <version>2.3.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.3.3</version>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.3.3</version>
</dependency>
</dependencies>