提交: 1379e1fb4eeeca55c7290aa19f80eca91826c851 - Moxkiriya7 (git)

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

Commit MetaInfo

• 修訂: 1379e1fb4eeeca55c7290aa19f80eca91826c851 (tree)
• 時間: 2018-09-29 10:54:14
• 作者: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• InitialSettingDialogをConfigSettingDialogに名前を変更
  *
  クラスタ設定をデータベースに変更(StaleItemStateExceptionを回避するため)
  

Change Summary

• modified: .classpath
• modified: src/com/wiki/standalone/moxkiriya/Main.java
• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
• delete: src/com/wiki/standalone/moxkiriya/dialog/{InitialSettingsDialog.fxml => ConfigSettingsDialog.fxml}
• delete: src/com/wiki/standalone/moxkiriya/dialog/{InitialSettingsDialog.java => ConfigSettingsDialog.java}
• delete: src/com/wiki/standalone/moxkiriya/dialog/{InitialSettingsDialogController.java => ConfigSettingsDialogController.java}
• modified: src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties
• modified: src/com/wiki/standalone/moxkiriya/resources/repository_cluster.xml

差異

--- a/.classpath
+++ b/.classpath
@@ -7,8 +7,8 @@
 	<classpathentry kind="lib" path="lib/org/apache/derby/derby/10.12.1.1/derby-10.12.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-api/2.14.5/jackrabbit-api-2.14.5.jar"/>
 	<classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-bundle/2.14.5/jackrabbit-bundle-2.14.5.jar"/>
-	<classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-core/2.14.5/jackrabbit-core-2.14.5.jar"/>
-	<classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-data/2.14.5/jackrabbit-data-2.14.5.jar"/>
+	<classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-core/2.14.5/jackrabbit-core-2.14.5.jar" sourcepath="C:/usr/local/src/Apache_Jackrabbit/jackrabbit-2.14.5/jackrabbit-core/src/main/java"/>
+	<classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-data/2.14.5/jackrabbit-data-2.14.5.jar" sourcepath="C:/usr/local/src/Apache_Jackrabbit/jackrabbit-2.14.5/jackrabbit-core/src/main/java"/>
 	<classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-jcr-commons/2.14.5/jackrabbit-jcr-commons-2.14.5.jar"/>
 	<classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-spi/2.14.5/jackrabbit-spi-2.14.5.jar"/>
 	<classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-spi-commons/2.14.5/jackrabbit-spi-commons-2.14.5.jar"/>

--- a/src/com/wiki/standalone/moxkiriya/Main.java
+++ b/src/com/wiki/standalone/moxkiriya/Main.java
@@ -19,7 +19,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ResourceBundle;
 
-import com.wiki.standalone.moxkiriya.dialog.InitialSettingsDialog;
+import com.wiki.standalone.moxkiriya.dialog.ConfigSettingsDialog;
 import com.wiki.standalone.moxkiriya.util.FileIO;
 
 import javafx.application.Application;
@@ -113,7 +113,7 @@ public class Main extends Application {
 	 * @throws Exception 
 	 */
 	private void showInitialSettingsDialog(Stage stage) throws Exception {
-		InitialSettingsDialog dialog = new InitialSettingsDialog();
+		ConfigSettingsDialog dialog = new ConfigSettingsDialog();
 		dialog.showDialog(stage, resources_);
 	}
 

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
@@ -101,7 +101,7 @@
         <Button fx:id="buttonDeletePages" mnemonicParsing="false" onAction="#onActionButtonDeletePages" prefHeight="30.0" text="%key.Button.Delete.Pages" AnchorPane.bottomAnchor="15.0" AnchorPane.leftAnchor="150.0" />
       </children>
     </AnchorPane>
-    <AnchorPane id="EditAnchorPane" fx:id="AnchorPaneEdit" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="450.0" prefWidth="590.0" visible="false" AnchorPane.bottomAnchor="70.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="75.0">
+    <AnchorPane id="EditAnchorPane" fx:id="AnchorPaneEdit" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="450.0" prefWidth="590.0" visible="true" AnchorPane.bottomAnchor="70.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="75.0">
       <children>
         <Label prefHeight="30.0" text="%key.Edit.Label.Title" AnchorPane.leftAnchor="150.0" AnchorPane.topAnchor="15.0" />
         <TextField fx:id="textFieldTitle" prefHeight="30.0" prefWidth="380.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="9.0" AnchorPane.topAnchor="45.0" />
@@ -109,8 +109,8 @@
         <TextArea fx:id="textAreaContents" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="330.0" prefWidth="815.0" visible="true" wrapText="true" AnchorPane.bottomAnchor="98.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="9.0" AnchorPane.topAnchor="110.0" />
         <Button fx:id="buttonSave" mnemonicParsing="false" onAction="#onActionButtonSave" prefWidth="90.0" text="%key.Button.Save" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="120.0" />
         <Button fx:id="buttonCancel" mnemonicParsing="false" onAction="#onActionButtonCancel" prefWidth="90.0" text="%key.Button.Cancel" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="10.0" />
-        <TextField fx:id="textFieldAttachFile" disable="true" prefHeight="30.0" prefWidth="716.0" promptText="%key.Edit.TextField.InputPathname" AnchorPane.bottomAnchor="37.0" AnchorPane.leftAnchor="150.0" />
-        <Label disable="true" prefHeight="30.0" prefWidth="166.0" text="%key.Edit.Label.AttachFile" AnchorPane.bottomAnchor="65.0" AnchorPane.leftAnchor="152.0" AnchorPane.topAnchor="440.0" />
+        <TextField fx:id="textFieldAttachFile" disable="true" prefHeight="30.0" prefWidth="716.0" promptText="%key.Edit.TextField.InputPathname" AnchorPane.bottomAnchor="37.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="108.0" />
+        <Label disable="true" prefHeight="30.0" prefWidth="166.0" text="%key.Edit.Label.AttachFile" AnchorPane.bottomAnchor="65.0" AnchorPane.leftAnchor="150.0" />
         <Button disable="true" mnemonicParsing="false" prefHeight="30.0" prefWidth="45.0" text="..." AnchorPane.bottomAnchor="35.0" AnchorPane.rightAnchor="55.0" />
       </children>
     </AnchorPane>

--- a/src/com/wiki/standalone/moxkiriya/dialog/InitialSettingsDialog.fxml
+++ b/src/com/wiki/standalone/moxkiriya/dialog/ConfigSettingsDialog.fxml
@@ -8,7 +8,7 @@
 <?import javafx.scene.paint.*?>
 <?scenebuilder-preview-i18n-resource ../resources/moxkiriya.properties?>
 
-<AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="260.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="com.wiki.standalone.moxkiriya.dialog.InitialSettingsDialogController">
+<AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="260.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="com.wiki.standalone.moxkiriya.dialog.ConfigSettingsDialogController">
   <children>
     <Label prefHeight="30.0" prefWidth="574.0" text="%key.Initial.Setting.Dialog.Message" AnchorPane.leftAnchor="25.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="15.0" />
     <Button id="ButtonOK" fx:id="buttonOK" maxHeight="-Infinity" maxWidth="-Infinity" mnemonicParsing="false" onAction="#onActionButtonOK" prefHeight="25.0" prefWidth="71.0" text="%key.Button.OK" AnchorPane.bottomAnchor="15.0" AnchorPane.rightAnchor="50.0" />

--- a/src/com/wiki/standalone/moxkiriya/dialog/InitialSettingsDialog.java
+++ b/src/com/wiki/standalone/moxkiriya/dialog/ConfigSettingsDialog.java
@@ -1,6 +1,6 @@
 /**
  * Moxkiriya standalone Wiki.
- * ApprootInputDialog.
+ * ConfigSettingsDialog.
  * 
  * @author Ryuhei Terada
  * See the '<a href="{@docRoot}/copyright.html">Copyright</a>'
@@ -13,15 +13,15 @@ import javafx.stage.Stage;
 /**
  * ApprootInputDialog
  */
-public class InitialSettingsDialog extends DialogBase {
+public class ConfigSettingsDialog extends DialogBase {
 	@Override
 	protected String getFXML() {
-		return "InitialSettingsDialog.fxml";
+		return "ConfigSettingsDialog.fxml";
 	}
 
 	@Override
 	protected DialogController getController() {
-		InitialSettingsDialogController controller = loader_.getController();
+		ConfigSettingsDialogController controller = loader_.getController();
 		controller.setWindow(scene_.getWindow());
 
 		return controller;

--- a/src/com/wiki/standalone/moxkiriya/dialog/InitialSettingsDialogController.java
+++ b/src/com/wiki/standalone/moxkiriya/dialog/ConfigSettingsDialogController.java
@@ -1,6 +1,6 @@
 /**
  * Moxkiriya standalone Wiki.
- * ApprootInputDialogController.
+ * ConfigSettingsDialogController.
  * 
  * @author Ryuhei Terada
  * See the '<a href="{@docRoot}/copyright.html">Copyright</a>'
@@ -25,9 +25,9 @@ import javafx.stage.DirectoryChooser;
 import javafx.stage.Window;
 
 /**
- * Approot入力ダイアログコントローラ
+ * ConfigSettingダイアログコントローラ
  */
-public class InitialSettingsDialogController extends DialogControllerBase {
+public class ConfigSettingsDialogController extends DialogControllerBase {
 	@FXML	private TextField textFieldApproot;
 	@FXML	private Button    buttonChooseDirectory;
 	@FXML   private CheckBox  checkBoxClusterSetting;

--- a/src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties
+++ b/src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties
@@ -35,7 +35,7 @@ key.Hyperlink.Pagelist: Page list
 key.Hyperlink.Edit: Edit
 key.Hyperlink.EditAttachFiles: Edit Attach Files 
 
-key.Initial.Setting.Dialog.Message: Moxkiriya initial settings.
+key.Initial.Setting.Dialog.Message: Moxkiriya Configuration settings.
 key.Initial.Setting.Heading.Approot: Approot:
 key.Initial.Setting.Approot.textField.prompt.ChooseDirectory: Choose Approot Path.
 key.Initial.Setting.Heading.Cluster.setting: Cluster setting:

--- a/src/com/wiki/standalone/moxkiriya/resources/repository_cluster.xml
+++ b/src/com/wiki/standalone/moxkiriya/resources/repository_cluster.xml
@@ -183,9 +183,11 @@
         </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="schemaObjectPrefix" value="journal_"/>
-        </Journal>    </Cluster>
+			<param name="databaseType" value="derby"/>
+        </Journal>
+    </Cluster>
 </Repository>