You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by ds...@apache.org on 2013/11/18 23:40:39 UTC
svn commit: r1543208 - in /incubator/streams/branches/webservice:
streams-components/pom.xml
streams-web/src/main/java/org/apache/streams/mvc/controller/StreamsWebController.java
streams-web/src/main/webapp/help/404.html
Author: dsullivan
Date: Mon Nov 18 22:40:39 2013
New Revision: 1543208
URL: http://svn.apache.org/r1543208
Log:
patch from Carol Hansen adding 404
Added:
incubator/streams/branches/webservice/streams-web/src/main/webapp/help/404.html
Modified:
incubator/streams/branches/webservice/streams-components/pom.xml
incubator/streams/branches/webservice/streams-web/src/main/java/org/apache/streams/mvc/controller/StreamsWebController.java
Modified: incubator/streams/branches/webservice/streams-components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-components/pom.xml?rev=1543208&r1=1543207&r2=1543208&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-components/pom.xml (original)
+++ incubator/streams/branches/webservice/streams-components/pom.xml Mon Nov 18 22:40:39 2013
@@ -93,6 +93,16 @@
<version>${easymock.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.2</version>
+ </dependency>
</dependencies>
Modified: incubator/streams/branches/webservice/streams-web/src/main/java/org/apache/streams/mvc/controller/StreamsWebController.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-web/src/main/java/org/apache/streams/mvc/controller/StreamsWebController.java?rev=1543208&r1=1543207&r2=1543208&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-web/src/main/java/org/apache/streams/mvc/controller/StreamsWebController.java (original)
+++ incubator/streams/branches/webservice/streams-web/src/main/java/org/apache/streams/mvc/controller/StreamsWebController.java Mon Nov 18 22:40:39 2013
@@ -92,7 +92,7 @@ public class StreamsWebController {
}
/**
- * this method is the entry point for receiving activity
+ * this method is the entry po int for receiving activity
*
* @param subscriberID the id of the subscriber
* @return an array of activity for this subscriber
Added: incubator/streams/branches/webservice/streams-web/src/main/webapp/help/404.html
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-web/src/main/webapp/help/404.html?rev=1543208&view=auto
==============================================================================
--- incubator/streams/branches/webservice/streams-web/src/main/webapp/help/404.html (added)
+++ incubator/streams/branches/webservice/streams-web/src/main/webapp/help/404.html Mon Nov 18 22:40:39 2013
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/html">
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../demo/css/helpStyles.css" />
+ <!-- Bootstrap -->
+ <link href="../demo/css/bootstrap.min.css" rel="stylesheet" media="screen">
+ <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!--[if lt IE 9]>
+ <script src="../demo/js/html5shiv.js"></script>
+ <script src="../demo/js/respond.min.js"></script>
+ <![endif]-->
+</head>
+
+<body>
+ <p>404 Help page</p>
+
+ <!-- Bootstrap core JavaScript
+ ================================================== -->
+ <!-- Placed at the end of the document so the pages load faster -->
+ <script src="js/bootstrap.min.js"></script>
+</body>
+</html>
\ No newline at end of file