You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/14 23:00:25 UTC
[01/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Repository: incubator-usergrid
Updated Branches:
refs/heads/cloudformation-update [created] aca79b63f
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/aa2b1da3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/aa2b1da3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/aa2b1da3
Branch: refs/heads/cloudformation-update
Commit: aa2b1da34691525918dd45d3843ebf6d426b64f1
Parents: d1dc7cd b2b8886
Author: amuramoto <am...@apigee.com>
Authored: Wed Oct 1 23:53:26 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Wed Oct 1 23:53:26 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 519 +++++++++++++++----
.../corepersistence/CpEntityManagerFactory.java | 495 ++++++++----------
.../corepersistence/CpRelationManager.java | 356 +++++--------
.../usergrid/corepersistence/CpSetup.java | 55 +-
.../HybridEntityManagerFactory.java | 18 +-
.../persistence/EntityManagerFactory.java | 12 +-
.../persistence/cassandra/CassandraService.java | 5 -
.../cassandra/EntityManagerFactoryImpl.java | 54 +-
.../PerformanceEntityRebuildIndexTest.java | 278 ++++++++++
.../cassandra/EntityManagerFactoryImplIT.java | 10 +-
stack/core/src/test/resources/log4j.properties | 13 +-
.../usergrid/persistence/index/IndexFig.java | 7 +
.../index/impl/EsEntityIndexImpl.java | 18 +
.../persistence/index/impl/EsProvider.java | 15 +
.../org/apache/usergrid/tools/IndexRebuild.java | 63 ++-
stack/tools/src/main/resources/log4j.properties | 18 +-
16 files changed, 1206 insertions(+), 730 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa2b1da3/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
[08/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/275f10a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/275f10a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/275f10a3
Branch: refs/heads/cloudformation-update
Commit: 275f10a38d6604be3c321ddce0f8d6f627cc56f0
Parents: 7fc56f7 185ecef
Author: amuramoto <am...@apigee.com>
Authored: Wed Oct 8 19:58:56 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Wed Oct 8 19:58:56 2014 -0700
----------------------------------------------------------------------
.../persistence/entities/Notification.java | 13 ++
.../corepersistence/StaleIndexCleanupTest.java | 181 ++++++++++++++
.../collection/EntityCollectionManager.java | 5 +
.../collection/guice/CollectionModule.java | 5 +-
.../impl/EntityCollectionManagerImpl.java | 44 ++--
.../mvcc/entity/MvccValidationUtils.java | 3 +
.../mvcc/event/PostProcessObserver.java | 39 ----
.../mvcc/stage/delete/MarkCommit.java | 153 ++++++------
.../mvcc/stage/write/EntityVersion.java | 64 -----
.../stage/write/EntityVersionSerializer.java | 71 ------
.../mvcc/stage/write/FieldSerializer.java | 107 ---------
.../mvcc/stage/write/RollbackAction.java | 7 +-
.../mvcc/stage/write/UniqueValue.java | 39 ----
.../mvcc/stage/write/UniqueValueImpl.java | 124 ----------
.../write/UniqueValueSerializationStrategy.java | 66 ------
.../UniqueValueSerializationStrategyImpl.java | 194 ---------------
.../mvcc/stage/write/WriteCommit.java | 12 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 10 +-
.../collection/mvcc/stage/write/WriteStart.java | 9 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 207 ++++++++--------
.../collection/serialization/UniqueValue.java | 49 ++++
.../UniqueValueSerializationStrategy.java | 68 ++++++
.../serialization/UniqueValueSet.java | 32 +++
.../serialization/impl/EntityVersion.java | 64 +++++
.../impl/EntityVersionSerializer.java | 81 +++++++
.../serialization/impl/FieldSerializer.java | 117 ++++++++++
.../MvccEntitySerializationStrategyImpl.java | 9 +-
.../serialization/impl/SerializationModule.java | 3 +-
.../serialization/impl/UniqueValueImpl.java | 114 +++++++++
.../UniqueValueSerializationStrategyImpl.java | 233 +++++++++++++++++++
.../serialization/impl/UniqueValueSetImpl.java | 85 +++++++
.../persistence/collection/util/RepairUtil.java | 33 +--
.../collection/EntityCollectionManagerIT.java | 61 ++++-
.../mvcc/stage/delete/MarkCommitTest.java | 10 +-
.../write/EntityVersionSerializerTest.java | 2 +
.../mvcc/stage/write/FieldSerializerTest.java | 1 +
...niqueValueSerializationStrategyImplTest.java | 64 +++--
.../mvcc/stage/write/WriteCommitTest.java | 1 +
.../stage/write/WriteOptimisticVerifyTest.java | 31 +--
.../stage/write/WriteUniqueVerifyStageTest.java | 48 ----
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 56 ++---
.../persistence/model/field/AbstractField.java | 4 +
.../persistence/model/field/ArrayField.java | 3 +
.../persistence/model/field/BooleanField.java | 6 +
.../persistence/model/field/ByteArrayField.java | 6 +
.../persistence/model/field/DoubleField.java | 6 +
.../model/field/EntityObjectField.java | 6 +
.../usergrid/persistence/model/field/Field.java | 8 +
.../persistence/model/field/FieldTypeName.java | 42 ++++
.../persistence/model/field/FloatField.java | 6 +
.../persistence/model/field/IntegerField.java | 6 +
.../persistence/model/field/ListField.java | 7 +
.../persistence/model/field/LocationField.java | 6 +
.../persistence/model/field/LongField.java | 6 +
.../persistence/model/field/SetField.java | 6 +
.../persistence/model/field/StringField.java | 6 +
.../persistence/model/field/UUIDField.java | 6 +
stack/corepersistence/pom.xml | 4 +-
.../persistence/index/EntityIndexBatch.java | 3 +
.../queue/impl/SQSQueueManagerImpl.java | 2 +-
.../notifications/ApplicationQueueManager.java | 12 +-
.../services/notifications/TaskManager.java | 102 ++++----
.../apns/NotificationsServiceIT.java | 12 +
.../gcm/NotificationsServiceIT.java | 10 +
64 files changed, 1643 insertions(+), 1147 deletions(-)
----------------------------------------------------------------------
[11/23] git commit: separated ES from C* in cloudformation
template/scripts
Posted by to...@apache.org.
separated ES from C* in cloudformation template/scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/112661a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/112661a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/112661a0
Branch: refs/heads/cloudformation-update
Commit: 112661a0799334c792641fa917b77d205ee8c9a6
Parents: 43acfad
Author: amuramoto <am...@apigee.com>
Authored: Fri Oct 10 12:35:45 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Fri Oct 10 12:35:45 2014 -0700
----------------------------------------------------------------------
.../main/dist/init_instance/init_db_server.sh | 4 -
.../main/dist/init_instance/init_es_server.sh | 61 +++++
stack/awscluster/ugcluster-cf.json | 243 ++++++++++++++++++-
3 files changed, 303 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/112661a0/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_db_server.sh b/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
index b9c4f56..a37bb82 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
@@ -59,10 +59,6 @@ cd /usr/share/usergrid/init_instance
cd /usr/share/usergrid/init_instance
./install_opscenter_agent.sh
-# Install and start ElasticSearch
-cd /usr/share/usergrid/init_instance
-./install_elasticsearch.sh
-
# Use the CQL to crate the keyspaces
cd /usr/share/usergrid/init_instance
./create_keyspaces.sh
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/112661a0/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_es_server.sh b/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
new file mode 100644
index 0000000..c187cb8
--- /dev/null
+++ b/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+#
+# 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.
+#
+
+echo "${HOSTNAME}" > /etc/hostname
+echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
+hostname `cat /etc/hostname`
+
+echo "US/Eastern" > /etc/timezone
+dpkg-reconfigure -f noninteractive tzdata
+
+# Build environment for scripts
+. /etc/profile.d/aws-credentials.sh
+. /etc/profile.d/usergrid-env.sh
+
+cd /usr/share/usergrid/init_instance
+./create_raid0.sh
+
+# Install the easy stuff
+PKGS="ntp unzip groovy curl"
+apt-get update
+apt-get -y --force-yes install ${PKGS}
+/etc/init.d/tomcat7 stop
+
+# Install AWS Java SDK and get it into the Groovy classpath
+curl http://sdk-for-java.amazonwebservices.com/latest/aws-java-sdk.zip > /tmp/aws-sdk-java.zip
+cd /usr/share/
+unzip /tmp/aws-sdk-java.zip
+mkdir -p /home/ubuntu/.groovy/lib
+cp /usr/share/aws-java-sdk-*/third-party/*/*.jar /home/ubuntu/.groovy/lib
+cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib
+# except for evil stax
+rm /home/ubuntu/.groovy/lib/stax*
+ln -s /home/ubuntu/.groovy /root/.groovy
+
+cd /usr/share/usergrid/init_instance
+./install_oraclejdk.sh
+
+# Install and start ElasticSearch
+cd /usr/share/usergrid/init_instance
+./install_elasticsearch.sh
+
+# tag last so we can see in the console that the script ran to completion
+cd /usr/share/usergrid/scripts
+groovy tag_instance.groovy
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/112661a0/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 67c081a..31950a2 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -84,6 +84,28 @@
"Default": "3",
"MinValue": "1"
},
+ "ESNumServers": {
+ "Description": "Number of ES servers to start.",
+ "Type": "Number",
+ "Default": "3",
+ "MinValue": "1"
+ },
+ "ESInstanceType": {
+ "Description": "Instance type for ES servers",
+ "Type": "String",
+ "Default": "c3.2xlarge",
+ "AllowedValues": [
+ "m1.small",
+ "m1.medium",
+ "m1.large",
+ "m1.xlarge",
+ "m3.xlarge",
+ "m3.2xlarge",
+ "c3.2xlarge",
+ "c3.4xlarge"
+ ],
+ "ConstraintDescription": "must be valid instance type."
+ },
"SuperUserEmail": {
"Description": "Email for superuser user",
"Type": "String",
@@ -429,6 +451,34 @@
}
}
},
+ "ESUser": {
+ "Type": "AWS::IAM::User",
+ "Properties": {
+ "Path": "/",
+ "Policies": [
+ {
+ "PolicyName": "root",
+ "PolicyDocument": {
+ "Statement": [
+ {
+ "Effect": "Allow",
+ "Action": "*",
+ "Resource": "*"
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "ESKey": {
+ "Type": "AWS::IAM::AccessKey",
+ "Properties": {
+ "UserName": {
+ "Ref": "CassUser"
+ }
+ }
+ },
"CassAutoScalingLaunchConfiguration":{
"Type":"AWS::AutoScaling::LaunchConfiguration",
"Properties":{
@@ -588,6 +638,155 @@
}
}
},
+ "ESAutoScalingLaunchConfiguration":{
+ "Type":"AWS::AutoScaling::LaunchConfiguration",
+ "Properties":{
+ "UserData":{
+ "Fn::Base64":{
+ "Fn::Join":[
+ "",
+ [
+ "#!/bin/bash -ex\n",
+ "# ES NODE STARTUP \n",
+ "exec >/var/log/usergrid-bootstrap.log 2>&1\n",
+ "\n",
+ "mkdir -p /usr/share/usergrid\n",
+ "\n",
+ "# create script that sets our environment variables\n",
+ "cat >/etc/profile.d/usergrid-env.sh <<EOF\n",
+ "alias sudo='sudo -E'\n", "\n",
+ "export TYPE=es\n",
+ "export STACK_NAME=", { "Ref":"AWS::StackName" }, "\n", "\n",
+ "export PUBLIC_HOSTNAME=`(curl -s http://169.254.169.254/latest/meta-data/public-hostname)`\n",
+ "export INTERNAL_HOSTNAME=`(curl http://169.254.169.254/latest/meta-data/local-ipv4)`\n",
+ "\n",
+ "export EC2_INSTANCE_ID=`ec2metadata --instance-id`\n",
+ "export EC2_REGION=", { "Ref":"AWS::Region" },
+ "\n",
+ "export EC2_URL=https://ec2.amazonaws.com/\n",
+ "\n",
+ "export ES_SECURITY_GROUP_NAME=", { "Ref":"ESSecurityGroup" }, "\n",
+ "\n",
+ "\n",
+ "export ES_NUM_SERVERS=", { "Ref":"ESNumServers" }, "\n",
+ "export GRAPHITE_NUM_SERVERS=", { "Ref":"GraphiteNumServers" }, "\n",
+ "\n",
+ "export RELEASE_BUCKET=", { "Ref":"ReleaseBucket" }, "\n",
+ "\n",
+ "EOF\n",
+ "\n",
+ "# put AWS creds in environment\n",
+ "cat >/etc/profile.d/aws-credentials.sh <<EOF\n",
+ "export AWS_ACCESS_KEY=", { "Ref":"ESKey" }, "\n",
+ "export AWS_SECRET_KEY=", { "Fn::GetAtt":[ "ESKey", "SecretAccessKey" ] }, "\n",
+ "EOF\n",
+ "\n",
+ "# setup s3cmd (will be installed by init script) \n",
+ "cat >/etc/s3cfg <<EOF\n",
+ "access_key=", { "Ref":"ESKey" }, "\n",
+ "secret_key=", { "Fn::GetAtt":[ "ESKey", "SecretAccessKey" ] },
+ "\n",
+ "EOF\n",
+ "chmod 644 /etc/s3cfg\n",
+ "ln -s /etc/s3cfg ~ubuntu/.s3cfg\n",
+ "ln -s /etc/s3cfg ~root/.s3cfg\n",
+ "\n",
+ "# download usergrid and init script bundle from S3\n",
+ "wget -O- -q http://s3tools.org/repo/deb-all/stable/s3tools.key | apt-key add -\n",
+ "wget -O/etc/apt/sources.list.d/s3tools.list http://s3tools.org/repo/deb-all/stable/s3tools.list\n",
+ "apt-get update\n",
+ "apt-get -y install s3cmd\n",
+ "cd /usr/share/usergrid\n",
+ "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "chmod 755 ./init_instance/*.sh\n",
+ "cd ./init_instance\n",
+ "# init as an ES node \n",
+ "sh ./init_es_server.sh\n"
+ ]
+ ]
+ }
+ },
+ "KeyName": {
+ "Ref": "KeyPair"
+ },
+ "ImageId": {
+ "Fn::FindInMap": [
+ "AWSRegionArch2AMI",
+ {
+ "Ref": "AWS::Region"
+ },
+ {
+ "Fn::FindInMap": [
+ "AWSInstanceType2Arch",
+ {
+ "Ref": "CassInstanceType"
+ },
+ "Arch"
+ ]
+ }
+ ]
+ },
+ "InstanceType": {
+ "Ref": "ESInstanceType"
+ },
+ "IamInstanceProfile": {
+ "Ref": "RootInstanceProfile"
+ },
+ "SecurityGroups": [
+ {
+ "Ref": "ESSecurityGroup"
+ }
+ ]
+ }
+ },
+ "ESAutoScalingGroup": {
+ "Type": "AWS::AutoScaling::AutoScalingGroup",
+ "Version": "2009-05-15",
+ "Properties": {
+ "AvailabilityZones": [
+ {
+ "Fn::FindInMap": [
+ "TwoAZs",
+ {
+ "Ref": "AWS::Region"
+ },
+ "AZ1"
+ ]
+ },
+ {
+ "Fn::FindInMap": [
+ "TwoAZs",
+ {
+ "Ref": "AWS::Region"
+ },
+ "AZ2"
+ ]
+ }
+ ],
+ "LaunchConfigurationName": {
+ "Ref": "ESAutoScalingLaunchConfiguration"
+ },
+ "MinSize": {
+ "Ref": "ESNumServers"
+ },
+ "MaxSize": {
+ "Ref": "ESNumServers"
+ },
+ "NotificationConfiguration": {
+ "TopicARN": {
+ "Ref": "NotificationTopic"
+ },
+ "NotificationTypes": [
+ "autoscaling:EC2_INSTANCE_LAUNCH",
+ "autoscaling:EC2_INSTANCE_LAUNCH_ERROR",
+ "autoscaling:EC2_INSTANCE_TERMINATE",
+ "autoscaling:EC2_INSTANCE_TERMINATE_ERROR"
+ ]
+ }
+ }
+ },
"RestAutoScalingLaunchConfiguration":{
"Type":"AWS::AutoScaling::LaunchConfiguration",
"Properties":{
@@ -980,6 +1179,34 @@
]
}
},
+ "ESSecurityGroup": {
+ "Type": "AWS::EC2::SecurityGroup",
+ "Properties": {
+ "GroupDescription": "ElasticSearch Machines",
+ "SecurityGroupIngress": [
+ {
+ "IpProtocol": "tcp",
+ "FromPort": "22",
+ "ToPort": "22",
+ "CidrIp": "0.0.0.0/0"
+ }
+ ]
+ }
+ },
+ "AllowCassToESOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "ESSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "1",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "CassSecurityGroup"
+ }
+ }
+ },
"CassSecurityGroup": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
@@ -993,7 +1220,7 @@
}
]
}
- },
+ },
"AllowCassToCassOnAllPorts": {
"Type": "AWS::EC2::SecurityGroupIngress",
"Properties": {
@@ -1102,6 +1329,20 @@
]
}
},
+ "AllowESToGraphiteAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "GraphiteSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "0",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "ESSecurityGroup"
+ }
+ }
+ },
"AllowCassToGraphiteAllPorts": {
"Type": "AWS::EC2::SecurityGroupIngress",
"Properties": {
[06/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fc7140e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fc7140e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fc7140e4
Branch: refs/heads/cloudformation-update
Commit: fc7140e4ac0f7dc2b91730a638c078dbcb604842
Parents: 519a6d8 bdb9795
Author: amuramoto <am...@apigee.com>
Authored: Tue Oct 7 10:03:45 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Tue Oct 7 10:03:45 2014 -0700
----------------------------------------------------------------------
.../CpEntityIndexDeleteListener.java | 23 +-
.../corepersistence/CpEntityManager.java | 45 +++-
.../corepersistence/CpEntityManagerFactory.java | 5 +-
.../corepersistence/CpManagerCache.java | 29 ++-
.../usergrid/corepersistence/GuiceModule.java | 12 +-
.../usergrid/persistence/map/MapManager.java | 1 -
.../persistence/map/MapManagerFactory.java | 2 +-
.../persistence/map/impl/MapManagerImpl.java | 24 ---
.../persistence/map/impl/MapScopeImpl.java | 1 -
.../map/impl/MapSerializationImpl.java | 48 +++--
.../persistence/map/MapManagerTest.java | 21 +-
.../index/impl/EsEntityIndexImpl.java | 208 ++++++++++---------
.../notifications/ApplicationQueueManager.java | 11 +-
.../notifications/NotificationsService.java | 3 +-
.../services/notifications/QueueListener.java | 8 +-
.../services/notifications/TaskManager.java | 22 +-
.../usergrid/services/TestQueueManager.java | 67 ++++++
.../AbstractServiceNotificationIT.java | 1 -
.../apns/NotificationsServiceIT.java | 9 +-
.../gcm/NotificationsServiceIT.java | 7 +-
20 files changed, 333 insertions(+), 214 deletions(-)
----------------------------------------------------------------------
[19/23] git commit: more cloudformation updates
Posted by to...@apache.org.
more cloudformation updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b33ecccb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b33ecccb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b33ecccb
Branch: refs/heads/cloudformation-update
Commit: b33ecccbb8415f3a9e3ba039692fbc57a4b68656
Parents: 60096b6
Author: amuramoto <am...@apigee.com>
Authored: Sun Oct 12 03:52:33 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Sun Oct 12 03:52:33 2014 -0700
----------------------------------------------------------------------
stack/awscluster/ugcluster-cf.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b33ecccb/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 93c7e86..5688d6b 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -668,7 +668,7 @@
"export ES_SECURITY_GROUP_NAME=", { "Ref":"ESSecurityGroup" }, "\n",
"\n",
"\n",
- "export ES_CLUSTER_NAME=", { "Ref":"CassClusterName" }, "\n",
+ "export ES_CLUSTER_NAME=", { "Ref":"ESClusterName" }, "\n",
"export ES_NUM_SERVERS=", { "Ref":"ESNumServers" }, "\n",
"export GRAPHITE_NUM_SERVERS=", { "Ref":"GraphiteNumServers" }, "\n",
"\n",
[17/23] git commit: more cloudformation updates
Posted by to...@apache.org.
more cloudformation updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/59fed6a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/59fed6a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/59fed6a1
Branch: refs/heads/cloudformation-update
Commit: 59fed6a1ac56f627c29eb54112649700124b523e
Parents: dd4f117
Author: amuramoto <am...@apigee.com>
Authored: Sun Oct 12 03:42:58 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Sun Oct 12 03:42:58 2014 -0700
----------------------------------------------------------------------
.../src/main/dist/init_instance/install_elasticsearch.sh | 4 ++--
stack/awscluster/ugcluster-cf.json | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/59fed6a1/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
index dc7ee8f..d6e4285 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
@@ -39,8 +39,8 @@ chown elasticsearch /mnt/log/elasticsearch
cd /usr/share/usergrid/scripts
# No need to do this, elasticsearch nodes are also cassandra nodes
-#groovy registry_register.groovy elasticsearch
-#groovy wait_for_instances.groovy elasticsearch ${CASSANDRA_NUM_SERVERS}
+groovy registry_register.groovy elasticsearch
+groovy wait_for_instances.groovy elasticsearch ${ES_NUM_SERVERS}
# leave room for Cassandra: use about one half of RAM for heap
case `(curl http://169.254.169.254/latest/meta-data/instance-type)` in
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/59fed6a1/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 197eb6c..93c7e86 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -668,6 +668,7 @@
"export ES_SECURITY_GROUP_NAME=", { "Ref":"ESSecurityGroup" }, "\n",
"\n",
"\n",
+ "export ES_CLUSTER_NAME=", { "Ref":"CassClusterName" }, "\n",
"export ES_NUM_SERVERS=", { "Ref":"ESNumServers" }, "\n",
"export GRAPHITE_NUM_SERVERS=", { "Ref":"GraphiteNumServers" }, "\n",
"\n",
[20/23] git commit: more cloudoformation updates
Posted by to...@apache.org.
more cloudoformation updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ad45789b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ad45789b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ad45789b
Branch: refs/heads/cloudformation-update
Commit: ad45789b0b4847e19487db8ff85f71675db4239d
Parents: b33eccc
Author: amuramoto <am...@apigee.com>
Authored: Sun Oct 12 03:59:43 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Sun Oct 12 03:59:43 2014 -0700
----------------------------------------------------------------------
stack/awscluster/ugcluster-cf.json | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ad45789b/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 5688d6b..5b0a87d 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -84,6 +84,11 @@
"Default": "3",
"MinValue": "1"
},
+ "ESClusterName": {
+ "Description": "Name to be used for Elasticsearch cluster.",
+ "Type": "String",
+ "Default": "usergrid"
+ },
"ESNumServers": {
"Description": "Number of ES servers to start.",
"Type": "Number",
[21/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into cloudformation-update
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/25770fee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/25770fee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/25770fee
Branch: refs/heads/cloudformation-update
Commit: 25770fee8b92e705a694548a2792256c72c29063
Parents: ad45789 c88282b
Author: amuramoto <am...@apigee.com>
Authored: Mon Oct 13 13:50:41 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Mon Oct 13 13:50:41 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 9 +++--
.../corepersistence/CpEntityManagerFactory.java | 13 ++++---
.../corepersistence/CpRelationManager.java | 2 ++
.../results/FilteringLoader.java | 13 +++++--
.../PerformanceEntityRebuildIndexTest.java | 2 ++
.../query/AbstractIteratingQueryIT.java | 3 ++
.../persistence/index/impl/IndexScopeImpl.java | 37 ++++++++++++++++++++
.../queue/impl/SQSQueueManagerImpl.java | 12 +++++--
.../usergrid/services/TestQueueManager.java | 4 +--
.../notifications/NotifiersServiceIT.java | 1 +
10 files changed, 82 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[07/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7fc56f75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7fc56f75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7fc56f75
Branch: refs/heads/cloudformation-update
Commit: 7fc56f7568c663741f7e94e9bd6f2b42394e8283
Parents: fc7140e 3547f2c
Author: amuramoto <am...@apigee.com>
Authored: Tue Oct 7 13:37:41 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Tue Oct 7 13:37:41 2014 -0700
----------------------------------------------------------------------
.../core/util/AvailablePortFinder.java | 188 -------------------
.../queue/impl/SQSQueueManagerImpl.java | 33 +++-
.../notifications/ApplicationQueueManager.java | 11 +-
.../services/notifications/QueueListener.java | 14 +-
.../services/notifications/TaskManager.java | 11 +-
5 files changed, 47 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
[16/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into cloudformation-update
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dd4f1177
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dd4f1177
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dd4f1177
Branch: refs/heads/cloudformation-update
Commit: dd4f1177d7de5f5b48bb28dd71dc6db5186128c8
Parents: f3fddfe b866414
Author: amuramoto <am...@apigee.com>
Authored: Sun Oct 12 01:37:11 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Sun Oct 12 01:37:11 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/usergrid/services/ServiceManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[22/23] git commit: more cloudformation updates
Posted by to...@apache.org.
more cloudformation updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/43818842
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/43818842
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/43818842
Branch: refs/heads/cloudformation-update
Commit: 4381884262c6e5f9ea98b2edc6980400e82cc821
Parents: 25770fe
Author: amuramoto <am...@apigee.com>
Authored: Mon Oct 13 13:56:36 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Mon Oct 13 13:56:36 2014 -0700
----------------------------------------------------------------------
.../main/dist/init_instance/init_rest_server.sh | 5 ++++-
.../dist/init_instance/install_elasticsearch.sh | 2 +-
.../main/groovy/configure_elasticsearch.groovy | 19 +++++++++++++++----
3 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/43818842/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
index 5bb994c..96da354 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
@@ -123,6 +123,7 @@ EOF
# wait for enough Cassandra nodes then delpoy and configure Usergrid
cd /usr/share/usergrid/scripts
groovy wait_for_instances.groovy cassandra ${CASSANDRA_NUM_SERVERS}
+groovy wait_for_instances.groovy elasticsearch ${ES_NUM_SERVERS}
groovy wait_for_instances.groovy graphite ${GRAPHITE_NUM_SERVERS}
# link WAR and Portal into Tomcat's webapps dir
@@ -137,9 +138,11 @@ mkdir -p /usr/share/tomcat7/lib
groovy configure_usergrid.groovy > /usr/share/tomcat7/lib/usergrid-deployment.properties
groovy configure_portal_new.groovy >> /var/lib/tomcat7/webapps/portal/config.js
+sudo sed -i '98i export CATALINA_OPTS=\"-DAWS_SECRET_KEY=${AWS_SECRET_KEY} -DAWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY} ${CATALINA_OPTS}\"' /usr/share/tomcat7/bin/catalina.sh
+
# Go
sh /etc/init.d/tomcat7 start
# tag last so we can see in the console that the script ran to completion
cd /usr/share/usergrid/scripts
-groovy tag_instance.groovy
+groovy tag_instance.groovy
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/43818842/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
index d6e4285..e5c6473 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
@@ -78,7 +78,7 @@ case `(curl http://169.254.169.254/latest/meta-data/instance-type)` in
;;
'c3.4xlarge' )
# total of 30g
- export ES_HEAP_SIZE=15g
+ export ES_HEAP_SIZE=24g
esac
cat >> /etc/default/elasticsearch << EOF
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/43818842/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
index ceddcbe..549a23b 100644
--- a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
+++ b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
@@ -19,9 +19,9 @@
//
-// configure_cassandra.groovy
+// configure_elasticsearch.groovy
//
-// Emits Cassandra config file based on environment and Cassandra node
+// Emits Elasticsearch config file based on environment and Elasticsearch node
// registry in SimpleDB
//
@@ -34,8 +34,7 @@ def clusterName = (String)System.getenv().get("ES_CLUSTER_NAME")
NodeRegistry registry = new NodeRegistry();
-// build seed list by listing all Cassandra nodes found in SimpleDB domain with our stackName
-// works because cassandra nodes are also elasticsearch nodes
+// build seed list by listing all Elasticsearch nodes found in SimpleDB domain with our stackName
def selectResult = registry.searchNode('elasticsearch')
def esnodes = ""
def sep = ""
@@ -46,6 +45,7 @@ for (hostname in selectResult) {
def elasticSearchConfig = """
cluster.name: ${clusterName}
+discovery.zen.minimum_master_nodes: 4
discovery.zen.ping.multicast.enabled: false
discovery.zen.ping.unicast.hosts: [${esnodes}]
node:
@@ -55,6 +55,17 @@ network:
path:
logs: /mnt/log/elasticsearch
data: /mnt/data/elasticsearch
+bootstrap.mlockall: true
+threadpool.index.type: fixed
+threadpool.index.size: 160
+threadpool.index.queue_size: 401
+threadpool.bulk.type: fixed
+threadpool.bulk.size: 160
+threadpool.bulk.queue_size: 800
+
+action.auto_create_index: false
+
+action.disable_delete_all_indices: true
"""
println elasticSearchConfig
[03/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/231b674e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/231b674e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/231b674e
Branch: refs/heads/cloudformation-update
Commit: 231b674ef2bb95ce2263b3e7c2e79a163f5712c2
Parents: 804e8be b644cc0
Author: amuramoto <am...@apigee.com>
Authored: Thu Oct 2 09:08:03 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Thu Oct 2 09:08:03 2014 -0700
----------------------------------------------------------------------
.../CpEntityIndexDeleteListener.java | 11 +-
.../corepersistence/CpEntityManager.java | 239 +++----
.../corepersistence/CpEntityManagerFactory.java | 29 +-
.../corepersistence/CpManagerCache.java | 12 +-
.../usergrid/corepersistence/CpNamingUtils.java | 106 ++++
.../corepersistence/CpRelationManager.java | 229 +++----
.../CpEntityIndexDeleteListenerTest.java | 18 +-
.../PerformanceEntityRebuildIndexTest.java | 7 +-
.../collection/impl/CollectionScopeImpl.java | 6 +-
.../core/scope/ApplicationScopeImpl.java | 6 +-
.../serialization/EdgeSerializationTest.java | 3 +
.../usergrid/persistence/index/EntityIndex.java | 38 +-
.../persistence/index/EntityIndexBatch.java | 71 +++
.../persistence/index/EntityIndexFactory.java | 4 +-
.../usergrid/persistence/index/IndexScope.java | 2 +-
.../index/impl/EsEntityIndexBatchImpl.java | 396 ++++++++++++
.../index/impl/EsEntityIndexImpl.java | 628 ++++---------------
.../persistence/index/impl/EsQueryVistor.java | 35 +-
.../persistence/index/impl/IndexScopeImpl.java | 8 +-
.../persistence/index/impl/IndexingUtils.java | 107 ++++
.../index/utils/IndexValidationUtils.java | 3 +-
.../index/impl/CorePerformanceIT.java | 97 +--
.../impl/EntityConnectionIndexImplTest.java | 16 +-
.../persistence/index/impl/EntityIndexTest.java | 144 +++--
stack/pom.xml | 2 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 9 +-
26 files changed, 1259 insertions(+), 967 deletions(-)
----------------------------------------------------------------------
[02/23] git commit: Removed unnecessary refreshIndex from
cpEntityManager.update()
Posted by to...@apache.org.
Removed unnecessary refreshIndex from cpEntityManager.update()
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/804e8be5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/804e8be5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/804e8be5
Branch: refs/heads/cloudformation-update
Commit: 804e8be5a5f8b6223b24c524e6768edadc911750
Parents: aa2b1da
Author: amuramoto <am...@apigee.com>
Authored: Wed Oct 1 23:57:37 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Wed Oct 1 23:57:37 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/corepersistence/CpEntityManager.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/804e8be5/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 61e43e2..f24a9a9 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -568,7 +568,6 @@ public class CpEntityManager implements EntityManager {
cpEntity.getId().getType(), cpEntity.getId().getUuid(), cpEntity.getVersion() });
cpEntity = ecm.update( cpEntity ).toBlockingObservable().last();
- refreshIndex();
cpEntity = ecm.load( entityId ).toBlockingObservable().last();
logger.debug("Wrote {}:{} version {}", new Object[] {
[05/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/519a6d83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/519a6d83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/519a6d83
Branch: refs/heads/cloudformation-update
Commit: 519a6d835f04aa043e43a56806eadd0f54864344
Parents: 30ba9ac c40aecb
Author: amuramoto <am...@apigee.com>
Authored: Mon Oct 6 15:40:54 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Mon Oct 6 15:40:54 2014 -0700
----------------------------------------------------------------------
stack/core/pom.xml | 15 +
.../usergrid/corepersistence/GuiceModule.java | 4 +
.../collection/event/EntityDeleted.java | 17 +
.../collection/event/EntityVersionCreated.java | 17 +
.../collection/event/EntityVersionDeleted.java | 17 +
stack/corepersistence/map/pom.xml | 81 +++++
.../usergrid/persistence/map/MapManager.java | 69 ++++
.../persistence/map/MapManagerFactory.java | 30 ++
.../usergrid/persistence/map/MapScope.java | 40 +++
.../persistence/map/guice/MapModule.java | 61 ++++
.../persistence/map/impl/MapManagerImpl.java | 114 +++++++
.../persistence/map/impl/MapScopeImpl.java | 91 ++++++
.../persistence/map/impl/MapSerialization.java | 64 ++++
.../map/impl/MapSerializationImpl.java | 327 +++++++++++++++++++
.../persistence/map/MapManagerTest.java | 207 ++++++++++++
.../persistence/map/guice/TestMapModule.java | 16 +
stack/corepersistence/pom.xml | 18 +
stack/corepersistence/queue/pom.xml | 92 ++++++
.../usergrid/persistence/queue/Queue.java | 31 ++
.../usergrid/persistence/queue/QueueFig.java | 16 +
.../persistence/queue/QueueManager.java | 64 ++++
.../persistence/queue/QueueManagerFactory.java | 23 ++
.../persistence/queue/QueueMessage.java | 42 +++
.../usergrid/persistence/queue/QueueScope.java | 31 ++
.../persistence/queue/guice/QueueModule.java | 51 +++
.../persistence/queue/impl/QueueScopeImpl.java | 87 +++++
.../queue/impl/SQSQueueManagerImpl.java | 234 +++++++++++++
.../persistence/queue/QueueManagerTest.java | 100 ++++++
.../queue/guice/TestQueueModule.java | 33 ++
stack/pom.xml | 8 +-
.../apache/usergrid/rest/SystemResource.java | 157 +++++++++
.../notifications/ApplicationQueueManager.java | 96 +++---
.../notifications/ApplicationQueueMessage.java | 67 ++--
.../notifications/NotificationsService.java | 15 +-
.../services/notifications/QueueListener.java | 69 ++--
.../services/notifications/QueueManager.java | 31 --
.../services/notifications/TaskManager.java | 54 +--
.../apns/NotificationsServiceIT.java | 47 ++-
.../gcm/NotificationsServiceIT.java | 2 +-
stack/test-utils/pom.xml | 17 +-
.../java/org/apache/usergrid/tools/ApiDoc.java | 5 +-
41 files changed, 2323 insertions(+), 237 deletions(-)
----------------------------------------------------------------------
[23/23] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
cloudformation-update
Posted by to...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into cloudformation-update
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/aca79b63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/aca79b63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/aca79b63
Branch: refs/heads/cloudformation-update
Commit: aca79b63f26ac6da13b9a64a7832f6ab2d264896
Parents: 4381884 27db106
Author: Todd Nine <to...@apache.org>
Authored: Tue Oct 14 15:00:11 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Tue Oct 14 15:00:11 2014 -0600
----------------------------------------------------------------------
.../usergrid/persistence/queue/impl/SQSQueueManagerImpl.java | 2 +-
.../services/notifications/ApplicationQueueManager.java | 5 +++--
.../usergrid/services/notifications/NotificationsService.java | 2 +-
.../apache/usergrid/services/notifications/QueueListener.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[14/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into cloudformation-update
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7f731fb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7f731fb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7f731fb0
Branch: refs/heads/cloudformation-update
Commit: 7f731fb013864956259b6f01c353e8eea34fe35c
Parents: 83fccdd 5d0ad62
Author: amuramoto <am...@apigee.com>
Authored: Fri Oct 10 17:38:08 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Fri Oct 10 17:38:08 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 121 +++-------
.../corepersistence/CpEntityManagerFactory.java | 22 --
.../corepersistence/CpRelationManager.java | 3 +-
.../usergrid/corepersistence/CpVisitor.java | 8 +-
.../usergrid/corepersistence/CpWalker.java | 149 +++---------
.../HybridEntityManagerFactory.java | 10 -
.../corepersistence/results/EntityVerifier.java | 3 +-
.../results/FilteringLoader.java | 23 +-
.../results/VersionVerifier.java | 5 +-
.../usergrid/persistence/EntityManager.java | 3 -
.../persistence/EntityManagerFactory.java | 4 -
.../cassandra/EntityManagerFactoryImpl.java | 10 -
.../cassandra/EntityManagerImpl.java | 7 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 3 +
.../PerformanceEntityRepersistTest.java | 236 -------------------
.../impl/EntityCollectionManagerImpl.java | 36 +--
.../mvcc/stage/write/WriteCommit.java | 2 +-
.../collection/mvcc/stage/write/WriteStart.java | 7 +-
.../serialization/impl/FieldSerializer.java | 3 +-
.../MvccEntitySerializationStrategyImpl.java | 2 +-
.../UniqueValueSerializationStrategyImpl.java | 6 +-
.../collection/EntityCollectionManagerIT.java | 139 +++++++++--
...niqueValueSerializationStrategyImplTest.java | 63 ++++-
.../index/impl/EsEntityIndexBatchImpl.java | 2 +-
stack/pom.xml | 4 +-
.../apache/usergrid/rest/SystemResource.java | 30 ++-
.../cassandra/ManagementServiceIT.java | 2 +-
.../src/test/resources/log4j.properties | 4 +
.../org/apache/usergrid/tools/RepersistAll.java | 98 --------
29 files changed, 327 insertions(+), 678 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7f731fb0/stack/pom.xml
----------------------------------------------------------------------
[12/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into cloudformation-update
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e64e9c92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e64e9c92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e64e9c92
Branch: refs/heads/cloudformation-update
Commit: e64e9c928da76d91cb320c3f820962f9cbd85f2f
Parents: 112661a 693cb2d
Author: amuramoto <am...@apigee.com>
Authored: Fri Oct 10 12:35:52 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Fri Oct 10 12:35:52 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/usergrid/services/ServiceManager.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[04/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/30ba9ace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/30ba9ace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/30ba9ace
Branch: refs/heads/cloudformation-update
Commit: 30ba9ace6931d57e223a95740f52c15afb3c410c
Parents: 231b674 8930071
Author: amuramoto <am...@apigee.com>
Authored: Thu Oct 2 13:33:20 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Thu Oct 2 13:33:20 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 106 ++++++++++++-------
.../corepersistence/CpEntityManagerFactory.java | 2 -
.../corepersistence/CpEntityMapUtils.java | 2 +-
.../org/apache/usergrid/persistence/GeoIT.java | 2 +-
.../persistence/model/field/value/Location.java | 12 ++-
.../index/impl/EsEntityIndexBatchImpl.java | 2 +-
.../index/impl/EntityIndexMapUtils.java | 2 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 18 +++-
8 files changed, 95 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
[10/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/43acfad8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/43acfad8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/43acfad8
Branch: refs/heads/cloudformation-update
Commit: 43acfad8438b873ecf52384775f97e6052139150
Parents: c56c12c 389e766
Author: amuramoto <am...@apigee.com>
Authored: Fri Oct 10 11:26:01 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Fri Oct 10 11:26:01 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityDeleteListener.java | 2 +-
.../corepersistence/CpEntityManager.java | 394 ++++++++-----------
.../corepersistence/CpEntityManagerFactory.java | 217 +++++++---
.../corepersistence/CpEntityMapUtils.java | 323 ---------------
.../corepersistence/CpManagerCache.java | 2 +-
.../usergrid/corepersistence/CpNamingUtils.java | 106 -----
.../corepersistence/CpRelationManager.java | 153 ++-----
.../usergrid/corepersistence/CpVisitor.java | 32 ++
.../usergrid/corepersistence/CpWalker.java | 238 +++++++++++
.../HybridEntityManagerFactory.java | 10 +
.../corepersistence/results/EntityVerifier.java | 126 ++++++
.../results/FilteringLoader.java | 245 ++++++++++++
.../corepersistence/results/IdsVerifier.java | 46 +++
.../corepersistence/results/RefsVerifier.java | 42 ++
.../corepersistence/results/ResultsLoader.java | 43 ++
.../results/ResultsLoaderFactory.java | 39 ++
.../results/ResultsLoaderFactoryImpl.java | 67 ++++
.../results/ResultsVerifier.java | 54 +++
.../results/VersionVerifier.java | 82 ++++
.../corepersistence/util/CpEntityMapUtils.java | 323 +++++++++++++++
.../corepersistence/util/CpNamingUtils.java | 106 +++++
.../usergrid/persistence/EntityManager.java | 10 +
.../persistence/EntityManagerFactory.java | 4 +
.../apache/usergrid/persistence/Results.java | 6 +-
.../cassandra/EntityManagerFactoryImpl.java | 10 +
.../cassandra/EntityManagerImpl.java | 17 +
.../org/apache/usergrid/CoreApplication.java | 1 +
.../CpEntityDeleteListenerTest.java | 2 +-
.../CpEntityIndexDeleteListenerTest.java | 3 +-
.../corepersistence/CpEntityMapUtilsTest.java | 2 +
.../corepersistence/StaleIndexCleanupTest.java | 100 ++++-
.../PerformanceEntityRepersistTest.java | 236 +++++++++++
.../collection/EntityCollectionManager.java | 22 +-
.../persistence/collection/EntitySet.java | 47 +++
.../persistence/collection/MvccEntity.java | 68 ++++
.../persistence/collection/MvccLogEntry.java | 94 +++++
.../persistence/collection/VersionSet.java | 67 ++++
.../exception/CollectionRuntimeException.java | 2 +-
.../exception/WriteCommitException.java | 4 +-
.../WriteOptimisticVerifyException.java | 4 +-
.../exception/WriteStartException.java | 4 +-
.../exception/WriteUniqueVerifyException.java | 3 +-
.../collection/guice/CollectionModule.java | 14 +-
.../impl/EntityCollectionManagerImpl.java | 245 ++++++++----
.../impl/EntityVersionCleanupTask.java | 2 +-
.../mvcc/MvccEntitySerializationStrategy.java | 20 +-
.../mvcc/MvccLogEntrySerializationStrategy.java | 17 +-
.../collection/mvcc/changelog/ChangeLog.java | 68 ++++
.../mvcc/changelog/ChangeLogEntry.java | 104 -----
.../mvcc/changelog/ChangeLogGenerator.java | 16 +-
.../mvcc/changelog/ChangeLogGeneratorImpl.java | 138 +++----
.../mvcc/changelog/ChangeLogImpl.java | 135 +++++++
.../collection/mvcc/entity/MvccEntity.java | 68 ----
.../collection/mvcc/entity/MvccLogEntry.java | 93 -----
.../mvcc/entity/MvccValidationUtils.java | 1 +
.../mvcc/entity/impl/MvccEntityDeleteEvent.java | 2 +-
.../mvcc/entity/impl/MvccEntityEvent.java | 2 +-
.../mvcc/entity/impl/MvccEntityImpl.java | 2 +-
.../mvcc/entity/impl/MvccEntityWriteEvent.java | 3 +-
.../mvcc/entity/impl/MvccLogEntryImpl.java | 2 +-
.../mvcc/stage/EntityUpdateEvent.java | 1 -
.../mvcc/stage/delete/MarkCommit.java | 4 +-
.../collection/mvcc/stage/delete/MarkStart.java | 4 +-
.../collection/mvcc/stage/load/Load.java | 98 -----
.../mvcc/stage/write/RollbackAction.java | 2 +-
.../mvcc/stage/write/WriteCommit.java | 4 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 44 +--
.../collection/mvcc/stage/write/WriteStart.java | 5 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 2 +-
.../collection/serialization/EntityRepair.java | 38 ++
.../serialization/OptimisticUpdate.java | 2 +-
.../serialization/SerializationFig.java | 19 +
.../serialization/impl/EntityRepairImpl.java | 149 +++++++
.../serialization/impl/EntitySetImpl.java | 62 +++
.../serialization/impl/LogEntryIterator.java | 2 +-
.../MvccEntitySerializationStrategyImpl.java | 174 +++++---
.../MvccLogEntrySerializationStrategyImpl.java | 129 ++++--
.../serialization/impl/VersionSetImpl.java | 80 ++++
.../persistence/collection/util/RepairUtil.java | 139 -------
.../collection/EntityCollectionManagerIT.java | 307 ++++++++++++---
.../changelog/ChangeLogGeneratorImplTest.java | 375 ++++++++++--------
.../mvcc/entity/impl/MvccEntityImplTest.java | 2 +-
.../mvcc/entity/impl/MvccLogEntryImplTest.java | 2 +-
.../mvcc/stage/AbstractMvccEntityStageTest.java | 2 +-
.../mvcc/stage/TestEntityGenerator.java | 2 +-
.../mvcc/stage/delete/MarkCommitTest.java | 6 +-
.../mvcc/stage/delete/MarkStartTest.java | 4 +-
.../collection/mvcc/stage/load/LoadTest.java | 361 -----------------
.../mvcc/stage/write/WriteCommitTest.java | 4 +-
.../stage/write/WriteOptimisticVerifyTest.java | 4 +-
.../mvcc/stage/write/WriteStartTest.java | 4 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 2 +-
.../serialization/EntityRepairImplTest.java | 147 +++++++
.../impl/LogEntryIteratorTest.java | 2 +-
...MvccEntitySerializationStrategyImplTest.java | 40 +-
.../impl/MvccLESSTransientTest.java | 7 +-
...ccLogEntrySerializationStrategyImplTest.java | 19 +-
.../util/InvalidMvccEntityGenerator.java | 2 +-
.../util/InvalidValueGeneratorTest.java | 2 +-
.../collection/util/LogEntryMock.java | 4 +-
.../usergrid/persistence/index/EntityIndex.java | 6 +
.../index/impl/EsEntityIndexBatchImpl.java | 119 ++----
.../index/impl/EsEntityIndexImpl.java | 280 ++++++-------
.../persistence/index/impl/IndexingUtils.java | 66 ++++
.../index/query/CandidateResult.java | 30 ++
.../persistence/index/impl/EntityIndexTest.java | 5 +
.../cassandra/ManagementServiceImpl.java | 38 +-
.../org/apache/usergrid/tools/RepersistAll.java | 98 +++++
108 files changed, 4611 insertions(+), 2575 deletions(-)
----------------------------------------------------------------------
[09/23] git commit: Updated pom.xml to properly include JSP servlet
defs in web.xml on build
Posted by to...@apache.org.
Updated pom.xml to properly include JSP servlet defs in web.xml on 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/c56c12c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c56c12c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c56c12c2
Branch: refs/heads/cloudformation-update
Commit: c56c12c212dad5779bdff949c5c95a8221968982
Parents: 275f10a
Author: amuramoto <am...@apigee.com>
Authored: Thu Oct 9 10:17:45 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Thu Oct 9 10:17:45 2014 -0700
----------------------------------------------------------------------
stack/rest/pom.xml | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c56c12c2/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 4a99443..ef6cd26 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -140,17 +140,13 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
- </plugin>
-
- <plugin>
<groupId>org.jasig.mojo.jspc</groupId>
<artifactId>jspc-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
- <includeInProject>false</includeInProject>
+ <includeInProject>true</includeInProject>
+ <inputWebXml>${basedir}/src/main/webapp/WEB-INF/web.xml</inputWebXml>
+ <injectString><!--FRAGMENT--></injectString>
<webFragmentFile>${project.build.directory}/web-fragment.xml.txt</webFragmentFile>
</configuration>
<executions>
@@ -164,7 +160,7 @@
<dependencies>
<dependency>
<groupId>org.jasig.mojo.jspc</groupId>
- <artifactId>jspc-compiler-tomcat6</artifactId>
+ <artifactId>jspc-compiler-tomcat7</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>
@@ -172,6 +168,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${project.build.directory}/jspweb.xml</webXml>
+ </configuration>
+ <version>2.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<configuration>
[13/23] git commit: more updates to cloudformation scripts
Posted by to...@apache.org.
more updates to cloudformation scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/83fccdd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/83fccdd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/83fccdd3
Branch: refs/heads/cloudformation-update
Commit: 83fccdd35eaee23a769a77bf39071ae70e6f3470
Parents: e64e9c9
Author: amuramoto <am...@apigee.com>
Authored: Fri Oct 10 17:37:50 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Fri Oct 10 17:37:50 2014 -0700
----------------------------------------------------------------------
stack/pom.xml | 10 +++-------
stack/rest/pom.xml | 21 ++++++++-------------
2 files changed, 11 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/83fccdd3/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index b1bfe3c..c56942c 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -111,7 +111,7 @@
<org.springframework.version>3.1.2.RELEASE</org.springframework.version>
<shiro-version>1.2.0</shiro-version>
<slf4j-version>1.6.1</slf4j-version>
- <snakeyaml-version>1.6</snakeyaml-version>
+ <snakeyaml-version>1.8</snakeyaml-version>
<tomcat-version>7.0.52</tomcat-version>
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
@@ -276,7 +276,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2</version>
+ <version>4.1.3</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
@@ -457,10 +457,6 @@
<version>${cassandra-version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
@@ -1247,7 +1243,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
- <version>4.11</version>
+ <version>4.10</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/83fccdd3/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index ef6cd26..4a99443 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -140,13 +140,17 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+ <plugin>
<groupId>org.jasig.mojo.jspc</groupId>
<artifactId>jspc-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
- <includeInProject>true</includeInProject>
- <inputWebXml>${basedir}/src/main/webapp/WEB-INF/web.xml</inputWebXml>
- <injectString><!--FRAGMENT--></injectString>
+ <includeInProject>false</includeInProject>
<webFragmentFile>${project.build.directory}/web-fragment.xml.txt</webFragmentFile>
</configuration>
<executions>
@@ -160,7 +164,7 @@
<dependencies>
<dependency>
<groupId>org.jasig.mojo.jspc</groupId>
- <artifactId>jspc-compiler-tomcat7</artifactId>
+ <artifactId>jspc-compiler-tomcat6</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>
@@ -168,15 +172,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/jspweb.xml</webXml>
- </configuration>
- <version>2.3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<configuration>
[18/23] git commit: more cloudformation updates
Posted by to...@apache.org.
more cloudformation updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/60096b68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/60096b68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/60096b68
Branch: refs/heads/cloudformation-update
Commit: 60096b68604e1b7facd4ee3b20c755ad94854733
Parents: 59fed6a
Author: amuramoto <am...@apigee.com>
Authored: Sun Oct 12 03:49:14 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Sun Oct 12 03:49:14 2014 -0700
----------------------------------------------------------------------
stack/awscluster/src/main/groovy/configure_elasticsearch.groovy | 4 ++--
stack/awscluster/src/main/groovy/configure_usergrid.groovy | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/60096b68/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
index ce8e3c5..ceddcbe 100644
--- a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
+++ b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
@@ -30,13 +30,13 @@ import com.amazonaws.services.simpledb.*
import com.amazonaws.services.simpledb.model.*
String hostName = (String)System.getenv().get("PUBLIC_HOSTNAME")
-def clusterName = (String)System.getenv().get("CASSANDRA_CLUSTER_NAME")
+def clusterName = (String)System.getenv().get("ES_CLUSTER_NAME")
NodeRegistry registry = new NodeRegistry();
// build seed list by listing all Cassandra nodes found in SimpleDB domain with our stackName
// works because cassandra nodes are also elasticsearch nodes
-def selectResult = registry.searchNode('cassandra')
+def selectResult = registry.searchNode('elasticsearch')
def esnodes = ""
def sep = ""
for (hostname in selectResult) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/60096b68/stack/awscluster/src/main/groovy/configure_usergrid.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_usergrid.groovy b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
index cdbbc77..a0a051c 100644
--- a/stack/awscluster/src/main/groovy/configure_usergrid.groovy
+++ b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
@@ -66,7 +66,7 @@ for (item in selectResult) {
}
// cassandra nodes are also our elasticsearch nodes
-selectResult = registry.searchNode('cassandra')
+selectResult = registry.searchNode('elasticsearch')
def esnodes = ""
sep = ""
for (item in selectResult) {
[15/23] git commit: more cloudformation updates
Posted by to...@apache.org.
more cloudformation updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f3fddfe9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f3fddfe9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f3fddfe9
Branch: refs/heads/cloudformation-update
Commit: f3fddfe98cee88a8c1f7ef0eb87a069b7de93954
Parents: 7f731fb
Author: amuramoto <am...@apigee.com>
Authored: Sat Oct 11 01:16:16 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Sat Oct 11 01:16:16 2014 -0700
----------------------------------------------------------------------
stack/awscluster/pom.xml | 2 +-
.../dist/init_instance/install_cassandra.sh | 2 +-
stack/awscluster/ugcluster-cf.json | 56 ++++++++++++++++++++
3 files changed, 58 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f3fddfe9/stack/awscluster/pom.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml
index 049415d..0c0bd46 100644
--- a/stack/awscluster/pom.xml
+++ b/stack/awscluster/pom.xml
@@ -30,7 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <aws.s3.release-bucket>ug-cloudformation</aws.s3.release-bucket>
+ <aws.s3.release-bucket>alex-cloudformation</aws.s3.release-bucket>
<stack.war>../rest/target/ROOT.war</stack.war>
<portal.dir>../../portal/dist/usergrid-portal</portal.dir>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f3fddfe9/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh b/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
index 9e74348..280ae40 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
@@ -28,7 +28,7 @@ deb http://www.apache.org/dist/cassandra/debian 12x main
EOF
apt-get update
-apt-get -y --force-yes install libcap2 cassandra=1.2.11
+apt-get -y --force-yes install libcap2 cassandra=1.2.19
/etc/init.d/cassandra stop
mkdir -p /mnt/data/cassandra
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f3fddfe9/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 31950a2..197eb6c 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -1207,6 +1207,20 @@
}
}
},
+ "AllowRestToESOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "ESSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "1",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "RestSecurityGroup"
+ }
+ }
+ },
"CassSecurityGroup": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
@@ -1235,6 +1249,34 @@
}
}
},
+ "AllowESToCassOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "CassSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "1",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "ESSecurityGroup"
+ }
+ }
+ },
+ "AllowESToESOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "ESSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "1",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "ESSecurityGroup"
+ }
+ }
+ },
"AllowRestToCassOnAllPorts": {
"Type": "AWS::EC2::SecurityGroupIngress",
"Properties": {
@@ -1263,6 +1305,20 @@
}
}
},
+ "AllowESToRestOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "RestSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "0",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "ESSecurityGroup"
+ }
+ }
+ },
"AllowCassToCassOnAllPorts": {
"Type": "AWS::EC2::SecurityGroupIngress",
"Properties": {