Commit 9a4fc10b authored by Vladimir Kolmakov's avatar Vladimir Kolmakov
Browse files

новые рабочие CatalogCommon и queue.client, конфиг пропертиз, бины (с подключением к dev среде)

parent e78857c6
Showing with 9 additions and 10 deletions
+9 -10
......@@ -22,6 +22,8 @@ services.administrator.role=\u0414\u0438\u0440\u0435\u043A\u0442\u043E\u0440 \u0
application.roles=\u041B\u043E\u0433\u0438\u0441\u0442,\u0414\u0438\u0440\u0435\u043A\u0442\u043E\u0440 \u043F\u043E \u043B\u043E\u0433\u0438\u0441\u0442\u0438\u043A\u0435
esb.url=http://172.16.83.22:8887
esb.direct.route.catalogs.instance=CatalogServer_dev
esb.direct.route.catalogs.parameter=catalogType
event.type.catalogs=catalogs
server.port = 8080
host.name="tariff-calculator-1"
......
......@@ -476,19 +476,16 @@
<task:scheduler id="myScheduler" pool-size="10" />
<task:annotation-driven scheduler="myScheduler" />
<import resource="classpath:rabbit-config.xml"/>
<bean id="catalogRefresher" class="com.cdek.catalog.common.service.integrate.CatalogRefresher" />
<bean id="esbConnector" class="com.cdek.queue.connector.impl.EsbConnector" />
<bean id="registrationScheduler" class="com.cdek.queue.scheduler.RegistrationScheduler" />
<bean id="subscriberConstructor" class="com.cdek.queue.utils.SubscriberConstructor" />
<import resource="classpath:subscriber-registration-config.xml"/>
<context:component-scan base-package="com.cdek.queue.utils" />
<bean id="catalogRefresher" class="com.cdek.catalog.common.service.integrate.CatalogRefresher" />
<bean id="eventHandlerMap" class="com.cdek.catalog.common.handler.CatalogEventHandlerMap"/>
<bean id="simpleJdbcInsert" class="org.springframework.jdbc.core.simple.SimpleJdbcInsert" >
<constructor-arg ref="dataSource" />
</bean>
<bean id="eventQueueDao" class="com.cdek.queue.dao.EsbEventDao"/>
<bean id="catalogsService" class="com.cdek.catalog.common.service.CatalogService"/>
<bean id="catalogServerConnector" class="com.cdek.catalog.common.service.integrate.CatalogServerConnector" />
<!--<bean id="catalogsService" class="com.cdek.catalog.common.service.CatalogService"/>-->
<bean id="esbIntegrator" class="com.cdek.catalog.common.service.integrate.EsbIntegrator" />
<beans profile="prod">
......
......@@ -46,9 +46,9 @@
<JettyPlatform.version>1.0-37</JettyPlatform.version>
<commons.jdbc.version>1.0-7</commons.jdbc.version>
<Catalog.Postgres.version>1.0-9</Catalog.Postgres.version>
<CatalogCommon.version>1.0-8</CatalogCommon.version>
<CatalogCommon.version>1.0-15</CatalogCommon.version>
<authinclude.version>1.0-1</authinclude.version>
<cdek.queue.client.version>1.0-2</cdek.queue.client.version>
<cdek.queue.client.version>1.0-10</cdek.queue.client.version>
<cdek.queue.postgre.version>1.0-5</cdek.queue.postgre.version>
<javax.servlet.api.version>3.1.0</javax.servlet.api.version>
</properties>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment