Skip to content

Commit d45c241

Browse files
sebhofmannyagee-de
authored andcommitted
MIR-1552 fix solr related properties in wizard
- rename properties with *IndexManager* to *IndexRegistry* - remove deprecated MCR.Solr.ServerURL
1 parent 7ec51f1 commit d45c241

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

mir-wizard/src/main/resources/xslt/wizard-postprocessor.xsl

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,39 +54,37 @@
5454
<!-- Add Class properties based on mode -->
5555
<xsl:choose>
5656
<xsl:when test="$isStandalone">
57-
<property name="MCR.Solr.IndexManager.Index.main.Class">org.mycore.solr.standalone.core.MCRConfigurableSolrCore</property>
58-
<property name="MCR.Solr.IndexManager.Index.classification.Class">org.mycore.solr.standalone.core.MCRConfigurableSolrCore</property>
57+
<property name="MCR.Solr.IndexRegistry.Index.main.Class">org.mycore.solr.standalone.core.MCRConfigurableSolrCore</property>
58+
<property name="MCR.Solr.IndexRegistry.Index.classification.Class">org.mycore.solr.standalone.core.MCRConfigurableSolrCore</property>
5959
</xsl:when>
6060
<xsl:otherwise>
61-
<property name="MCR.Solr.IndexManager.Index.main.Class">org.mycore.solr.cloud.collection.MCRConfigurableSolrCloudCollection</property>
62-
<property name="MCR.Solr.IndexManager.Index.classification.Class">org.mycore.solr.cloud.collection.MCRConfigurableSolrCloudCollection</property>
61+
<property name="MCR.Solr.IndexRegistry.Index.main.Class">org.mycore.solr.cloud.collection.MCRConfigurableSolrCloudCollection</property>
62+
<property name="MCR.Solr.IndexRegistry.Index.classification.Class">org.mycore.solr.cloud.collection.MCRConfigurableSolrCloudCollection</property>
6363
</xsl:otherwise>
6464
</xsl:choose>
6565

6666
<!-- Add URL/connection properties from shared wizard/solr/* fields -->
6767
<xsl:choose>
6868
<xsl:when test="$isStandalone">
6969
<xsl:if test="string-length($serverUrl) &gt; 0">
70-
<property name="MCR.Solr.ServerURL"><xsl:value-of select="$serverUrl" /></property>
71-
<property name="MCR.Solr.IndexManager.Index.main.SolrUrl"><xsl:value-of select="$serverUrl" /></property>
72-
<property name="MCR.Solr.IndexManager.Index.classification.SolrUrl"><xsl:value-of select="$serverUrl" /></property>
70+
<property name="MCR.Solr.IndexRegistry.Index.main.SolrUrl"><xsl:value-of select="$serverUrl" /></property>
71+
<property name="MCR.Solr.IndexRegistry.Index.classification.SolrUrl"><xsl:value-of select="$serverUrl" /></property>
7372
</xsl:if>
7473
</xsl:when>
7574
<xsl:when test="$mode = 'cloud-url'">
7675
<xsl:if test="string-length($serverUrl) &gt; 0">
77-
<property name="MCR.Solr.ServerURL"><xsl:value-of select="$serverUrl" /></property>
78-
<property name="MCR.Solr.IndexManager.Index.main.SolrUrls"><xsl:value-of select="$serverUrl" /></property>
79-
<property name="MCR.Solr.IndexManager.Index.classification.SolrUrls"><xsl:value-of select="$serverUrl" /></property>
76+
<property name="MCR.Solr.IndexRegistry.Index.main.SolrUrls"><xsl:value-of select="$serverUrl" /></property>
77+
<property name="MCR.Solr.IndexRegistry.Index.classification.SolrUrls"><xsl:value-of select="$serverUrl" /></property>
8078
</xsl:if>
8179
</xsl:when>
8280
<xsl:when test="$isCloudZk">
8381
<xsl:if test="string-length($zkUrl) &gt; 0">
84-
<property name="MCR.Solr.IndexManager.Index.main.ZkUrls"><xsl:value-of select="$zkUrl" /></property>
85-
<property name="MCR.Solr.IndexManager.Index.classification.ZkUrls"><xsl:value-of select="$zkUrl" /></property>
82+
<property name="MCR.Solr.IndexRegistry.Index.main.ZkUrls"><xsl:value-of select="$zkUrl" /></property>
83+
<property name="MCR.Solr.IndexRegistry.Index.classification.ZkUrls"><xsl:value-of select="$zkUrl" /></property>
8684
</xsl:if>
8785
<xsl:if test="string-length($zkChroot) &gt; 0">
88-
<property name="MCR.Solr.IndexManager.Index.main.ZkChroot"><xsl:value-of select="$zkChroot" /></property>
89-
<property name="MCR.Solr.IndexManager.Index.classification.ZkChroot"><xsl:value-of select="$zkChroot" /></property>
86+
<property name="MCR.Solr.IndexRegistry.Index.main.ZkChroot"><xsl:value-of select="$zkChroot" /></property>
87+
<property name="MCR.Solr.IndexRegistry.Index.classification.ZkChroot"><xsl:value-of select="$zkChroot" /></property>
9088
</xsl:if>
9189
</xsl:when>
9290
</xsl:choose>

0 commit comments

Comments
 (0)