Skip to content

Commit a64eb18

Browse files
xfeepxfeep
committed
remove ga
1 parent 5e29348 commit a64eb18

16 files changed

+23
-237
lines changed

‎Configuration.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Setting JVM path and class path within `http {` block in nginx.conf
1010
1111
###define jvm path, auto for auto-detect jvm path or a real path
1212
###for win32, jvm_path maybe is "C:/Program Files/Java/jdk1.7.0_25/jre/bin/server/jvm.dll";
13-
###for macosx, jvm_path maybe is "/Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents/Libraries/libserver.dylib";
13+
###for macosx, jvm_path maybe is "/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/jre/lib/server/libjvm.dylib";
1414
###for ubuntu, jvm_path maybe is "/usr/lib/jvm/java-7-oracle/jre/lib/amd64/server/libjvm.so";
1515
###for centos, jvm_path maybe is "/usr/java/jdk1.6.0_45/jre/lib/amd64/server/libjvm.so";
1616
###for centos 32bit, jvm_path maybe is "/usr/java/jdk1.7.0_51/jre/lib/i386/server/libjvm.so";
@@ -55,7 +55,7 @@ It 's a new feature since v0.2.5. We can define variables and reuse them in jvm_
5555
jvm_var mrr '/home/who/.m2/repository';
5656
jvm_var ncjar '#{ncdev}/target/nginx-clojure-0.2.5.jar';
5757
58-
jvm_options "-Djava.class.path=#{ncjar}:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar";
58+
jvm_classpath "#{ncjar}:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar";
5959
```
6060

6161
### Specify Debug Ports for JVMs
@@ -97,7 +97,6 @@ even external service(e.g. redis, database) to coordinate the state or use cook
9797
1. When importing Swing We Must specifiy `jvm_options "-Djava.awt.headless=true"` , otherwise the nginx will hang.
9898
1. By adding the location of your clojure source files to the classpath,then just issue "nginx -s reload" and changes to the sources get picked up!
9999
1. You can remove clojure-1.5.1.jar from class path and point at your "lein uberjar" to pick up a different version of clojure.
100-
1. To use Java 7 on OSX, in nginx.conf your may set `jvm_path "/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/jre/lib/server/libjvm.dylib";`
101100

102101
2.2 Initialization Handler for nginx worker
103102
-----------------

‎Configuration.md.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h2>
66
<div class="highlight highlight-source-nginx"><pre>
77
<span class="pl-c">###define jvm path, auto for auto-detect jvm path or a real path</span>
88
<span class="pl-c">###for win32, jvm_path maybe is "C:/Program Files/Java/jdk1.7.0_25/jre/bin/server/jvm.dll";</span>
9-
<span class="pl-c">###for macosx, jvm_path maybe is "/Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents/Libraries/libserver.dylib";</span>
9+
<span class="pl-c">###for macosx, jvm_path maybe is "/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/jre/lib/server/libjvm.dylib";</span>
1010
<span class="pl-c">###for ubuntu, jvm_path maybe is "/usr/lib/jvm/java-7-oracle/jre/lib/amd64/server/libjvm.so";</span>
1111
<span class="pl-c">###for centos, jvm_path maybe is "/usr/java/jdk1.6.0_45/jre/lib/amd64/server/libjvm.so";</span>
1212
<span class="pl-c">###for centos 32bit, jvm_path maybe is "/usr/java/jdk1.7.0_51/jre/lib/i386/server/libjvm.so";</span>
@@ -47,7 +47,7 @@ <h3>
4747
<span class="pl-k">jvm_var</span> mrr <span class="pl-s">'/home/who/.m2/repository'</span>;
4848
<span class="pl-k">jvm_var</span> ncjar <span class="pl-s">'#{ncdev}/target/nginx-clojure-0.2.5.jar'</span>;
4949

50-
<span class="pl-k">jvm_options</span> <span class="pl-s">"-Djava.class.path=#{ncjar}:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar"</span>;</pre></div>
50+
<span class="pl-k">jvm_classpath</span> <span class="pl-s">"#{ncjar}:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar"</span>;</pre></div>
5151
<h3>
5252
<a id="user-content-specify-debug-ports-for-jvms" class="anchor" href="#specify-debug-ports-for-jvms" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Specify Debug Ports for JVMs</h3>
5353
<p>It 's a new feature since v0.2.5.
@@ -78,8 +78,6 @@ <h3>
7878
<li>When importing Swing We Must specifiy <code>jvm_options "-Djava.awt.headless=true"</code> , otherwise the nginx will hang.</li>
7979
<li>By adding the location of your clojure source files to the classpath,then just issue "nginx -s reload" and changes to the sources get picked up!</li>
8080
<li>You can remove clojure-1.5.1.jar from class path and point at your "lein uberjar" to pick up a different version of clojure.</li>
81-
<li>To use Java 7 on OSX, in nginx.conf your may set <code>jvm_path "/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/jre/lib/server/libjvm.dylib";</code>
82-
</li>
8381
</ol>
8482
<h2>
8583
<a id="user-content-22-initialization-handler-for-nginx-worker" class="anchor" href="#22-initialization-handler-for-nginx-worker" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>2.2 Initialization Handler for nginx worker</h2>

‎Installation.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
1. Installation
2-
=============
1+
# 1. Installation
32

43
The lastest release is 0.5.0. Please check the [Update History](downloads.html) for more details.
54

‎Installation.md.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
<ol>
2-
<li>Installation
3-
=============</li>
4-
</ol>
1+
<h1>
2+
<a id="user-content-1-installation" class="anchor" href="#1-installation" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>1. Installation</h1>
53
<p>The lastest release is 0.5.0. Please check the <a href="downloads.html">Update History</a> for more details.</p>
64
<h2>
75
<a id="user-content-11-installation-by-binary" class="anchor" href="#11-installation-by-binary" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>1.1 Installation by Binary</h2>

‎configuration.html

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h2>
108108
<div class="highlight highlight-source-nginx"><pre>
109109
<span class="pl-c">###define jvm path, auto for auto-detect jvm path or a real path</span>
110110
<span class="pl-c">###for win32, jvm_path maybe is "C:/Program Files/Java/jdk1.7.0_25/jre/bin/server/jvm.dll";</span>
111-
<span class="pl-c">###for macosx, jvm_path maybe is "/Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents/Libraries/libserver.dylib";</span>
111+
<span class="pl-c">###for macosx, jvm_path maybe is "/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/jre/lib/server/libjvm.dylib";</span>
112112
<span class="pl-c">###for ubuntu, jvm_path maybe is "/usr/lib/jvm/java-7-oracle/jre/lib/amd64/server/libjvm.so";</span>
113113
<span class="pl-c">###for centos, jvm_path maybe is "/usr/java/jdk1.6.0_45/jre/lib/amd64/server/libjvm.so";</span>
114114
<span class="pl-c">###for centos 32bit, jvm_path maybe is "/usr/java/jdk1.7.0_51/jre/lib/i386/server/libjvm.so";</span>
@@ -149,7 +149,7 @@ <h3>
149149
<span class="pl-k">jvm_var</span> mrr <span class="pl-s">'/home/who/.m2/repository'</span>;
150150
<span class="pl-k">jvm_var</span> ncjar <span class="pl-s">'#{ncdev}/target/nginx-clojure-0.2.5.jar'</span>;
151151

152-
<span class="pl-k">jvm_options</span> <span class="pl-s">"-Djava.class.path=#{ncjar}:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar"</span>;</pre></div>
152+
<span class="pl-k">jvm_classpath</span> <span class="pl-s">"#{ncjar}:#{mrr}/clj-http/clj-http/0.7.8/clj-http-0.7.8.jar"</span>;</pre></div>
153153
<h3>
154154
<a id="user-content-specify-debug-ports-for-jvms" class="anchor" href="#specify-debug-ports-for-jvms" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Specify Debug Ports for JVMs</h3>
155155
<p>It 's a new feature since v0.2.5.
@@ -180,8 +180,6 @@ <h3>
180180
<li>When importing Swing We Must specifiy <code>jvm_options "-Djava.awt.headless=true"</code> , otherwise the nginx will hang.</li>
181181
<li>By adding the location of your clojure source files to the classpath,then just issue "nginx -s reload" and changes to the sources get picked up!</li>
182182
<li>You can remove clojure-1.5.1.jar from class path and point at your "lein uberjar" to pick up a different version of clojure.</li>
183-
<li>To use Java 7 on OSX, in nginx.conf your may set <code>jvm_path "/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/jre/lib/server/libjvm.dylib";</code>
184-
</li>
185183
</ol>
186184
<h2>
187185
<a id="user-content-22-initialization-handler-for-nginx-worker" class="anchor" href="#22-initialization-handler-for-nginx-worker" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>2.2 Initialization Handler for nginx worker</h2>
@@ -827,23 +825,6 @@ <h2>
827825
</footer>
828826
</div>
829827
</div>
830-
831-
<script type="text/javascript">
832-
$("a[href^='http']").attr("target","_blank");
833-
setTimeout("fixNavbarIssue();", 100);
834-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
835-
: "http://www.");
836-
document
837-
.write(unescape("%3Cscript src='"
838-
+ gaJsHost
839-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
840-
</script>
841-
<script type="text/javascript">
842-
try {
843-
var pageTracker = _gat._getTracker("UA-53526038-1");
844-
pageTracker._trackPageview();
845-
} catch (err) {
846-
}
847-
</script>
828+
848829
</body>
849830
</html>

‎content-template.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,6 @@
4242
<div id="footer">
4343
#{footer}
4444
</div>
45-
46-
<script type="text/javascript">
47-
$("a[href^='http']").attr("target","_blank");
48-
setTimeout("fixNavbarIssue();", 100);
49-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
50-
: "http://www.");
51-
document
52-
.write(unescape("%3Cscript src='"
53-
+ gaJsHost
54-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
55-
</script>
56-
<script type="text/javascript">
57-
try {
58-
var pageTracker = _gat._getTracker("UA-53526038-1");
59-
pageTracker._trackPageview();
60-
} catch (err) {
61-
}
62-
</script>
45+
6346
</body>
6447
</html>

‎directives.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,23 +1191,6 @@ <h2>
11911191
</footer>
11921192
</div>
11931193
</div>
1194-
1195-
<script type="text/javascript">
1196-
$("a[href^='http']").attr("target","_blank");
1197-
setTimeout("fixNavbarIssue();", 100);
1198-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
1199-
: "http://www.");
1200-
document
1201-
.write(unescape("%3Cscript src='"
1202-
+ gaJsHost
1203-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
1204-
</script>
1205-
<script type="text/javascript">
1206-
try {
1207-
var pageTracker = _gat._getTracker("UA-53526038-1");
1208-
pageTracker._trackPageview();
1209-
} catch (err) {
1210-
}
1211-
</script>
1194+
12121195
</body>
12131196
</html>

‎downloads.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -336,23 +336,6 @@ <h2>
336336
</footer>
337337
</div>
338338
</div>
339-
340-
<script type="text/javascript">
341-
$("a[href^='http']").attr("target","_blank");
342-
setTimeout("fixNavbarIssue();", 100);
343-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
344-
: "http://www.");
345-
document
346-
.write(unescape("%3Cscript src='"
347-
+ gaJsHost
348-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
349-
</script>
350-
<script type="text/javascript">
351-
try {
352-
var pageTracker = _gat._getTracker("UA-53526038-1");
353-
pageTracker._trackPageview();
354-
} catch (err) {
355-
}
356-
</script>
339+
357340
</body>
358341
</html>

‎embed.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -203,23 +203,6 @@ <h1>
203203
</footer>
204204
</div>
205205
</div>
206-
207-
<script type="text/javascript">
208-
$("a[href^='http']").attr("target","_blank");
209-
setTimeout("fixNavbarIssue();", 100);
210-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
211-
: "http://www.");
212-
document
213-
.write(unescape("%3Cscript src='"
214-
+ gaJsHost
215-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
216-
</script>
217-
<script type="text/javascript">
218-
try {
219-
var pageTracker = _gat._getTracker("UA-53526038-1");
220-
pageTracker._trackPageview();
221-
} catch (err) {
222-
}
223-
</script>
206+
224207
</body>
225208
</html>

‎index.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -185,23 +185,6 @@ <h1>
185185
</footer>
186186
</div>
187187
</div>
188-
189-
<script type="text/javascript">
190-
$("a[href^='http']").attr("target","_blank");
191-
setTimeout("fixNavbarIssue();", 100);
192-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
193-
: "http://www.");
194-
document
195-
.write(unescape("%3Cscript src='"
196-
+ gaJsHost
197-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
198-
</script>
199-
<script type="text/javascript">
200-
try {
201-
var pageTracker = _gat._getTracker("UA-53526038-1");
202-
pageTracker._trackPageview();
203-
} catch (err) {
204-
}
205-
</script>
188+
206189
</body>
207190
</html>

‎installation.html

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,8 @@ <h6 id="project_tagline">Nginx module for embedding Clojure / Java / Groovy prog
100100
<!-- MAIN CONTENT -->
101101
<div id="main_content_wrap" class="outer">
102102
<section id="main_content" class="inner">
103-
<ol>
104-
<li>Installation
105-
=============</li>
106-
</ol>
103+
<h1>
104+
<a id="user-content-1-installation" class="anchor" href="#1-installation" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>1. Installation</h1>
107105
<p>The lastest release is 0.5.0. Please check the <a href="downloads.html">Update History</a> for more details.</p>
108106
<h2>
109107
<a id="user-content-11-installation-by-binary" class="anchor" href="#11-installation-by-binary" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>1.1 Installation by Binary</h2>
@@ -163,23 +161,6 @@ <h2>
163161
</footer>
164162
</div>
165163
</div>
166-
167-
<script type="text/javascript">
168-
$("a[href^='http']").attr("target","_blank");
169-
setTimeout("fixNavbarIssue();", 100);
170-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
171-
: "http://www.");
172-
document
173-
.write(unescape("%3Cscript src='"
174-
+ gaJsHost
175-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
176-
</script>
177-
<script type="text/javascript">
178-
try {
179-
var pageTracker = _gat._getTracker("UA-53526038-1");
180-
pageTracker._trackPageview();
181-
} catch (err) {
182-
}
183-
</script>
164+
184165
</body>
185166
</html>

‎more.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -792,23 +792,6 @@ <h2>
792792
</footer>
793793
</div>
794794
</div>
795-
796-
<script type="text/javascript">
797-
$("a[href^='http']").attr("target","_blank");
798-
setTimeout("fixNavbarIssue();", 100);
799-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
800-
: "http://www.");
801-
document
802-
.write(unescape("%3Cscript src='"
803-
+ gaJsHost
804-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
805-
</script>
806-
<script type="text/javascript">
807-
try {
808-
var pageTracker = _gat._getTracker("UA-53526038-1");
809-
pageTracker._trackPageview();
810-
} catch (err) {
811-
}
812-
</script>
795+
813796
</body>
814797
</html>

‎quickstart.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -288,23 +288,6 @@ <h3>
288288
</footer>
289289
</div>
290290
</div>
291-
292-
<script type="text/javascript">
293-
$("a[href^='http']").attr("target","_blank");
294-
setTimeout("fixNavbarIssue();", 100);
295-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
296-
: "http://www.");
297-
document
298-
.write(unescape("%3Cscript src='"
299-
+ gaJsHost
300-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
301-
</script>
302-
<script type="text/javascript">
303-
try {
304-
var pageTracker = _gat._getTracker("UA-53526038-1");
305-
pageTracker._trackPageview();
306-
} catch (err) {
307-
}
308-
</script>
291+
309292
</body>
310293
</html>

‎sharedmap.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -239,23 +239,6 @@ <h2>
239239
</footer>
240240
</div>
241241
</div>
242-
243-
<script type="text/javascript">
244-
$("a[href^='http']").attr("target","_blank");
245-
setTimeout("fixNavbarIssue();", 100);
246-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
247-
: "http://www.");
248-
document
249-
.write(unescape("%3Cscript src='"
250-
+ gaJsHost
251-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
252-
</script>
253-
<script type="text/javascript">
254-
try {
255-
var pageTracker = _gat._getTracker("UA-53526038-1");
256-
pageTracker._trackPageview();
257-
} catch (err) {
258-
}
259-
</script>
242+
260243
</body>
261244
</html>

‎subpub.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -354,23 +354,6 @@ <h2>
354354
</footer>
355355
</div>
356356
</div>
357-
358-
<script type="text/javascript">
359-
$("a[href^='http']").attr("target","_blank");
360-
setTimeout("fixNavbarIssue();", 100);
361-
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."
362-
: "http://www.");
363-
document
364-
.write(unescape("%3Cscript src='"
365-
+ gaJsHost
366-
+ "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
367-
</script>
368-
<script type="text/javascript">
369-
try {
370-
var pageTracker = _gat._getTracker("UA-53526038-1");
371-
pageTracker._trackPageview();
372-
} catch (err) {
373-
}
374-
</script>
357+
375358
</body>
376359
</html>

0 commit comments

Comments
 (0)