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/03/01 22:20:39 UTC
[1/4] git commit: Add RAT exclusions for tmp directories and Netbeans
files.
Repository: incubator-usergrid
Updated Branches:
refs/pull/63/merge 15efd0ff5 -> 526aeb9b0 (forced update)
Add RAT exclusions for tmp directories and Netbeans files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/530a3500
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/530a3500
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/530a3500
Branch: refs/pull/63/merge
Commit: 530a350089626e04574680199ae2cd5017192fb7
Parents: f368246
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Mar 1 14:38:29 2014 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Mar 1 14:38:29 2014 -0500
----------------------------------------------------------------------
stack/pom.xml | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/530a3500/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 6d833d2..bdf2137 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1765,27 +1765,37 @@
</executions>
<configuration>
<excludes>
- <exclude>.idea/**</exclude>
- <exclude>.git/**</exclude>
- <exclude>m2/**</exclude>
- <exclude>.gitignore</exclude>
+
+ <exclude>**/README.md</exclude>
+ <exclude>**/CHANGES.txt</exclude>
+
+ <!-- git and IDE project files -->
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**..idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/nbactions.xml</exclude>
+ <exclude>**/nb-configuration.xml</exclude>
<exclude>**/.classpath/**</exclude>
<exclude>**/.project</exclude>
- <exclude>**/*.iml</exclude>
<exclude>**/.settings/**</exclude>
- <exclude>**/*.asc</exclude>
+
+ <!-- temporary build files -->
<exclude>**/logs/**</exclude>
<exclude>**/docs/**</exclude>
- <exclude>CHANGES.txt</exclude>
- <exclude>cloudbees.xml</exclude>
- <exclude>README.md</exclude>
- <exclude>**/src/test/resources/**</exclude>
- <exclude>**dependency-reduced-pom.xml</exclude>
- <exclude>**/src/test/resources/*.txt</exclude>
+ <exclude>**/tmp/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/antlr3/**</exclude>
<exclude>**/META-INF/**</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/QueryFilter.tokens</exclude>
+
+ <!-- other -->
+ <exclude>**/m2/**</exclude>
+ <exclude>**/*.asc</exclude>
+ <exclude>**/src/test/resources/**</exclude>
+ <exclude>**/cloudbees.xml</exclude>
+
</excludes>
</configuration>
[2/4] git commit: Move SimpleService test class to correct package
(not sure why this was not breaking everybody's build).
Posted by sn...@apache.org.
Move SimpleService test class to correct package (not sure why this was not breaking everybody's build).
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/06070831
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/06070831
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/06070831
Branch: refs/pull/63/merge
Commit: 0607083134c13eb0ae883cb520b8532e06548be8
Parents: 530a350
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Mar 1 14:39:25 2014 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Mar 1 14:39:25 2014 -0500
----------------------------------------------------------------------
.../usergrid/services/ServiceFactoryIT.java | 2 +-
.../usergrid/services/simple/SimpleService.java | 33 ++++++++++++++++++++
.../java/org/usergrid/simple/SimpleService.java | 33 --------------------
3 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/06070831/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java b/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java
index 9781050..0ea0538 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.usergrid.cassandra.Concurrent;
-import org.usergrid.simple.SimpleService;
+import org.apache.usergrid.services.simple.SimpleService;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/06070831/stack/services/src/test/java/org/apache/usergrid/services/simple/SimpleService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/simple/SimpleService.java b/stack/services/src/test/java/org/apache/usergrid/services/simple/SimpleService.java
new file mode 100644
index 0000000..630898f
--- /dev/null
+++ b/stack/services/src/test/java/org/apache/usergrid/services/simple/SimpleService.java
@@ -0,0 +1,33 @@
+/*
+ * 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.services.simple;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.usergrid.services.AbstractCollectionService;
+
+
+public class SimpleService extends AbstractCollectionService {
+
+ private static final Logger logger = LoggerFactory.getLogger( SimpleService.class );
+
+
+ public SimpleService() {
+ super();
+ logger.info( "/simple" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/06070831/stack/services/src/test/java/org/usergrid/simple/SimpleService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/simple/SimpleService.java b/stack/services/src/test/java/org/usergrid/simple/SimpleService.java
deleted file mode 100644
index a132bc3..0000000
--- a/stack/services/src/test/java/org/usergrid/simple/SimpleService.java
+++ /dev/null
@@ -1,33 +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.usergrid.simple;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.usergrid.services.AbstractCollectionService;
-
-
-public class SimpleService extends AbstractCollectionService {
-
- private static final Logger logger = LoggerFactory.getLogger( SimpleService.class );
-
-
- public SimpleService() {
- super();
- logger.info( "/simple" );
- }
-}
[3/4] git commit: Merge pull request #64 from usergrid/rat-fix
Posted by sn...@apache.org.
Merge pull request #64 from usergrid/rat-fix
Fix for build breakage caused by RAT
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2474350b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2474350b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2474350b
Branch: refs/pull/63/merge
Commit: 2474350bb1fd7e0c30d67790c42983e1504c04d5
Parents: f368246 0607083
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Sat Mar 1 13:05:09 2014 -0700
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Sat Mar 1 13:05:09 2014 -0700
----------------------------------------------------------------------
stack/pom.xml | 34 +++++++++++++-------
.../usergrid/services/ServiceFactoryIT.java | 2 +-
.../usergrid/services/simple/SimpleService.java | 33 +++++++++++++++++++
.../java/org/usergrid/simple/SimpleService.java | 33 -------------------
4 files changed, 56 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
[4/4] git commit: Merge d72910d33e4e8e2f0e454b13da6d27148cc3fe66 into
2474350bb1fd7e0c30d67790c42983e1504c04d5
Posted by sn...@apache.org.
Merge d72910d33e4e8e2f0e454b13da6d27148cc3fe66 into 2474350bb1fd7e0c30d67790c42983e1504c04d5
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/526aeb9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/526aeb9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/526aeb9b
Branch: refs/pull/63/merge
Commit: 526aeb9b0fa98851f5f7c5cb10aa322f4d3e07d5
Parents: 2474350 d72910d
Author: Ben Brooks <be...@benbrooks.net>
Authored: Sat Mar 1 13:04:05 2014 -0800
Committer: Ben Brooks <be...@benbrooks.net>
Committed: Sat Mar 1 13:04:05 2014 -0800
----------------------------------------------------------------------
sdks/php/lib/vendor/Apigee/Usergrid/Collection.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------