Skip to content
This repository has been archived by the owner on Apr 5, 2022. It is now read-only.

URL Cleanup #49

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ This sample demonstrates how to create a custom module project, including integr

### smartgrid-prediction

This sample showcases a fictional use of Spring XD in the context of smart electricity metering and production. It was inspired by the http://www.cse.iitb.ac.in/debs2014/?page_id=42[ACM Distributed Event Based Systems Grand Challenge 2014].
This sample showcases a fictional use of Spring XD in the context of smart electricity metering and production. It was inspired by the https://www.cse.iitb.ac.in/debs2014/?page_id=42[ACM Distributed Event Based Systems Grand Challenge 2014].

### syslog

Expand All @@ -94,9 +94,9 @@ A simple custom processor module project, including integration tests. This one


[Spring XD]: https://github.com/spring-projects/spring-xd
[Spring Batch]: http://projects.spring.io/spring-batch/
[Spring Batch]: https://projects.spring.io/spring-batch/
[Spring Batch word-count sample for Hadoop]: https://github.com/SpringSource/spring-data-book/tree/master/hadoop/batch-wordcount
[D3 Javascript library]: http://d3js.org/
[Pivotal HD]: http://www.gopivotal.com/products/pivotal-hd
[Kafka]: http://kafka.apache.org
[D3 Javascript library]: https://d3js.org/
[Pivotal HD]: https://pivotal.io/products/pivotal-hd
[Kafka]: https://kafka.apache.org
[Spring Integration Java DSL]: https://github.com/spring-projects/spring-integration-java-dsl
2 changes: 1 addition & 1 deletion analytics-dashboard/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ These taps correspond to recording
* A count of the hashtags in the tweets. The incoming JSON data from the twitter stream has this information ocated under the path `entities.hashtags.text`. The name of the counter is explicitly specified to be 'hashtags'.


All that's required to run the app is to serve up the `public` directory from a web server listening on port 9889. There are various ways you can do this. For example, you can use the Spring Boot CLI. If you have it [installed](http://docs.spring.io/spring-boot/docs/1.1.4.RELEASE/reference/html/getting-started-installing-spring-boot.html#getting-started-installing-the-cli), run
All that's required to run the app is to serve up the `public` directory from a web server listening on port 9889. There are various ways you can do this. For example, you can use the Spring Boot CLI. If you have it [installed](https://docs.spring.io/spring-boot/docs/1.1.4.RELEASE/reference/html/getting-started-installing-spring-boot.html#getting-started-installing-the-cli), run

spring run dashboard.groovy

Expand Down
28 changes: 14 additions & 14 deletions analytics-dashboard/public/js/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ===================================================
* bootstrap-transition.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#transitions
* https://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
*
Expand All @@ -23,7 +23,7 @@
"use strict"; // jshint ;_;


/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
/* CSS TRANSITION SUPPORT (https://www.modernizr.com/)
* ======================================================= */

$(function () {
Expand Down Expand Up @@ -59,7 +59,7 @@

}(window.jQuery);/* ==========================================================
* bootstrap-alert.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#alerts
* https://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -157,7 +157,7 @@

}(window.jQuery);/* ============================================================
* bootstrap-button.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* https://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -261,7 +261,7 @@

}(window.jQuery);/* ==========================================================
* bootstrap-carousel.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#carousel
* https://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -467,7 +467,7 @@

}(window.jQuery);/* =============================================================
* bootstrap-collapse.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#collapse
* https://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -633,7 +633,7 @@

}(window.jQuery);/* ============================================================
* bootstrap-dropdown.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* https://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -802,7 +802,7 @@
}(window.jQuery);
/* =========================================================
* bootstrap-modal.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#modals
* https://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -1049,7 +1049,7 @@
}(window.jQuery);
/* ===========================================================
* bootstrap-tooltip.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* https://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -1410,7 +1410,7 @@
}(window.jQuery);
/* ===========================================================
* bootstrap-popover.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#popovers
* https://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -1524,7 +1524,7 @@
}(window.jQuery);
/* =============================================================
* bootstrap-scrollspy.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* https://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -1685,7 +1685,7 @@

}(window.jQuery);/* ========================================================
* bootstrap-tab.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#tabs
* https://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -1828,7 +1828,7 @@

}(window.jQuery);/* =============================================================
* bootstrap-typeahead.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* https://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -2163,7 +2163,7 @@
}(window.jQuery);
/* ==========================================================
* bootstrap-affix.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#affix
* https://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion analytics-dashboard/public/js/d3.v3.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion analytics-pmml/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Prerequisites
Save the following PMML code as a file with the name link:iris-flower-classification-naive-bayes-1.pmml.xml[] as a file somewhere on your hard drive (we'll assume `/data/iris-flower-classification-naive-bayes-1.pmml.xml`).

```xml
<PMML version="4.1" xmlns="http://www.dmg.org/PMML-4_1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dmg.org/PMML-4_1 http://www.dmg.org/v4-1/pmml-4-1.xsd">
<PMML version="4.1" xmlns="/PMML-4_1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="/PMML-4_1/ http://dmg.org/v4-1/pmml-4-1.xsd">
<Header copyright="Copyright (c) 2014 tom" description="NaiveBayes Model">
<Extension name="user" value="tom" extender="Rattle/PMML"/>
<Application name="Rattle/PMML" version="1.4"/>
Expand Down
8 changes: 4 additions & 4 deletions batch-hashtag-count/README.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ This sample will take an input file with Twitter JSON data and count the occurre

In order for the sample to run you will need to have installed:

* A recent version of Spring XD. See link:http://projects.spring.io/spring-xd/#quick-start/[Quick Start]
* Hadoop version 2.x. See link:http://docs.spring.io/spring-xd/docs/current-SNAPSHOT/reference/html/#installing-hadoop[Installing Hadoop]
* A recent version of Spring XD. See link:https://projects.spring.io/spring-xd/#quick-start/[Quick Start]
* Hadoop version 2.x. See link:https://docs.spring.io/spring-xd/docs/current-SNAPSHOT/reference/html/#installing-hadoop[Installing Hadoop]

Furthermore you must have your Twitter API credentials ready:

Expand All @@ -34,13 +34,13 @@ Build the sample simply by executing:

$ mvn clean package

The project link:https://github.com/spring-projects/spring-xd-samples/blob/master/batch-hashtag-count/pom.xml[pom] declares `spring-xd-module-parent` as its parent. This adds the dependencies needed to compile and test the module and also configures the link:http://docs.spring.io/spring-boot/docs/current/reference/html/build-tool-plugins-maven-plugin.html[Spring Boot Maven Plugin] to package the module as an uber-jar, packaging any dependencies that are not already provided by the Spring XD container. In this case there are no additional dependencies so the artifact is built as a common jar. See the link:http://docs.spring.io/spring-xd/docs/current/reference/html/#modules[Modules] section in the Spring XD Reference for more details on module packaging.
The project link:https://github.com/spring-projects/spring-xd-samples/blob/master/batch-hashtag-count/pom.xml[pom] declares `spring-xd-module-parent` as its parent. This adds the dependencies needed to compile and test the module and also configures the link:https://docs.spring.io/spring-boot/docs/current/reference/html/build-tool-plugins-maven-plugin.html[Spring Boot Maven Plugin] to package the module as an uber-jar, packaging any dependencies that are not already provided by the Spring XD container. In this case there are no additional dependencies so the artifact is built as a common jar. See the link:https://docs.spring.io/spring-xd/docs/current/reference/html/#modules[Modules] section in the Spring XD Reference for more details on module packaging.

## Building with Gradle

$./gradlew clean bootRepackage

The project's link:https://github.com/spring-projects/spring-xd-samples/blob/master/batch-hashtag-count/build.gradle[build.gradle] applies the `spring-xd-module` plugin, providing analagous build and packaging support for gradle. This plugin also applies the link:http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/html/build-tool-plugins-gradle-plugin.html[Spring Boot Gradle Plugin] as well as the link:https://github.com/spring-projects/gradle-plugins/tree/master/propdeps-plugin[propdeps plugin].
The project's link:https://github.com/spring-projects/spring-xd-samples/blob/master/batch-hashtag-count/build.gradle[build.gradle] applies the `spring-xd-module` plugin, providing analagous build and packaging support for gradle. This plugin also applies the link:https://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/html/build-tool-plugins-gradle-plugin.html[Spring Boot Gradle Plugin] as well as the link:https://github.com/spring-projects/gradle-plugins/tree/master/propdeps-plugin[propdeps plugin].

## Running the Sample

Expand Down
6 changes: 3 additions & 3 deletions batch-hive/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ The modules `src\main\resources\config` directory contains the `spring-module.xm
<prop key="hive.server.port">10000</prop>
</util:properties>

If your Hadoop cluster has a HiveServer running then change the `hive.server.host` and `hive.server.port` properties to match your cluster. Note that HiveServer2 won't work since that uses JDBC. This example only works with the Thrift based original HiveServer. You can also start a HiveServer locally, see the [HiveServer documentation](https://cwiki.apache.org/confluence/display/Hive/HiveServer). To download pre Hive 1.0 releases you need to use the [Apache archive](http://archive.apache.org/dist/hive/).
If your Hadoop cluster has a HiveServer running then change the `hive.server.host` and `hive.server.port` properties to match your cluster. Note that HiveServer2 won't work since that uses JDBC. This example only works with the Thrift based original HiveServer. You can also start a HiveServer locally, see the [HiveServer documentation](https://cwiki.apache.org/confluence/display/Hive/HiveServer). To download pre Hive 1.0 releases you need to use the [Apache archive](https://archive.apache.org/dist/hive/).

The same `spring-module.xml` file also defines the Hadoop configuration, defaulting to what is specified in the Spring XD configuration.

Expand Down Expand Up @@ -126,5 +126,5 @@ with:
$ HADOOP_USER_NAME=hive hadoop fs -rm -r /xd/hiveout

[pom]: https://github.com/spring-projects/spring-xd-samples/blob/master/batch-hive/pom.xml
[Spring Boot Maven Plugin]: http://docs.spring.io/spring-boot/docs/current/reference/html/build-tool-plugins-maven-plugin.html
[Modules]: http://docs.spring.io/spring-xd/docs/current/reference/html/#modules
[Spring Boot Maven Plugin]: https://docs.spring.io/spring-boot/docs/current/reference/html/build-tool-plugins-maven-plugin.html
[Modules]: https://docs.spring.io/spring-xd/docs/current/reference/html/#modules