Skip to content

Commit

Permalink
Revert "Reverting the last commit which messed the build"
Browse files Browse the repository at this point in the history 
This reverts commit d7c0870, reversing
changes made to 66653c0.
  • Loading branch information
@francbartoli
francbartoli committed Dec 2, 2016
1 parent d7c0870 commit 40725e4
Show file tree
Hide file tree
Showing 11 changed files with 1,005 additions and 1,102 deletions.
1,717 changes: 839 additions & 878 deletions pom.xml
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/main/resources/GeoServerApplication.properties
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
GeoNodeAuthProviderPanel.geonodeSettings=GeoNode Security Settings
GeoNodeAuthFilterPanel.noFilterSettings=There are no user-configurable options for the GeoNode Authentication Filter
GeoNodeAnonymousAuthFilterPanel.noFilterSettings=There are no user-configurable options for the GeoNode Authentication Filter

GeoNodeAuthProviderPanel.short=GeoNode
GeoNodeAuthProviderPanel.title=GeoNode Authentication Provider
GeoNodeAuthProviderPanel.description=Authentication via Connection to GeoNode Frontend
GeoNodeAuthProviderPanel.geonodeBaseUrl=Frontend Site Base URL
GeoNodeAuthProviderPanel.geonodeSettings=GeoNode Filter Settings

GeoNodeAuthFilterPanel.short=GeoNode Cookies
GeoNodeAuthFilterPanel.title=GeoNode Cookie Handler
GeoNodeAuthFilterPanel.description=Respect Django session cookies in GeoServer

GeoNodeAnonymousAuthFilterPanel.short=GeoNode Anonymous
GeoNodeAnonymousAuthFilterPanel.title=GeoNode Anonymous authentication handler
GeoNodeAnonymousAuthFilterPanel.description=Required for GeoServer to honor GeoNode security settings for anonymous users
GeoNodeAnonymousAuthFilterPanel.noFilterSettings=There are no user-configurable options for the GeoNode Authentication Filter

GeoNodeAuthFilterPanel.noFilterSettings=There are no user-configurable options for the GeoNode Authentication Filter
GeoNodeAnonymousAuthFilterPanel.description=Required for GeoServer to honor GeoNode security settings for anonymous users
286 changes: 126 additions & 160 deletions src/main/resources/applicationContext.xml
View file
Original file line number Diff line number Diff line change
@@ -1,167 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2016 Open Source Geospatial Foundation. All rights
reserved. This code is licensed under the GPL 2.0 license, available at the
root application directory. -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:sec="http://www.springframework.org/schema/security"
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.0.4.xsd
http://www.springframework.org/schema/security/oauth2
http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd">

<!-- GeoNode Integration -->
<bean id="processRestletMapping" class="org.geoserver.rest.RESTMapping">
<property name="routes">
<map>
<entry>
<key>
<value>/process/batchDownload/launch</value>
</key>
<value>downloadLauncherRestlet</value>
</entry>
<entry>
<key>
<value>/process/batchDownload/status</value>
</key>
<value>downloadStatusRestlet</value>
</entry>
<entry>
<key>
<value>/process/batchDownload/download</value>
</key>
<value>downloadReadyRestlet</value>
</entry>
<entry>
<key>
<value>/process/batchDownload/kill</value>
</key>
<value>downloadKillerRestlet</value>
</entry>
</map>
</property>
</bean>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">

<bean id="processExecutorThreadFactory"
class="org.springframework.scheduling.concurrent.CustomizableThreadFactory">
<description>ThreadFactory allowing for customizing the created
threads (name, priority, etc)</description>
<constructor-arg value="Process Thread" />
<property name="threadPriority">
<description>Thread priority, value from 1 to 10, defaults to 5,
meaning java.lang.Thread#NORM_PRIORITY</description>
<value>5</value>
</property>
<property name="daemon">
<description>Specify executor threads to be daemon threads so that
they shutdown when the application does</description>
<value>true</value>
</property>
</bean>
<beans>
<bean id="processRestletMapping" class="org.geoserver.rest.RESTMapping">
<property name="routes">
<map>
<entry>
<key>
<value>/process/batchDownload/launch</value>
</key>
<value>downloadLauncherRestlet</value>
</entry>
<entry>
<key>
<value>/process/batchDownload/status</value>
</key>
<value>downloadStatusRestlet</value>
</entry>
<entry>
<key>
<value>/process/batchDownload/download</value>
</key>
<value>downloadReadyRestlet</value>
</entry>
<entry>
<key>
<value>/process/batchDownload/kill</value>
</key>
<value>downloadKillerRestlet</value>
</entry>
</map>
</property>
</bean>

<bean id="processExecutor" class="org.geotools.process.ThreadPoolProcessExecutor">
<description>An Executor that provides methods to manage termination
and methods that can produce a {@link Progress}
for tracking one or more asynchronous tasks.</description>
<constructor-arg value="5">
<description>Number of process executor threads in the pool</description>
</constructor-arg>
<constructor-arg ref="processExecutorThreadFactory">
<description>Thread factory for this process executor</description>
</constructor-arg>
</bean>
<bean id="processExecutorThreadFactory" class="org.springframework.scheduling.concurrent.CustomizableThreadFactory">
<description>ThreadFactory allowing for customizing the created threads (name, priority, etc)</description>
<constructor-arg value="Process Thread" />
<property name="threadPriority">
<description>Thread priority, value from 1 to 10, defaults to 5, meaning java.lang.Thread#NORM_PRIORITY</description>
<value>5</value>
</property>
<property name="daemon">
<description>Specify executor threads to be daemon threads so that they shutdown when the application does</description>
<value>true</value>
</property>
</bean>

<bean id="processStorageManagerFactory"
class="org.geonode.process.storage.GeoServerDataDirStorageManagerFactory">
<description>A storage manager is a process collaborator that
abstracts out the process from the place where it can
store temporary files. This one uses a directory inside the GeoServer data
directory as the temp directory</description>
<constructor-arg ref="resourceLoader">
<description>The GeoServerResourceLoader (defined in geoserver's main
module) where to get the data directory
location from</description>
</constructor-arg>
<constructor-arg value="process_tmp_dir">
<description>The name of the directory inside the geoserver data dir
to use as the root for processes' temp data</description>
</constructor-arg>
</bean>
<bean id="processExecutor" class="org.geotools.process.ThreadPoolProcessExecutor">
<description>An Executor that provides methods to manage termination and methods that can produce a {@link Progress}
for tracking one or more asynchronous tasks.</description>
<constructor-arg value="5">
<description>Number of process executor threads in the pool</description>
</constructor-arg>
<constructor-arg ref="processExecutorThreadFactory">
<description>Thread factory for this process executor</description>
</constructor-arg>
</bean>

<bean id="processController" class="org.geonode.process.control.DefaultProcessController">
<description>Global process manager to issue, query and kill
asynchronous processes</description>
<constructor-arg ref="processExecutor" />
<constructor-arg ref="processStorageManagerFactory">
<description>factory to create storage managers for each submitted
async process</description>
</constructor-arg>
<constructor-arg value="5">
<description>process eviction check period in seconds. Instructs the
controller to check for process eviction
every X seconds</description>
</constructor-arg>
<constructor-arg value="10">
<description>Process eviction timeout. Instructs the controller to
remove dead processes (and any data they may be
holding) X MINUTES</description>
</constructor-arg>
</bean>
<bean id="processStorageManagerFactory" class="org.geonode.process.storage.GeoServerDataDirStorageManagerFactory">
<description>A storage manager is a process collaborator that abstracts out the process from the place where it can
store temporary files. This one uses a directory inside the GeoServer data directory as the temp directory</description>
<constructor-arg ref="resourceLoader">
<description>The GeoServerResourceLoader (defined in geoserver's main module) where to get the data directory
location from</description>
</constructor-arg>
<constructor-arg value="process_tmp_dir">
<description>The name of the directory inside the geoserver data dir to use as the root for processes' temp data</description>
</constructor-arg>
</bean>

<bean id="downloadLauncherRestlet" class="org.geonode.rest.batchdownload.DownloadLauncherRestlet">
<!-- the GeoServer catalog -->
<constructor-arg ref="catalog" />
<constructor-arg ref="processController" />
</bean>
<bean id="downloadStatusRestlet" class="org.geonode.rest.batchdownload.DownloadStatusRestlet">
<!-- the GeoServer catalog -->
<constructor-arg ref="processController" />
</bean>
<bean id="downloadReadyRestlet" class="org.geonode.rest.batchdownload.DownloadReadyRestlet">
<constructor-arg ref="processController" />
</bean>
<bean id="downloadKillerRestlet" class="org.geonode.rest.batchdownload.DownloadKillerRestlet">
<constructor-arg ref="processController" />
</bean>
<bean id="geoNodeSecurityProvider" class="org.geonode.security.GeoNodeSecurityProvider" />
<bean class="org.geonode.security.GeoNodeAnonymousSecurityProvider" />
<bean class="org.geonode.security.GeoNodeDataAccessManager">
<constructor-arg ref="geoNodeSecurityProvider" />
</bean>
<bean id="geonodeAnonymousAuthFilterPanelInfo"
class="org.geonode.web.security.GeoNodeAnonymousAuthFilterPanelInfo">
<property name="id" value="security.geonodeAnonymousAuthFilter" />
<property name="shortTitleKey" value="GeoNodeAnonymousAuthFilterPanel.short" />
<property name="titleKey" value="GeoNodeAnonymousAuthFilterPanel.title" />
<property name="descriptionKey" value="GeoNodeAnonymousAuthFilterPanel.description" />
</bean>
<bean id="geonodeAuthFilterPanelInfo" class="org.geonode.web.security.GeoNodeAuthFilterPanelInfo">
<property name="id" value="security.geonodeAuthFilter" />
<property name="shortTitleKey" value="GeoNodeAuthFilterPanel.short" />
<property name="titleKey" value="GeoNodeAuthFilterPanel.title" />
<property name="descriptionKey" value="GeoNodeAuthFilterPanel.description" />
</bean>
<bean id="geonodeAuthProviderPanelInfo" class="org.geonode.web.security.GeoNodeAuthProviderPanelInfo">
<property name="id" value="security.geonodeAuthProvider" />
<property name="shortTitleKey" value="GeoNodeAuthProviderPanel.short" />
<property name="titleKey" value="GeoNodeAuthProviderPanel.title" />
<property name="descriptionKey" value="GeoNodeAuthProviderPanel.description" />
</bean>
<bean id="GeonodeWFSCredentialsPlugin" class="org.geonode.wfs.GeonodeWFSCredentialsPlugin">
<description>Sets some geonode specific metadata properties to WFS
transactions
(such as full user name and email) to be available to the lower level
geotools data access layer.
For the specific case of versioning datastores this data can be used as
part of the commit information</description>
</bean>
<!-- XStream persister initializer -->
<bean id="gNodeAuthFilterConfigXStreamPersisterInitializer"
class="org.geonode.security.GeoNodeAuthFilterConfigXStreamPersisterInitializer" />
<bean id="processController" class="org.geonode.process.control.DefaultProcessController">
<description>Global process manager to issue, query and kill asynchronous processes</description>
<constructor-arg ref="processExecutor" />
<constructor-arg ref="processStorageManagerFactory">
<description>factory to create storage managers for each submitted async process</description>
</constructor-arg>
<constructor-arg value="5">
<description>process eviction check period in seconds. Instructs the controller to check for process eviction
every X seconds</description>
</constructor-arg>
<constructor-arg value="10">
<description>Process eviction timeout. Instructs the controller to remove dead processes (and any data they may be
holding) X MINUTES</description>
</constructor-arg>
</bean>

<bean id="downloadLauncherRestlet" class="org.geonode.rest.batchdownload.DownloadLauncherRestlet">
<!-- the GeoServer catalog -->
<constructor-arg ref="catalog" />
<constructor-arg ref="processController" />
</bean>
<bean id="downloadStatusRestlet" class="org.geonode.rest.batchdownload.DownloadStatusRestlet">
<!-- the GeoServer catalog -->
<constructor-arg ref="processController" />
</bean>
<bean id="downloadReadyRestlet" class="org.geonode.rest.batchdownload.DownloadReadyRestlet">
<constructor-arg ref="processController" />
</bean>
<bean id="downloadKillerRestlet" class="org.geonode.rest.batchdownload.DownloadKillerRestlet">
<constructor-arg ref="processController" />
</bean>
<bean id="geoNodeSecurityProvider" class="org.geonode.security.GeoNodeSecurityProvider"/>
<bean class="org.geonode.security.GeoNodeAnonymousSecurityProvider"/>
<bean class="org.geonode.security.GeoNodeDataAccessManager">
<constructor-arg ref="geoNodeSecurityProvider" />
</bean>
<bean id="geonodeAnonymousAuthFilterPanelInfo" class="org.geonode.web.security.GeoNodeAnonymousAuthFilterPanelInfo">
<property name="id" value="security.geonodeAnonymousAuthFilter" />
<property name="shortTitleKey" value="GeoNodeAnonymousAuthFilterPanel.short" />
<property name="titleKey" value="GeoNodeAnonymousAuthFilterPanel.title" />
<property name="descriptionKey" value="GeoNodeAnonymousAuthFilterPanel.description"/>
</bean>
<bean id="geonodeAuthFilterPanelInfo" class="org.geonode.web.security.GeoNodeAuthFilterPanelInfo">
<property name="id" value="security.geonodeAuthFilter" />
<property name="shortTitleKey" value="GeoNodeAuthFilterPanel.short" />
<property name="titleKey" value="GeoNodeAuthFilterPanel.title" />
<property name="descriptionKey" value="GeoNodeAuthFilterPanel.description"/>
</bean>
<bean id="geonodeAuthProviderPanelInfo" class="org.geonode.web.security.GeoNodeAuthProviderPanelInfo">
<property name="id" value="security.geonodeAuthProvider" />
<property name="shortTitleKey" value="GeoNodeAuthProviderPanel.short" />
<property name="titleKey" value="GeoNodeAuthProviderPanel.title" />
<property name="descriptionKey" value="GeoNodeAuthProviderPanel.description"/>
</bean>
<bean id="GeonodeWFSCredentialsPlugin" class="org.geonode.wfs.GeonodeWFSCredentialsPlugin">
<description>Sets some geonode specific metadata properties to WFS transactions
(such as full user name and email) to be available to the lower level geotools data access layer.
For the specific case of versioning datastores this data can be used as part of the commit information</description>
</bean>
<!-- XStream persister initializer -->
<bean id="gNodeAuthFilterConfigXStreamPersisterInitializer" class="org.geonode.security.GeoNodeAuthFilterConfigXStreamPersisterInitializer" />
</beans>
5 changes: 0 additions & 5 deletions src/main/webapp/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,6 @@
<listener-class>org.geoserver.platform.GeoServerHttpSessionListenerProxy</listener-class>
</listener>

<!-- request context listener for session-scoped beans -->
<listener>
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener>

<!-- spring dispatcher servlet, dispatches all incoming requests -->
<servlet>
<servlet-name>dispatcher</servlet-name>
Expand Down
12 changes: 1 addition & 11 deletions src/main/webapp/data/global.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@
<onlineResource>http://geoserver.org</onlineResource>
<verbose>false</verbose>
<verboseExceptions>false</verboseExceptions>
<metadata>
<map>
<entry>
<string>quietOnNotFound</string>
<boolean>false</boolean>
</entry>
</map>
</metadata>
<localWorkspaceIncludesPrefix>false</localWorkspaceIncludesPrefix>
</settings>
<jai>
Expand All @@ -37,11 +29,9 @@
<queueType>UNBOUNDED</queueType>
<imageIOCacheThreshold>10240</imageIOCacheThreshold>
</coverageAccess>
<updateSequence>147</updateSequence>
<updateSequence>63</updateSequence>
<featureTypeCacheSize>0</featureTypeCacheSize>
<globalServices>true</globalServices>
<xmlPostRequestLogBufferSize>1024</xmlPostRequestLogBufferSize>
<xmlExternalEntitiesEnabled>false</xmlExternalEntitiesEnabled>
<webUIMode>DEFAULT</webUIMode>
<resourceErrorHandling>SKIP_MISCONFIGURED_LAYERS</resourceErrorHandling>
</global>
Loading

1 comment on commit 40725e4

@francbartoli
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need a branch/tag as agreed with @afabiani

Please sign in to comment.