Skip to content

Commit 0aa59aa

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 6185 b: refs/heads/tswast-patch-1 c: 88a1031 h: refs/heads/master i: 6183: 8980789
1 parent 7583282 commit 0aa59aa

6 files changed

Lines changed: 19 additions & 113 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: a6a2898cdc98289808b6e10dec28204775150e37
60+
refs/heads/tswast-patch-1: 88a10317cf035464f94c140ca589f9827212adf5
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/gcloud-java-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>joda-time</groupId>
7676
<artifactId>joda-time</artifactId>
77-
<version>RELEASE</version>
77+
<version>2.8.2</version>
7878
<scope>compile</scope>
7979
</dependency>
8080
<dependency>

‎branches/tswast-patch-1/src/site/resources/css/site.css‎

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -333,50 +333,7 @@ h1, h2, h3, h4, h5, h6 {
333333
What is it?
334334
*/
335335
.about pre {
336-
padding: 8px;
337-
background: #fff;
338-
line-height: 1.6em;
339-
}
340-
341-
pre, code {
342-
font-family: Monaco, 'Droid Sans Mono', monospace !important;
343-
}
344-
345-
.about .code-sample-tabs {
346-
margin-top: 10px;
347-
width: 450px;
348-
}
349-
350-
.about .code-sample-tabs a.selected {
351-
background-color: #fff;
352-
font-weight: bold;
353-
}
354-
355-
.about .code-sample-tabs a {
356-
display: inline-block;
357-
padding: 2px 12px 0px 12px;
358-
background-color: #f8f8f8;
359-
margin-right: 8px;
360-
color: #333;
361-
text-decoration: none;
362-
cursor: pointer;
363-
}
364-
365-
.about .hljs {
366-
background-color: #fff;
367-
font-size: .9em;
368-
line-height: 1.6em;
369-
}
370-
371-
.hljs {
372-
display: block;
373-
padding: .5em;
374-
color: #333;
375-
background: #f8f8f8;
376-
}
377-
378-
[hljs] > pre {
379-
margin: 0 !important;
336+
font-size: 110%;
380337
}
381338

382339
/*
@@ -550,7 +507,7 @@ pre, code {
550507
}
551508

552509
.about h4 {
553-
margin: 0;
510+
margin-bottom: 0;
554511
font-size: 1.2em;
555512
font-weight: bold;
556513
color: #4285f4;
@@ -1157,16 +1114,6 @@ pre, code {
11571114
font-size: 2em;
11581115
}
11591116

1160-
.quote-box {
1161-
width: 40%;
1162-
float: left;
1163-
}
1164-
1165-
.quote-box--supplementary {
1166-
float: right;
1167-
width: 56%;
1168-
}
1169-
11701117
/*
11711118
Hero Banner
11721119
*/

‎branches/tswast-patch-1/src/site/resources/index.html‎

Lines changed: 14 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<script src="js/vendor/modernizr-2.6.2.min.js"></script>
1616
<link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono|Roboto:300,400,700,700italic,400italic|Open+Sans:300' rel='stylesheet' type='text/css'>
1717
</head>
18-
<body ng-app="gcloud-java">
18+
<body>
1919
<header class="page-header" role="banner">
2020
<h1 class="logo"><img src="img/logo-full.svg" alt="Google Cloud Platform" /></h1>
2121
<nav class="main-nav">
@@ -107,7 +107,6 @@ <h2>Quickstart with Maven: Add gcloud to your pom.xml</h2>
107107

108108
<section class="block about">
109109
<div class="container clearfix">
110-
<div class="quote-box">
111110
<h3 class="block-title">What is it?</h3>
112111

113112
<p><code>gcloud</code> is a client library for accessing Google
@@ -124,54 +123,22 @@ <h3 class="block-title">What is it?</h3>
124123
Add the <code>gcloud</code> dependency to your project and get a private key to be
125124
up and ready to go. Better yet, if you are running on a Google
126125
Compute Engine instance, the private key is automatically detected.
127-
</div>
128-
129-
<div class="quote-box--supplementary">
126+
130127
<h4>Example: Retrieve Datastore Entries</h4>
131-
132-
<div class="code-sample-tabs" ng-init="selected = 'compute engine'">
133-
<a ng-click="selected = 'compute engine'" ng-class="{selected: selected == 'compute engine'}" class="selected">Run in Compute/App Engine</a>
134-
<a ng-click="selected = 'elsewhere'" ng-class="{selected: selected == 'elsewhere'}">Run elsewhere</a>
135-
</div>
136-
137-
<div hljs="" language="java" ng-show="selected == 'compute engine'" class=""><pre>
138-
<code class="hljs java">import com.google.gcloud.datastore.Datastore;
139-
import com.google.gcloud.datastore.DatastoreFactory;
140-
import com.google.gcloud.datastore.DatastoreOptions;
141-
import com.google.gcloud.datastore.Entity;
142-
import com.google.gcloud.datastore.Key;
143-
import com.google.gcloud.datastore.KeyFactory;
144-
145-
// Authentication is automatic inside Google Compute Engine
146-
// and Google App Engine.
147-
DatastoreOptions options = DatastoreOptions.builder().build();
148-
Datastore datastore = DatastoreFactory.instance().get(options);
149-
KeyFactory keyFactory = datastore.newKeyFactory().kind(<span class="hljs-string">KIND</span>);
150-
Key key = keyFactory.newKey(keyName);
151-
Entity entity = datastore.get(key);
152-
153-
154-
</code></pre></div>
155-
156-
<div hljs="" language="java" ng-show="selected == 'elsewhere'" class=""><pre>
157-
<code class="hljs java">import com.google.gcloud.AuthCredentials;
158-
import com.google.gcloud.datastore.Datastore;
159-
import com.google.gcloud.datastore.DatastoreFactory;
160-
import com.google.gcloud.datastore.DatastoreOptions;
161-
import com.google.gcloud.datastore.Entity;
162-
import com.google.gcloud.datastore.Key;
163-
import com.google.gcloud.datastore.KeyFactory;
164-
165-
DatastoreOptions options = DatastoreOptions.builder()
166-
.projectId(<span class="hljs-string">PROJECT_ID</span>)
167-
.authCredentials(AuthCredentials.createForJson(
168-
new FileInputStream(<span class="hljs-string">PATH_TO_JSON_KEY</span>))).build();
128+
129+
<div hljs="" language="js">
130+
<pre><code class="hljs java"><span class="hljs-keyword">import</span> com.google.gcloud.datastore.Datastore;
131+
<span class="hljs-keyword">import</span> com.google.gcloud.datastore.DatastoreFactory;
132+
<span class="hljs-keyword">import</span> com.google.gcloud.datastore.DatastoreOptions;
133+
<span class="hljs-keyword">import</span> com.google.gcloud.datastore.Entity;
134+
<span class="hljs-keyword">import</span> com.google.gcloud.datastore.Key;
135+
<span class="hljs-keyword">import</span> com.google.gcloud.datastore.KeyFactory;
136+
137+
DatastoreOptions options = DatastoreOptions.builder().projectId(<span class="hljs-string">PROJECT_ID</span>).build();
169138
Datastore datastore = DatastoreFactory.instance().get(options);
170139
KeyFactory keyFactory = datastore.newKeyFactory().kind(<span class="hljs-string">KIND</span>);
171140
Key key = keyFactory.newKey(keyName);
172-
Entity entity = datastore.get(key);
173-
</code></pre></div>
174-
</div>
141+
Entity entity = datastore.get(key);</code></pre></div>
175142
</div><!-- end of .container -->
176143
</section><!-- end of .featuring -->
177144

@@ -187,11 +154,9 @@ <h4>What is the relationship between gcloud and the Google APIs Java Client?</h4
187154
</section><!-- end of .faq -->
188155
</article><!-- end of .main -->
189156

190-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.23/angular.min.js"></script>
191-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
157+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
192158
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.2.min.js"><\/script>')</script>
193159
<script src="js/plugins.js"></script>
194-
<script src="js/vendor/highlight.pack.js"></script>
195160
<script src="js/main.js"></script>
196161
</body>
197162
</html>

‎branches/tswast-patch-1/src/site/resources/js/main.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,4 @@ $('.nav-current').click(function(){
44

55
$('.faq-btn').click(function(){
66
$(this).toggleClass('open');
7-
});
8-
9-
(function() {
10-
var myAppModule = angular.module('gcloud-java', []);
11-
hljs.initHighlightingOnLoad();
12-
})();
7+
});

‎branches/tswast-patch-1/src/site/resources/js/vendor/highlight.pack.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)