summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2013-08-06 04:35:07 (EDT)
committerTomasz Zarna2013-08-06 04:35:50 (EDT)
commit1e87ed1a05d551aa9f155a91c8392c2660572d1a (patch)
tree543a289cf208973d25fb478284506004b2ab194f
parent4360c770a98e3676dc25506511207174c414ec99 (diff)
downloadorg.eclipse.mylyn.reviews-1e87ed1a05d551aa9f155a91c8392c2660572d1a.zip
org.eclipse.mylyn.reviews-1e87ed1a05d551aa9f155a91c8392c2660572d1a.tar.gz
org.eclipse.mylyn.reviews-1e87ed1a05d551aa9f155a91c8392c2660572d1a.tar.bz2
fix deprecated variable access warnings in mylyn-puppet-gerrit jobrefs/changes/59/15159/1
Change-Id: I87443a20dcbeb2ec9474a697e4870db4eb2d2ffe Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
-rw-r--r--org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/adduser.sql.erb20
-rw-r--r--org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb12
-rw-r--r--org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/service.json.erb10
3 files changed, 21 insertions, 21 deletions
diff --git a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/adduser.sql.erb b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/adduser.sql.erb
index 625afc3..f63ce07 100644
--- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/adduser.sql.erb
+++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/adduser.sql.erb
@@ -1,31 +1,31 @@
INSERT INTO accounts
(account_id,preferred_email,registered_on)
VALUES
- (<%= userid %>,'<%= useremail %>',now());
+ (<%= @userid %>,'<%= @useremail %>',now());
INSERT INTO account_group_members
(account_id, group_id)
VALUES (
- (SELECT account_id FROM accounts WHERE preferred_email='<%= useremail %>'),
- (SELECT group_id FROM account_groups WHERE name='<%= usergroup %>')
+ (SELECT account_id FROM accounts WHERE preferred_email='<%= @useremail %>'),
+ (SELECT group_id FROM account_groups WHERE name='<%= @usergroup %>')
);
INSERT INTO account_external_ids
(account_id, external_id)
VALUES (
- (SELECT account_id FROM accounts WHERE preferred_email='<%= useremail %>'),
- 'gerrit:<%= useremail %>'
+ (SELECT account_id FROM accounts WHERE preferred_email='<%= @useremail %>'),
+ 'gerrit:<%= @useremail %>'
);
INSERT INTO account_external_ids
(account_id, external_id, email_address, password)
VALUES (
- (SELECT account_id FROM accounts WHERE preferred_email='<%= useremail %>'),
- 'username:<%= username %>',
- '<%= useremail %>',
+ (SELECT account_id FROM accounts WHERE preferred_email='<%= @useremail %>'),
+ 'username:<%= @username %>',
+ '<%= @useremail %>',
'mylyntest'
);
INSERT INTO account_ssh_keys
(ssh_public_key,valid,account_id)
VALUES (
- '<%= userkey %>',
+ '<%= @userkey %>',
'Y',
- (SELECT account_id FROM accounts WHERE preferred_email='<%= useremail %>'),
+ (SELECT account_id FROM accounts WHERE preferred_email='<%= @useremail %>'),
);
diff --git a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb
index 79d49c8..684f0b3 100644
--- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb
+++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb
@@ -1,15 +1,15 @@
[gerrit]
- basePath = <%= envbase %>/git
+ basePath = <%= @envbase %>/git
<% if @envhost == "precise32" %>
- canonicalWebUrl = http://localhost:2080/<%= envid %>
+ canonicalWebUrl = http://localhost:2080/<%= @envid %>
<% else %>
- canonicalWebUrl = http://<%= envhost %>/<%= envid %>
+ canonicalWebUrl = http://<%= @envhost %>/<%= @envid %>
<% end %>
[database]
type = H2
database = db/ReviewDB
[auth]
- type = <%= authtype %>
+ type = <%= @authtype %>
[sendemail]
smtpServer = localhost
[container]
@@ -17,9 +17,9 @@
javaHome = /usr/lib/jvm/java-6-openjdk-i386/jre
heapLimit = 128m
[sshd]
- listenAddress = *:<%= sshport %>
+ listenAddress = *:<%= @sshport %>
[httpd]
- listenUrl = proxy-http://*:<%= port %>/<%= envid %>
+ listenUrl = proxy-http://*:<%= @port %>/<%= @envid %>
[cache]
directory = cache
diff --git a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/service.json.erb b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/service.json.erb
index 77c7dc8..ac39e9d 100644
--- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/service.json.erb
+++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/service.json.erb
@@ -1,12 +1,12 @@
{
- "type": "<%= envtype %>",
- "url": "/<%= envid %>/",
- "version": "<%= version %>",
- "info": "<%= envinfo %>",
+ "type": "<%= @envtype %>",
+ "url": "/<%= @envid %>/",
+ "version": "<%= @version %>",
+ "info": "<%= @envinfo %>",
"properties":{
<% if @envdefault == true %>
"default": "1",
<% end %>
- "authtype": "<%= authtype %>"
+ "authtype": "<%= @authtype %>"
}
}