Author: ghuber
Date: Mon Sep 8 07:07:09 2014
New Revision: 1623307
URL: http://svn.apache.org/r1623307
Log:
Add use of spring mobile code to roller license agreements.
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/version.txt
Modified:
roller/trunk/NOTICE.txt
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java
Modified: roller/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/roller/trunk/NOTICE.txt?rev=1623307&r1=1623306&r2=1623307&view=diff
==============================================================================
--- roller/trunk/NOTICE.txt (original)
+++ roller/trunk/NOTICE.txt Mon Sep 8 07:07:09 2014
@@ -23,6 +23,9 @@ This product includes:
Copyright (c) 2003-2004 dynarch.com
All rights reserved.
http://trac.xinha.org/wiki/Licence
+
+* Snippets of code from Spring Mobile
+ Copyright (c) 2010-2014 Pivotal, Inc. All Rights Reserved.
OTHER NOTICES
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java?rev=1623307&r1=1623306&r2=1623307&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/DeviceResolverRequestFilter.java
Mon Sep 8 07:07:09 2014
@@ -13,6 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+/*
+ * Code from Spring Mobile and modified for use in Apache Roller
+ * https://github.com/spring-projects/spring-mobile 11 Feb 2014
+ *
+ */
+
package org.apache.roller.weblogger.ui.rendering.filters;
import java.io.IOException;
@@ -71,6 +77,10 @@ public class DeviceResolverRequestFilter
this.deviceResolver = deviceResolver;
}
+ /**
+ * @see
org.springframework.web.filter.OncePerRequestFilter#doFilterInternal(javax.servlet.http.HttpServletRequest,
+ * javax.servlet.http.HttpServletResponse, javax.servlet.FilterChain)
+ */
@Override
protected void doFilterInternal(HttpServletRequest request,
HttpServletResponse response, FilterChain filterChain)
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java?rev=1623307&r1=1623306&r2=1623307&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/Device.java
Mon Sep 8 07:07:09 2014
@@ -13,6 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+/*
+ * Code from Spring Mobile and modified for use in Apache Roller
+ * https://github.com/spring-projects/spring-mobile 11 Feb 2014
+ *
+ */
package org.apache.roller.weblogger.ui.rendering.util.mobile;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java?rev=1623307&r1=1623306&r2=1623307&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceResolver.java
Mon Sep 8 07:07:09 2014
@@ -13,6 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+/*
+ * Code from Spring Mobile and modified for use in Apache Roller
+ * https://github.com/spring-projects/spring-mobile 11 Feb 2014
+ *
+ */
package org.apache.roller.weblogger.ui.rendering.util.mobile;
import javax.servlet.http.HttpServletRequest;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java?rev=1623307&r1=1623306&r2=1623307&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceType.java
Mon Sep 8 07:07:09 2014
@@ -13,6 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+/*
+ * Code from Spring Mobile and modified for use in Apache Roller
+ * https://github.com/spring-projects/spring-mobile 11 Feb 2014
+ *
+ */
package org.apache.roller.weblogger.ui.rendering.util.mobile;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java?rev=1623307&r1=1623306&r2=1623307&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/DeviceUtils.java
Mon Sep 8 07:07:09 2014
@@ -13,6 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+/*
+ * Code from Spring Mobile and modified for use in Apache Roller
+ * https://github.com/spring-projects/spring-mobile 11 Feb 2014
+ *
+ */
package org.apache.roller.weblogger.ui.rendering.util.mobile;
import javax.servlet.http.HttpServletRequest;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java?rev=1623307&r1=1623306&r2=1623307&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDevice.java
Mon Sep 8 07:07:09 2014
@@ -1,6 +1,6 @@
/*
* Copyright 2010-2014 the original author or authors.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -13,6 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+/*
+ * Code from Spring Mobile and modified for use in Apache Roller
+ * https://github.com/spring-projects/spring-mobile 11 Feb 2014
+ *
+ */
package org.apache.roller.weblogger.ui.rendering.util.mobile;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java?rev=1623307&r1=1623306&r2=1623307&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java
Mon Sep 8 07:07:09 2014
@@ -13,6 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+/*
+ * Code from Spring Mobile and modified for use in Apache Roller
+ * https://github.com/spring-projects/spring-mobile 11 Feb 2014
+ *
+ */
package org.apache.roller.weblogger.ui.rendering.util.mobile;
import java.util.ArrayList;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java?rev=1623307&r1=1623306&r2=1623307&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/MobileDeviceRepository.java
Mon Sep 8 07:07:09 2014
@@ -13,6 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+/*
+ * Code from Spring Mobile and modified for use in Apache Roller
+ * https://github.com/spring-projects/spring-mobile 11 Feb 2014
+ *
+ */
package org.apache.roller.weblogger.ui.rendering.util.mobile;
import javax.servlet.http.HttpServletRequest;
