提交: 9ec832aa6040ea85aea6d39830d64fb01383b5b3 - Moxkiriya7 (git)

Moxkiriyaプロジェクト事前開発用の作業部屋

Commit MetaInfo

• 修订版: 9ec832aa6040ea85aea6d39830d64fb01383b5b3 (tree)
• 时间: 2018-10-08 17:15:08
• 作者: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• クラスタリングのマルチPartyに対応
  

更改概述

• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindow.java
• modified: src/com/wiki/standalone/moxkiriya/WikiRepository.java
• delete: src/com/wiki/standalone/moxkiriya/resources/{repository_cluster.xml => repository_cluster_derby.xml}

差异

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.java
@@ -137,8 +137,8 @@ public class WikiMainWindow {
 		SettingManager settingMgr     = SettingManager.getInstance();
 		String         path           = settingMgr.get(SettingManager.SETTINGSKEY_MOXKIRIYA_USER_DIR);
 		String         configXML      = settingMgr.get(SettingManager.SETINGKEY_CLUSTER).equals("true")
-											? "repository_cluster.xml"
-											: "repository_local.xml";
+											? WikiRepository.REPOSITORY_CUSTER_FILENAME
+											: WikiRepository.REPOSITORY_LOCAL_FILENAME;
 		File           file           = new File(path + "/" + settingMgr.getSelectedParty() + "/" + configXML);
 		
 		if(file.exists() != true) {

--- a/src/com/wiki/standalone/moxkiriya/WikiRepository.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiRepository.java
@@ -46,8 +46,8 @@ import com.wiki.standalone.moxkiriya.PageData.FileData;
  *
  */
 public class WikiRepository {
-	/** repository_cluster.xml */
-	public static final String REPOSITORY_CUSTER_FILENAME = "repository_cluster.xml";
+	/** repository_cluster_derby.xml */
+	public static final String REPOSITORY_CUSTER_FILENAME = "repository_cluster_derby.xml";
 
 	/** repository_local.xml */
 	public static final String REPOSITORY_LOCAL_FILENAME = "repository_local.xml";	
@@ -484,11 +484,15 @@ public class WikiRepository {
 		String macAddress = getMacAddress();
 		String username   = System.getProperty("user.name");
 		String approot    = settingMgr.get(SettingManager.SETTINGSKEY_WIKIROOT);
+		String partyName  = settingMgr.getSelectedParty();
 
-		System.setProperty("cluster.id", String.valueOf(macAddress.hashCode() + username));
+		System.setProperty("cluster.id", String.valueOf(macAddress.hashCode() 
+				+ "-" + partyName
+				+ "-" + username));
 		System.setProperty("wiki.root", approot);
 
 		if(settingMgr.get(SettingManager.SETINGKEY_CLUSTER).equals("true")) {
+			System.setProperty("party.name", partyName);
 			System.setProperty("cluster.setting", "TRUE");
 			System.setProperty("dbserver.url", settingMgr.get(SettingManager.SETINGKEY_DBSERVER_URL));
 			System.setProperty("dbserver.port", settingMgr.get(SettingManager.SETINGKEY_DBSERVER_PORT));

--- a/src/com/wiki/standalone/moxkiriya/resources/repository_cluster.xml
+++ b/src/com/wiki/standalone/moxkiriya/resources/repository_cluster_derby.xml
@@ -43,7 +43,7 @@
         data store configuration
     -->
     <DataStore class="org.apache.jackrabbit.core.data.FileDataStore">
-        <param name="path" value="${wiki.root}/datastore"/>
+        <param name="path" value="${wiki.root}/${party.name}/datastore"/>
         <param name="minRecordLength" value="1024"/>
     </DataStore>
 
@@ -117,7 +117,7 @@
             <param name="url" value="jdbc:derby://192.168.123.25:1527/moxkiriyadb/workspace/db;create=true"/>
             <param name="driver" value="org.apache.derby.jdbc.ClientDriver"/>
             -->
-            <param name="url" value="${dbserver.url}:${dbserver.port}/moxkiriyadb/workspace/db;create=true"/>
+            <param name="url" value="${dbserver.url}:${dbserver.port}/moxkiriyadb/${party.name}/workspace/db;create=true"/>
             <param name="driver" value="${jdbc.driver}"/>
             <param name="schemaObjectPrefix" value="${wsp.name}_"/>
             <param name="externalBLOBs" value="true"/>
@@ -156,7 +156,7 @@
             implementations.
         -->
         <PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
-            <param name="url" value="${dbserver.url}:${dbserver.port}/moxkiriyadb/version/db;create=true"/>
+            <param name="url" value="${dbserver.url}:${dbserver.port}/moxkiriyadb/${party.name}/version/db;create=true"/>
             <param name="driver" value="${jdbc.driver}"/>
             <param name="schemaObjectPrefix" value="version_"/>
             <param name="externalBLOBs" value="true"/>
@@ -179,15 +179,14 @@
     	<!-- 
         <Journal class="org.apache.jackrabbit.core.journal.FileJournal">
             <param name="revision" value="${rep.home}/revision.log" />
-            <param name="directory" value="${wiki.root}/journal" />
+            <param name="directory" value="${wiki.root}/${party.name}/journal" />
         </Journal>
         -->
         <Journal class="org.apache.jackrabbit.core.journal.DatabaseJournal">
 	        <param name="revision" value="${rep.home}/revision.log" />
             <param name="driver" value="${jdbc.driver}" />
-            <param name="url" value="${dbserver.url}:${dbserver.port}/moxkiriyadb/journal/db;create=true"/>
+            <param name="url" value="${dbserver.url}:${dbserver.port}/moxkiriyadb/${party.name}/journal/db;create=true"/>
 			<param name="databaseType" value="derby"/>
         </Journal>
     </Cluster>
-</Repository>
-
+</Repository>
\ No newline at end of file