Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed spring configuration
  • Loading branch information
autermann committed Jan 20, 2017
1 parent fdf4db3 commit e8dabd3
Show file tree
Hide file tree
Showing 17 changed files with 127 additions and 116 deletions.
34 changes: 34 additions & 0 deletions NOTICE
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
This project includes:

52°North Faroe under The Apache Software License, Version 2.0
52°North Faroe JSON Backend under The Apache Software License, Version 2.0
52°North Iceland under The Apache Software License, Version 2.0
52°North Iceland Streaming Interfaces under The Apache Software License, Version 2.0
52°North Iceland WPS under The Apache Software License, Version 2.0
Expand All @@ -26,6 +27,7 @@ This project includes:
52°North Iceland WPS Webapp under The Apache Software License, Version 2.0
52°North Jan Mayen under The Apache Software License, Version 2.0
52°North Shetland under The Apache Software License, Version 2.0
52°North Svalbard under The Apache Software License, Version 2.0
AOP alliance under Public Domain
Apache Commons Codec under Apache License, Version 2.0
Apache Commons Configuration under Apache License, Version 2.0
Expand All @@ -39,8 +41,11 @@ This project includes:
Apache Log4j SLF4J Binding under The Apache Software License, Version 2.0
Apache Log4j Web under The Apache Software License, Version 2.0
ClassLoader Leak Prevention library under Apache 2
Commons Lang under The Apache Software License, Version 2.0
Cross-Origin Resource Sharing (CORS) Filter under The Apache Software License, Version 2.0
FindBugs-jsr305 under The Apache Software License, Version 2.0
Geographic Common (GCO) schema (version 2012-07-13) under The Apache Software License, Version 2.0
Geographic MetaData (GMD) schema (version 2012-07-13) under The Apache Software License, Version 2.0
Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
Hamcrest All under New BSD License
Jackson-annotations under The Apache Software License, Version 2.0
Expand All @@ -53,7 +58,31 @@ This project includes:
Joda-Time under Apache 2
JTS Topology Suite under Lesser General Public License (LGPL)
JUnit under Eclipse Public License 1.0
OASIS WS-N specification schemas - including WS-BrokeredNotification (v1.3) under The Apache Software License, Version 2.0
OASIS WS-Resources specification schemas v1.2 under The Apache Software License, Version 2.0
OGC Filter schema (spec. v2.0) under The Apache Software License, Version 2.0
OGC GML Coverage schema (spec. v1.0) under The Apache Software License, Version 2.0
OGC GML schema (spec. v3.1.1) under The Apache Software License, Version 2.0
OGC GML schema (spec. v3.2.1) under The Apache Software License, Version 2.0
OGC O&M schema (spec. v1.0.0) under The Apache Software License, Version 2.0
OGC O&M schema (spec. v2.0) under The Apache Software License, Version 2.0
OGC OWS schema (spec. v1.1.0) under The Apache Software License, Version 2.0
OGC Sampling schema (spec. v1.0.0) under The Apache Software License, Version 2.0
OGC Sampling schema (spec. v2.0) under The Apache Software License, Version 2.0
OGC SensorML schema (spec. v1.0.1) under The Apache Software License, Version 2.0
OGC SensorML schema (spec. v2.0.0) under The Apache Software License, Version 2.0
OGC SOS DeleteObservation schema 1.0 under The Apache Software License, Version 2.0
OGC SOS GetDataAvailability schema 1.0 (OGC Best Practice 14-004r1) under The Apache Software License, Version 2.0
OGC SOS schema (spec. v1.0.0) under The Apache Software License, Version 2.0
OGC SOS schema (spec. v2.0) under The Apache Software License, Version 2.0
OGC SWECommon schema (spec. v1.0.1) under The Apache Software License, Version 2.0
OGC SWECommon schema (spec. v2.0) under The Apache Software License, Version 2.0
OGC SWES schema (spec. v2.0) under The Apache Software License, Version 2.0
OGC WaterML DR schema (spec. v2.0) under The Apache Software License, Version 2.0
OGC WaterML schema (spec. v2.0) under The Apache Software License, Version 2.0
OGC XML schemas under The Apache Software License, Version 2.0
PJL Compressing Filter under Apache Software License V2.0
SaxonB under Mozilla Public License Version 1.0
SLF4J API Module under MIT License
SLF4J Simple Binding under MIT License
Spring AOP under The Apache Software License, Version 2.0
Expand All @@ -64,6 +93,11 @@ This project includes:
Spring Web under The Apache Software License, Version 2.0
Spring Web MVC under The Apache Software License, Version 2.0
StAX API under The Apache Software License, Version 2.0
W3C SOAP specification recommondation (v1.2 part 1) under The Apache Software License, Version 2.0
W3C WS-Addressing specification schemas (v1.0) under The Apache Software License, Version 2.0
W3C xlink schema (spec. v1.1.0) under The Apache Software License, Version 2.0
xml-matchers under Apache License, Version 2.0
XmlBeans under The Apache Software License, Version 2.0
XmlBeansXPath under The Apache Software License, Version 2.0
XMLUnit for Java under BSD License

Expand Up @@ -41,23 +41,20 @@

import org.apache.commons.codec.binary.Base64InputStream;

import org.n52.shetland.ogc.wps.Format;
import org.n52.iceland.util.XmlFactories;
import org.n52.javaps.description.TypedLiteralInputDescription;
import org.n52.javaps.description.TypedLiteralOutputDescription;
import org.n52.javaps.description.TypedProcessInputDescription;
import org.n52.javaps.description.TypedProcessOutputDescription;
import org.n52.iceland.util.XmlFactories;
import org.n52.javaps.io.Data;
import org.n52.javaps.io.DecodingException;
import org.n52.javaps.io.EncodingException;
import org.n52.javaps.io.InputHandler;
import org.n52.javaps.io.OutputHandler;
import org.n52.shetland.ogc.wps.Format;

import com.google.common.io.CharStreams;

import org.n52.javaps.io.literal.LiteralData;
import org.n52.javaps.io.literal.LiteralType;

/**
* TODO JavaDoc
*
Expand Down
Expand Up @@ -26,10 +26,10 @@
import javax.inject.Inject;
import javax.xml.namespace.QName;

import org.n52.iceland.coding.OperationKey;
import org.n52.iceland.coding.decode.OwsDecodingException;
import org.n52.janmayen.http.MediaTypes;
import org.n52.shetland.ogc.ows.exception.OwsExceptionReport;
import org.n52.svalbard.OperationKey;
import org.n52.svalbard.decode.Decoder;
import org.n52.svalbard.decode.DecoderKey;
import org.n52.svalbard.decode.OperationDecoderKey;
Expand Down
Expand Up @@ -23,9 +23,9 @@
import org.n52.janmayen.http.MediaTypes;
import org.n52.shetland.ogc.ows.exception.OwsExceptionReport;
import org.n52.shetland.ogc.ows.service.OwsServiceResponse;
import org.n52.svalbard.EncodingContext;
import org.n52.svalbard.encode.Encoder;
import org.n52.svalbard.encode.EncoderKey;
import org.n52.svalbard.encode.EncodingContext;
import org.n52.svalbard.encode.ExceptionEncoderKey;
import org.n52.svalbard.encode.exception.EncodingException;

Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Expand Up @@ -123,6 +123,11 @@
<artifactId>faroe</artifactId>
<version>1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.n52.faroe</groupId>
<artifactId>faroe-json</artifactId>
<version>1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>service</artifactId>
Expand Down
Expand Up @@ -34,7 +34,7 @@
import org.n52.faroe.annotation.Setting;
import org.n52.iceland.service.ServiceSettings;
import org.n52.janmayen.Json;
import org.n52.iceland.util.Validation;
import org.n52.svalbard.Validation;

import com.google.common.io.ByteSource;
import com.google.common.io.Resources;
Expand Down
12 changes: 6 additions & 6 deletions service/src/main/resources/components/operations.xml
Expand Up @@ -26,32 +26,32 @@
http://www.springframework.org/schema/util/spring-util-4.1.xsd">

<!-- operations -->
<bean id="getCapabilitiesOperation" class="org.n52.iceland.coding.OperationKey">
<bean id="getCapabilitiesOperation" class="org.n52.svalbard.OperationKey">
<constructor-arg name="service" value="WPS" />
<constructor-arg name="version" value="2.0.0" />
<constructor-arg name="operation" value="GetCapabilities" />
</bean>
<bean id="describeProcessOperation" class="org.n52.iceland.coding.OperationKey">
<bean id="describeProcessOperation" class="org.n52.svalbard.OperationKey">
<constructor-arg name="service" value="WPS" />
<constructor-arg name="version" value="2.0.0" />
<constructor-arg name="operation" value="DescribeProcess" />
</bean>
<bean id="executeOperation" class="org.n52.iceland.coding.OperationKey">
<bean id="executeOperation" class="org.n52.svalbard.OperationKey">
<constructor-arg name="service" value="WPS" />
<constructor-arg name="version" value="2.0.0" />
<constructor-arg name="operation" value="Execute" />
</bean>
<bean id="getResultOperation" class="org.n52.iceland.coding.OperationKey">
<bean id="getResultOperation" class="org.n52.svalbard.OperationKey">
<constructor-arg name="service" value="WPS" />
<constructor-arg name="version" value="2.0.0" />
<constructor-arg name="operation" value="GetResult" />
</bean>
<bean id="getStatusOperation" class="org.n52.iceland.coding.OperationKey">
<bean id="getStatusOperation" class="org.n52.svalbard.OperationKey">
<constructor-arg name="service" value="WPS" />
<constructor-arg name="version" value="2.0.0" />
<constructor-arg name="operation" value="GetStatus" />
</bean>
<bean id="dismissOperation" class="org.n52.iceland.coding.OperationKey">
<bean id="dismissOperation" class="org.n52.svalbard.OperationKey">
<constructor-arg name="service" value="WPS" />
<constructor-arg name="version" value="2.0.0" />
<constructor-arg name="operation" value="Dismiss" />
Expand Down
6 changes: 5 additions & 1 deletion webapp/pom.xml
Expand Up @@ -42,12 +42,16 @@
</licenses>

<dependencies>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>service</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.n52.faroe</groupId>
<artifactId>faroe-json</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>engine</artifactId>
Expand Down
49 changes: 24 additions & 25 deletions webapp/src/main/resources/components/iceland.xml
Expand Up @@ -30,15 +30,15 @@
<bean id="jsonBinding" class="org.n52.iceland.binding.json.JSONBinding"/>
<bean id="soapBinding" class="org.n52.iceland.binding.soap.SoapBinding"/>

<bean id="serviceMetadataRepository" class="org.n52.iceland.ogc.ows.ServiceMetadataRepositoryImpl"/>
<bean id="owsServiceMetadataRepository" class="org.n52.iceland.ogc.ows.OwsServiceMetadataRepositoryImpl"/>

<bean id="bindingRepository" class="org.n52.iceland.binding.BindingRepository" />
<bean id="codingRepository" class="org.n52.iceland.coding.CodingRepository" />
<bean id="supportedTypeRepository" class="org.n52.iceland.coding.SupportedTypeRepository"/>
<bean id="owsExtendedCapabilitiesRepository" class="org.n52.iceland.ogc.ows.extension.OwsExtendedCapabilitiesProviderRepository" />
<bean id="offeringExtensionRepository" class="org.n52.iceland.ogc.swes.OfferingExtensionRepository" />
<bean id="owsCapabilitiesExtensionRepository" class="org.n52.iceland.ogc.ows.extension.OwsCapabilitiesExtensionRepository" />
<bean id="owsOperationMetadataExtensionProviderRepository" class="org.n52.iceland.ogc.ows.extension.OwsOperationMetadataExtensionProviderRepository" />
<bean id="i18nDaoRepository" class="org.n52.iceland.i18n.I18NDAORepository" />
<bean id="schemaRepository" class="org.n52.iceland.coding.encode.SchemaRepository"/>
<bean id="schemaRepository" class="org.n52.svalbard.encode.SchemaRepository"/>
<bean id="operationHandlerRepository" class="org.n52.iceland.request.handler.OperationHandlerRepository" />
<bean id="requestResponseModifierRepository" class="org.n52.iceland.convert.RequestResponseModifierRepository" />
<bean id="responseWriterRepository" class="org.n52.iceland.coding.encode.ResponseWriterRepository" />
Expand All @@ -52,30 +52,29 @@

<bean id="icelandServlet" class="org.n52.iceland.service.Service" />

<bean id="eventListenerRegistrator" class="org.n52.iceland.event.ServiceEventListenerRegistrator">
<bean id="eventListenerRegistrator" class="org.n52.janmayen.event.EventListenerRegistrator">
<description>Used to decouple EventListener and EventBus creation.</description>
</bean>

<bean class="org.n52.iceland.util.activation.ActivationRegistrator">
<description>Used to wire up activation persistence.</description>
<property name="listeners">
<map>
<entry key-ref="offeringExtensionRepository" value="#{activationService.offeringExtensionListener}" />
<entry key-ref="bindingRepository" value="#{activationService.bindingListener}" />
<entry key-ref="owsExtendedCapabilitiesRepository" value="#{activationService.owsExtendedCapabiltiesListener}"/>
<entry key-ref="requestOperatorRepository" value="#{activationService.requestOperatorListener}"/>
</map>
</property>
<property name="initializers">
<map>
<entry key-ref="offeringExtensionRepository" value="#{activationService.offeringExtensionInitializer}" />
<entry key-ref="bindingRepository" value="#{activationService.bindingInitializer}" />
<entry key-ref="owsExtendedCapabilitiesRepository" value="#{activationService.owsExtendedCapabiltiesInitializer}"/>
<entry key-ref="requestOperatorRepository" value="#{activationService.requestOperatorInitializer}" />
</map>
</property>
</bean>

<bean id="fileWatcher" class="org.n52.iceland.config.SettingsFileWatcher" />
<description>Used to wire up activation persistence.</description>
<property name="listeners">
<map>
<entry key-ref="bindingRepository" value="#{activationService.bindingListener}" />
<entry key-ref="owsOperationMetadataExtensionProviderRepository" value="#{activationService.owsOperationMetadataExtensionProviderListener}" />
<entry key-ref="requestOperatorRepository" value="#{activationService.requestOperatorListener}" />
</map>
</property>
<property name="initializers">
<map>
<entry key-ref="bindingRepository" value="#{activationService.bindingInitializer}" />
<entry key-ref="owsOperationMetadataExtensionProviderRepository" value="#{activationService.owsOperationMetadataExtensionProviderInitializer}" />
<entry key-ref="requestOperatorRepository" value="#{activationService.requestOperatorInitializer}" />
</map>
</property>
</bean>


<bean id="fileWatcher" class="org.n52.faroe.SettingsFileWatcher" />

</beans>
6 changes: 3 additions & 3 deletions webapp/src/main/resources/settings/settings-i18n.xml
Expand Up @@ -22,19 +22,19 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">

<bean id="i18nSettingDefinitionGroup" class="org.n52.iceland.config.SettingDefinitionGroup">
<bean id="i18nSettingDefinitionGroup" class="org.n52.faroe.SettingDefinitionGroup">
<property name="title" value="I18N" />
<property name="order" value="10.0" />
</bean>
<bean class="org.n52.iceland.config.settings.StringSettingDefinition">
<bean class="org.n52.faroe.settings.StringSettingDefinition">
<property name="key" value="i18n.defaultLanguage" />
<property name="title" value="I18N default language" />
<property name="description" value="Set the I18N default language for this service" />
<property name="order" value="1.0" />
<property name="group" ref="i18nSettingDefinitionGroup" />
<property name="defaultValue" value="eng" />
</bean>
<bean class="org.n52.iceland.config.settings.BooleanSettingDefinition">
<bean class="org.n52.faroe.settings.BooleanSettingDefinition">
<property name="key" value="i18n.showAllLanguageValues" />
<property name="title" value="I18N show all language values" />
<property name="description" value="Show all language specific values if no language is queried or the queried language is not supported!" />
Expand Down
12 changes: 6 additions & 6 deletions webapp/src/main/resources/settings/settings-misc.xml
Expand Up @@ -22,35 +22,35 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">

<bean id="miscellaneousSettingDefinitionGroup" class="org.n52.iceland.config.SettingDefinitionGroup">
<bean id="miscellaneousSettingDefinitionGroup" class="org.n52.faroe.SettingDefinitionGroup">
<property name="title" value="Miscellaneous" />
<property name="order" value="3.0" />
</bean>
<bean class="org.n52.iceland.config.settings.StringSettingDefinition">
<bean class="org.n52.faroe.settings.StringSettingDefinition">
<property name="key" value="misc.characterEncoding" />
<property name="title" value="Character Encoding" />
<property name="description" value="The character encoding used for responses." />
<property name="order" value="6.0" />
<property name="group" ref="miscellaneousSettingDefinitionGroup" />
<property name="defaultValue" value="UTF-8" />
</bean>
<bean class="org.n52.iceland.config.settings.BooleanSettingDefinition">
<bean class="org.n52.faroe.settings.BooleanSettingDefinition">
<property name="key" value="misc.includeStackTraceInExceptionReport" />
<property name="title" value="Detailed Error Messages" />
<property name="description" value="Should OWS ExceptionReports include a complete stack trace for the causing exception?" />
<property name="order" value="15.0" />
<property name="group" ref="miscellaneousSettingDefinitionGroup" />
<property name="defaultValue" value="false" />
</bean>
<bean class="org.n52.iceland.config.settings.BooleanSettingDefinition">
<bean class="org.n52.faroe.settings.BooleanSettingDefinition">
<property name="key" value="misc.httpResponseCodeUseInKvpAndPoxBinding" />
<property name="title" value="Use HTTP Status Codes in KVP and POX Binding?" />
<property name="description" value="Should the response returned by KVP and POX binding use the exception specific HTTP status code or always &lt;tt&gt;HTTP 200 - OK&lt;/tt&gt;." />
<property name="order" value="12.0" />
<property name="group" ref="miscellaneousSettingDefinitionGroup" />
<property name="defaultValue" value="false" />
</bean>
<bean class="org.n52.iceland.config.settings.BooleanSettingDefinition">
<bean class="org.n52.faroe.settings.BooleanSettingDefinition">
<property name="key" value="statistics.counting-outputstream" />
<property name="title" value="The response document size is calculated" />
<property name="description"
Expand All @@ -59,7 +59,7 @@
<property name="group" ref="miscellaneousSettingDefinitionGroup" />
<property name="defaultValue" value="false" />
</bean>
<bean class="org.n52.iceland.config.settings.BooleanSettingDefinition">
<bean class="org.n52.faroe.settings.BooleanSettingDefinition">
<property name="key" value="misc.includeOriginalRequest" />
<property name="title" value="Include original request" />
<property name="description" value="Should the full (!) original request be included in the decoded Java classes to be used by handlers and operators?" />
Expand Down

0 comments on commit e8dabd3

Please sign in to comment.