Skip to content

Commit 70cc4f1

Browse files
andreapagliacciandreapagliacci
committed
Upgrade xml
1 parent 15ff3cc commit 70cc4f1

File tree

1 file changed

+103
-34
lines changed

1 file changed

+103
-34
lines changed

‎src/main/resources/META-INF/magnolia/whitelabel-webapp.xml

Lines changed: 103 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,30 @@
22
<name>whitelabel-webapp</name>
33
<displayName>${project.name}</displayName>
44
<description>${project.description}</description>
5-
<class>info.magnolia.forge.universalcontent.app.manageES.ElasticSearchModuleCoreVersionHandler</class>
5+
<class>info.magnolia.forge.universalcontent.app.manageES.ElasticSearchModuleCore</class>
66
<versionHandler>info.magnolia.forge.universalcontent.app.manageES.ElasticSearchModuleCoreVersionHandler</versionHandler>
7-
<version>${project.version}</version>
7+
<version>1.6.3</version>
88
<components>
9-
<id>app-manageES-browser</id>
9+
<id>main</id>
10+
1011
<component>
11-
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomListenerPresenter</type>
12-
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericBrowserPresenter</implementation>
12+
<type>info.magnolia.forge.universalcontent.app.generic.service.UiService</type>
13+
<implementation>info.magnolia.forge.universalcontent.app.generic.service.UiServiceImpl</implementation>
14+
<scope>singleton</scope>
15+
</component>
16+
<component>
17+
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomContainer</type>
18+
<implementation>info.magnolia.forge.universalcontent.app.generic.connector.GenericContainer</implementation>
19+
<scope>singleton</scope>
20+
</component>
21+
<component>
22+
<type>info.magnolia.forge.universalcontent.app.elasticsearch.service.CommonIndexingService</type>
23+
<implementation>info.magnolia.forge.universalcontent.app.elasticsearch.service.CommonIndexingServiceImpl</implementation>
24+
<scope>singleton</scope>
25+
</component>
26+
<component>
27+
<type>info.magnolia.forge.universalcontent.app.generic.service.LogService</type>
28+
<implementation>info.magnolia.forge.universalcontent.app.generic.service.LogServiceImpl</implementation>
1329
<scope>singleton</scope>
1430
</component>
1531
<component>
@@ -18,11 +34,31 @@
1834
<scope>singleton</scope>
1935
</component>
2036
<component>
21-
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomView</type>
22-
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericViewImpl</implementation>
37+
<type>info.magnolia.forge.universalcontent.app.elasticsearch.service.IIndexingService</type>
38+
<implementation>info.magnolia.forge.universalcontent.app.elasticsearch.service.ElasticsearchIndexingServiceImpl</implementation>
39+
</component>
40+
<component>
41+
<type>info.magnolia.forge.universalcontent.app.manageES.ElasticSearchModuleCore</type>
42+
<implementation>info.magnolia.forge.universalcontent.app.manageES.ElasticSearchModuleCore</implementation>
43+
<scope>singleton</scope>
44+
</component>
45+
46+
<component>
47+
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomContentConnector</type>
48+
<implementation>info.magnolia.forge.universalcontent.app.generic.connector.GenericContentConnector</implementation>
2349
<scope>singleton</scope>
2450
</component>
25-
<!-- START S3 Implementation -->
51+
<component>
52+
<type>info.magnolia.forge.universalcontent.app.generic.connector.FactoryContainer</type>
53+
<implementation>info.magnolia.forge.universalcontent.app.generic.connector.FactoryContainer</implementation>
54+
<scope>singleton</scope>
55+
</component>
56+
<component>
57+
<type>info.magnolia.forge.universalcontent.app.generic.others.CacheHelper</type>
58+
<implementation>info.magnolia.forge.universalcontent.app.generic.others.CacheHelper</implementation>
59+
<scope>singleton</scope>
60+
</component>
61+
<!-- START S3 Implementation-->
2662
<component>
2763
<type>info.magnolia.forge.universalcontent.app.aws.s3.S3Delegate</type>
2864
<implementation>info.magnolia.forge.universalcontent.app.aws.s3.S3Delegate</implementation>
@@ -33,19 +69,43 @@
3369
<implementation>info.magnolia.forge.universalcontent.app.aws.s3.S3Connection</implementation>
3470
<scope>singleton</scope>
3571
</component>
36-
<!-- END S3 Implementation -->
37-
<!-- START ElasticSearch Implementation -->
72+
<!-- END S3 Implementation-->
73+
<!-- START ElasticSearch Implementation-->
3874
<component>
3975
<type>info.magnolia.forge.universalcontent.app.elasticsearch.ElasticSearchDelegate</type>
4076
<implementation>info.magnolia.forge.universalcontent.app.elasticsearch.ElasticSearchDelegate</implementation>
4177
<scope>singleton</scope>
4278
</component>
4379
<component>
44-
<type>info.magnolia.forge.universalcontent.app.elasticsearch.ElasticSearchConnection</type>
45-
<implementation>info.magnolia.forge.universalcontent.app.elasticsearch.ElasticSearchConnection</implementation>
80+
<type>info.magnolia.forge.universalcontent.app.elasticsearch.ElasticSearchDelegate8</type>
81+
<implementation>info.magnolia.forge.universalcontent.app.elasticsearch.ElasticSearchDelegate8</implementation>
82+
<scope>singleton</scope>
83+
</component>
84+
<component>
85+
<type>info.magnolia.forge.universalcontent.app.elasticsearch.connector.ElasticSearchConnection</type>
86+
<implementation>info.magnolia.forge.universalcontent.app.elasticsearch.connector.ElasticSearchConnection</implementation>
87+
<scope>singleton</scope>
88+
</component>
89+
<!-- END ElasticSearch Implementation-->
90+
<component>
91+
<type>info.magnolia.forge.universalcontent.app.elasticsearch.service.IIndexingService</type>
92+
<implementation>info.magnolia.forge.universalcontent.app.elasticsearch.service.ElasticsearchIndexingServiceImpl</implementation>
93+
</component>
94+
<component>
95+
<type>info.magnolia.forge.universalcontent.app.elasticsearch.filter.IndexingFilter</type>
96+
<implementation>info.magnolia.forge.universalcontent.app.elasticsearch.filter.IndexingFilter</implementation>
97+
<scope>singleton</scope>
98+
</component>
99+
<component>
100+
<type>info.magnolia.forge.universalcontent.app.elasticsearch.configuration.ElasticsearchConfiguration</type>
101+
<implementation>info.magnolia.forge.universalcontent.app.elasticsearch.configuration.ElasticsearchConfiguration</implementation>
102+
<scope>singleton</scope>
103+
</component>
104+
<component>
105+
<type>info.magnolia.forge.universalcontent.app.generic.service.LogService</type>
106+
<implementation>info.magnolia.forge.universalcontent.app.generic.service.LogServiceImpl</implementation>
46107
<scope>singleton</scope>
47108
</component>
48-
<!-- END ElasticSearch Implementation -->
49109
<component>
50110
<type>info.magnolia.forge.universalcontent.app.generic.utils.FactoryConverter</type>
51111
<implementation>info.magnolia.forge.universalcontent.app.generic.utils.FactoryConverter</implementation>
@@ -56,17 +116,36 @@
56116
<implementation>info.magnolia.forge.universalcontent.app.generic.connector.GenericContainer</implementation>
57117
<scope>singleton</scope>
58118
</component>
119+
</components>
120+
<components>
121+
<id>app-manageES-browser</id>
59122
<component>
60-
<type>info.magnolia.forge.universalcontent.app.generic.ui.service.UiEventAction</type>
61-
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.UiEventActionImpl</implementation>
123+
<type>info.magnolia.forge.universalcontent.app.manageES.ElasticSearchModuleCore</type>
124+
<implementation>info.magnolia.forge.universalcontent.app.manageES.ElasticSearchModuleCore</implementation>
125+
<scope>singleton</scope>
62126
</component>
63127
<component>
64-
<type>info.magnolia.forge.universalcontent.app.generic.connector.FactoryContainer</type>
65-
<implementation>info.magnolia.forge.universalcontent.app.generic.connector.FactoryContainer</implementation>
128+
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomListenerPresenter</type>
129+
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericBrowserPresenter</implementation>
130+
<scope>singleton</scope>
131+
</component>
132+
<component>
133+
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomView</type>
134+
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericViewImpl</implementation>
66135
<scope>singleton</scope>
67136
</component>
68-
69-
137+
<component>
138+
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomListenerPresenter</type>
139+
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericBrowserPresenter</implementation>
140+
<scope>singleton</scope>
141+
</component>
142+
143+
144+
<component>
145+
<type>info.magnolia.forge.universalcontent.app.generic.ui.service.UiEventAction</type>
146+
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.UiEventActionImpl</implementation>
147+
</component>
148+
70149
<component>
71150
<type>info.magnolia.forge.universalcontent.app.event.service.TableEventService</type>
72151
<implementation>info.magnolia.forge.universalcontent.app.event.service.TableEventServiceImpl</implementation>
@@ -75,18 +154,12 @@
75154
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.Listener</type>
76155
<implementation>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomSenderEventManager</implementation>
77156
</component>
78-
<component>
79-
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomTwoColumnView</type>
80-
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericBrowserViewImpl</implementation>
81-
<scope>singleton</scope>
82-
</component>
83-
157+
84158
<component>
85159
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.ListSearchViewAppInterface</type>
86160
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericListViewImpl</implementation>
87161
<scope>singleton</scope>
88162
</component>
89-
90163
<component>
91164
<type>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericListPresenter</type>
92165
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericListPresenter</implementation>
@@ -96,15 +169,11 @@
96169
<type>info.magnolia.forge.universalcontent.app.generic.ui.dialog.ActionBarService</type>
97170
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.dialog.ActionBarServiceImpl</implementation>
98171
</component>
172+
99173
<component>
100-
<type>info.magnolia.forge.universalcontent.app.generic.service.RepositoryService</type>
101-
<implementation>info.magnolia.forge.universalcontent.app.generic.service.RepositoryServiceImpl</implementation>
102-
<scope>singleton</scope>
103-
</component>
104-
<component>
105-
<type>info.magnolia.forge.universalcontent.app.generic.service.LogService</type>
106-
<implementation>info.magnolia.forge.universalcontent.app.generic.service.LogServiceImpl</implementation>
174+
<type>info.magnolia.forge.universalcontent.app.custom.interfaces.CustomTwoColumnView</type>
175+
<implementation>info.magnolia.forge.universalcontent.app.generic.ui.service.GenericBrowserViewImpl</implementation>
107176
<scope>singleton</scope>
108177
</component>
109178
</components>
110-
</module>
179+
</module>

0 commit comments

Comments
 (0)