Project

General

Profile

« Previous | Next » 

Revision 27913

- dependencies updated for spring 4
- small fixes here and there

View differences:

webapps/dnet-hungary-container/trunk/src/main/resources/eu/dnetlib/cnr-site.properties
1

  
2 1
services.is.store.database.bean          	=       persistentExistDatabase
3 2
#services.is.store.database.bean            =       temporaryExistDatabase
4 3

  
......
14 13
services.aggregator.name        			=   DRIVER
15 14
service.index.solr.default.interpretation	=   transformed
16 15

  
16
services.timeToSleep = 8000
17 17

  
18 18
services.aggregator.country					=	EE
19 19
services.msro.data.source.resolver			=	extendedDataSourceResolver
......
22 22

  
23 23

  
24 24
# MSRO SPECIFIC
25

  
26

  
27 25
services.msro.graph.deletehi					=	classpath:/eu/dnetlib/enabling/manager/msro/wf/delete-hi-12.wf.xml
28 26
services.msro.graph.createhi					=	classpath:/eu/dnetlib/enabling/manager/msro/wf/repo-hi-12.wf.xml
29 27
services.msro.graph.updateindex.incremental		=	classpath:/eu/dnetlib/enabling/manager/msro/wf/update-index-incremental.wf.xml
webapps/dnet-hungary-container/trunk/src/main/webapp/WEB-INF/dispatcher-servlet.xml
10 10
        http://www.springframework.org/schema/mvc
11 11
        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
12 12

  
13
	<context:component-scan base-package="eu.dnetlib">
14
<!-- 		<context:include-filter type="annotation" -->
15
<!-- 			expression="org.springframework.stereotype.Controller" /> -->
16
	</context:component-scan>
13
	<mvc:annotation-driven />
17 14

  
15
	<context:component-scan base-package="eu.dnetlib" />
16

  
18 17
	<import resource="classpath*:/eu/dnetlib/**/webContext*.xml" />
19 18

  
20 19
	<bean id="beanHandlerMapping" p:order="1"
......
22 21
	
23 22
	<bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter" />
24 23
	
25
	<mvc:resources mapping="/resources/**" location="classpath:/eu/dnetlib/functionality/lightui/web/resources/" />	
24
	<mvc:resources mapping="/resources/**" location="classpath:/eu/dnetlib/web/resources/" />
26 25

  
27
	<mvc:annotation-driven />
28 26

  
29 27
<!-- 	<bean id="annotationHandlerMapping" p:order="0" -->
30 28
<!-- 		class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" /> -->
webapps/dnet-hungary-container/trunk/pom.xml
5 5
		<groupId>eu.dnetlib</groupId>
6 6
		<artifactId>dnet-container-parent</artifactId>
7 7
		<version>1.0.0-SNAPSHOT</version>
8
		<relativePath></relativePath>
8 9
	</parent>
9 10
	<modelVersion>4.0.0</modelVersion>
10 11
	<groupId>eu.dnetlib</groupId>
11 12
	<artifactId>dnet-hungary-container</artifactId>
12 13
	<packaging>war</packaging>
13
	<version>1.0-SNAPSHOT</version>
14
	<version>1.0.0-SNAPSHOT</version>
15
	
16
	<build>
17
		<plugins>
18
			<plugin>
19
				<groupId>org.apache.tomcat.maven</groupId>
20
				<artifactId>tomcat7-maven-plugin</artifactId>
21
				<configuration>
22
					<path>/app</path>
23
					<port>8280</port>
24
				</configuration>
25
				<version>2.1</version>
26
			</plugin>
27
		</plugins>
28
	</build>
29
	
14 30
	<dependencies>
15 31

  
16 32
		<!-- Common components in every container -->
......
61 77
		<dependency>
62 78
			<groupId>eu.dnetlib</groupId>
63 79
			<artifactId>dnet-msro-service</artifactId>
64
			<version>[1.0.0-SNAPSHOT]</version>
80
			<version>[1.0.0-SNAPSHOT,)</version>
65 81
		</dependency>
66 82

  
67 83
		<dependency>
68 84
			<groupId>eu.dnetlib</groupId>
69 85
			<artifactId>dnet-modular-ui</artifactId>
70
			<version>[1.0.0-SNAPSHOT]</version>
86
			<version>[2.0.0-SNAPSHOT]</version>
71 87
		</dependency>
72 88

  
73

  
74

  
75 89
		<dependency>
76 90
			<groupId>eu.dnetlib</groupId>
77 91
			<artifactId>dnet-modular-workflows-ui</artifactId>
78
			<version>[1.0.0-SNAPSHOT]</version>
92
			<version>[2.0.0-SNAPSHOT]</version>
79 93
		</dependency>
80 94

  
81 95
		<dependency>
82 96
			<groupId>eu.dnetlib</groupId>
83 97
			<artifactId>dnet-modular-repositories-ui</artifactId>
84
			<version>[1.0.0-SNAPSHOT]</version>
98
			<version>[2.0.0-SNAPSHOT]</version>
85 99
		</dependency>
86 100
		<!-- Log service -->
87 101
		 <dependency>
......
90 104
            <version>[1.0.0-SNAPSHOT]</version>
91 105
        </dependency>
92 106

  
93

  
94 107
		<!-- Hungary container profiles and workflows -->
95 108
		<dependency>
96 109
			<groupId>eu.dnetlib</groupId>
......
132 145
		<dependency>
133 146
            <groupId>eu.dnetlib</groupId>
134 147
            <artifactId>dnet-modular-collector-service</artifactId>
135
            <version>[1.0.0-SNAPSHOT]</version>
148
            <version>[1.0.0-SNAPSHOT,)</version>
136 149
        </dependency>
137 150

  
138 151
		<dependency>
modules/dnet-hungary-lightUI/trunk/src/main/resources/eu/dnetlib/functionality/lightui/utils/xsl/row_hungary_DMF.xslt
3 3
    xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4 4
    exclude-result-prefixes="xsl dr dc" >
5 5

  
6
    <xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>
6
    <xsl:output method="html" encoding="UTF-8" indent="yes"/>
7 7
    
8 8

  
9 9

  
modules/dnet-hungary-lightUI/trunk/src/main/resources/eu/dnetlib/functionality/lightui/utils/xsl/document_hungary_DMF.xslt
3 3
	xmlns:dr="http://www.driver-repository.eu/namespace/dr" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4 4
	xmlns:dc="http://purl.org/dc/elements/1.1/">
5 5

  
6
	<xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes" />
6
	<xsl:output method="html" encoding="UTF-8" indent="yes" />
7 7

  
8 8
	<xsl:template match="/">
9 9
		<xsl:if test="//dc:source">
modules/dnet-hungary-lightUI/trunk/src/main/resources/eu/dnetlib/functionality/lightui/web/views/lightUI/hungary/header.st
2 2
	<tr>
3 3
		<td valign="middle" align="left">
4 4
			<a href="index.do">
5
				<img src="../../resources/images/flag.jpg" width="5%"/>
5
				<img src="static.get?src=flag.jpg" width="5%"/>
6 6
				<span style="font-size:36px;"><i>National Repository Infrastructure of Hungary</i></span>
7 7
			</a>
8 8
		</td>
modules/dnet-hungary-msro-workflows/trunk/pom.xml
17 17
		<dependency>
18 18
			<groupId>eu.dnetlib</groupId>
19 19
			<artifactId>dnet-msro-service</artifactId>
20
			<version>[1.0.0-SNAPSHOT]</version>
20
			<version>[1.0.0-SNAPSHOT,)</version>
21 21
		</dependency>
22 22
	</dependencies>
23 23
</project>

Also available in: Unified diff