|
54 | 54 | <!-- Add Class properties based on mode --> |
55 | 55 | <xsl:choose> |
56 | 56 | <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> |
59 | 59 | </xsl:when> |
60 | 60 | <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> |
63 | 63 | </xsl:otherwise> |
64 | 64 | </xsl:choose> |
65 | 65 |
|
66 | 66 | <!-- Add URL/connection properties from shared wizard/solr/* fields --> |
67 | 67 | <xsl:choose> |
68 | 68 | <xsl:when test="$isStandalone"> |
69 | 69 | <xsl:if test="string-length($serverUrl) > 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> |
73 | 72 | </xsl:if> |
74 | 73 | </xsl:when> |
75 | 74 | <xsl:when test="$mode = 'cloud-url'"> |
76 | 75 | <xsl:if test="string-length($serverUrl) > 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> |
80 | 78 | </xsl:if> |
81 | 79 | </xsl:when> |
82 | 80 | <xsl:when test="$isCloudZk"> |
83 | 81 | <xsl:if test="string-length($zkUrl) > 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> |
86 | 84 | </xsl:if> |
87 | 85 | <xsl:if test="string-length($zkChroot) > 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> |
90 | 88 | </xsl:if> |
91 | 89 | </xsl:when> |
92 | 90 | </xsl:choose> |
|
0 commit comments