Moxkiriyaプロジェクト事前開発用の作業部屋
Révision | 1379e1fb4eeeca55c7290aa19f80eca91826c851 (tree) |
---|---|
l'heure | 2018-09-29 10:54:14 |
Auteur | Harold_Andoh <andolloyd@gmai...> |
Commiter | Harold_Andoh |
[Moxkiriya7]
@@ -7,8 +7,8 @@ | ||
7 | 7 | <classpathentry kind="lib" path="lib/org/apache/derby/derby/10.12.1.1/derby-10.12.1.1.jar"/> |
8 | 8 | <classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-api/2.14.5/jackrabbit-api-2.14.5.jar"/> |
9 | 9 | <classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-bundle/2.14.5/jackrabbit-bundle-2.14.5.jar"/> |
10 | - <classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-core/2.14.5/jackrabbit-core-2.14.5.jar"/> | |
11 | - <classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-data/2.14.5/jackrabbit-data-2.14.5.jar"/> | |
10 | + <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"/> | |
11 | + <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"/> | |
12 | 12 | <classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-jcr-commons/2.14.5/jackrabbit-jcr-commons-2.14.5.jar"/> |
13 | 13 | <classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-spi/2.14.5/jackrabbit-spi-2.14.5.jar"/> |
14 | 14 | <classpathentry kind="lib" path="lib/org/apache/jackrabbit/jackrabbit-spi-commons/2.14.5/jackrabbit-spi-commons-2.14.5.jar"/> |
@@ -19,7 +19,7 @@ import java.nio.file.Path; | ||
19 | 19 | import java.nio.file.Paths; |
20 | 20 | import java.util.ResourceBundle; |
21 | 21 | |
22 | -import com.wiki.standalone.moxkiriya.dialog.InitialSettingsDialog; | |
22 | +import com.wiki.standalone.moxkiriya.dialog.ConfigSettingsDialog; | |
23 | 23 | import com.wiki.standalone.moxkiriya.util.FileIO; |
24 | 24 | |
25 | 25 | import javafx.application.Application; |
@@ -113,7 +113,7 @@ public class Main extends Application { | ||
113 | 113 | * @throws Exception |
114 | 114 | */ |
115 | 115 | private void showInitialSettingsDialog(Stage stage) throws Exception { |
116 | - InitialSettingsDialog dialog = new InitialSettingsDialog(); | |
116 | + ConfigSettingsDialog dialog = new ConfigSettingsDialog(); | |
117 | 117 | dialog.showDialog(stage, resources_); |
118 | 118 | } |
119 | 119 |
@@ -101,7 +101,7 @@ | ||
101 | 101 | <Button fx:id="buttonDeletePages" mnemonicParsing="false" onAction="#onActionButtonDeletePages" prefHeight="30.0" text="%key.Button.Delete.Pages" AnchorPane.bottomAnchor="15.0" AnchorPane.leftAnchor="150.0" /> |
102 | 102 | </children> |
103 | 103 | </AnchorPane> |
104 | - <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"> | |
104 | + <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"> | |
105 | 105 | <children> |
106 | 106 | <Label prefHeight="30.0" text="%key.Edit.Label.Title" AnchorPane.leftAnchor="150.0" AnchorPane.topAnchor="15.0" /> |
107 | 107 | <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 @@ | ||
109 | 109 | <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" /> |
110 | 110 | <Button fx:id="buttonSave" mnemonicParsing="false" onAction="#onActionButtonSave" prefWidth="90.0" text="%key.Button.Save" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="120.0" /> |
111 | 111 | <Button fx:id="buttonCancel" mnemonicParsing="false" onAction="#onActionButtonCancel" prefWidth="90.0" text="%key.Button.Cancel" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="10.0" /> |
112 | - <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" /> | |
113 | - <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" /> | |
112 | + <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" /> | |
113 | + <Label disable="true" prefHeight="30.0" prefWidth="166.0" text="%key.Edit.Label.AttachFile" AnchorPane.bottomAnchor="65.0" AnchorPane.leftAnchor="150.0" /> | |
114 | 114 | <Button disable="true" mnemonicParsing="false" prefHeight="30.0" prefWidth="45.0" text="..." AnchorPane.bottomAnchor="35.0" AnchorPane.rightAnchor="55.0" /> |
115 | 115 | </children> |
116 | 116 | </AnchorPane> |
@@ -8,7 +8,7 @@ | ||
8 | 8 | <?import javafx.scene.paint.*?> |
9 | 9 | <?scenebuilder-preview-i18n-resource ../resources/moxkiriya.properties?> |
10 | 10 | |
11 | -<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"> | |
11 | +<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"> | |
12 | 12 | <children> |
13 | 13 | <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" /> |
14 | 14 | <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" /> |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /** |
2 | 2 | * Moxkiriya standalone Wiki. |
3 | - * ApprootInputDialog. | |
3 | + * ConfigSettingsDialog. | |
4 | 4 | * |
5 | 5 | * @author Ryuhei Terada |
6 | 6 | * See the '<a href="{@docRoot}/copyright.html">Copyright</a>' |
@@ -13,15 +13,15 @@ import javafx.stage.Stage; | ||
13 | 13 | /** |
14 | 14 | * ApprootInputDialog |
15 | 15 | */ |
16 | -public class InitialSettingsDialog extends DialogBase { | |
16 | +public class ConfigSettingsDialog extends DialogBase { | |
17 | 17 | @Override |
18 | 18 | protected String getFXML() { |
19 | - return "InitialSettingsDialog.fxml"; | |
19 | + return "ConfigSettingsDialog.fxml"; | |
20 | 20 | } |
21 | 21 | |
22 | 22 | @Override |
23 | 23 | protected DialogController getController() { |
24 | - InitialSettingsDialogController controller = loader_.getController(); | |
24 | + ConfigSettingsDialogController controller = loader_.getController(); | |
25 | 25 | controller.setWindow(scene_.getWindow()); |
26 | 26 | |
27 | 27 | return controller; |
@@ -1,6 +1,6 @@ | ||
1 | 1 | /** |
2 | 2 | * Moxkiriya standalone Wiki. |
3 | - * ApprootInputDialogController. | |
3 | + * ConfigSettingsDialogController. | |
4 | 4 | * |
5 | 5 | * @author Ryuhei Terada |
6 | 6 | * See the '<a href="{@docRoot}/copyright.html">Copyright</a>' |
@@ -25,9 +25,9 @@ import javafx.stage.DirectoryChooser; | ||
25 | 25 | import javafx.stage.Window; |
26 | 26 | |
27 | 27 | /** |
28 | - * Approot入力ダイアログコントローラ | |
28 | + * ConfigSettingダイアログコントローラ | |
29 | 29 | */ |
30 | -public class InitialSettingsDialogController extends DialogControllerBase { | |
30 | +public class ConfigSettingsDialogController extends DialogControllerBase { | |
31 | 31 | @FXML private TextField textFieldApproot; |
32 | 32 | @FXML private Button buttonChooseDirectory; |
33 | 33 | @FXML private CheckBox checkBoxClusterSetting; |
@@ -35,7 +35,7 @@ key.Hyperlink.Pagelist: Page list | ||
35 | 35 | key.Hyperlink.Edit: Edit |
36 | 36 | key.Hyperlink.EditAttachFiles: Edit Attach Files |
37 | 37 | |
38 | -key.Initial.Setting.Dialog.Message: Moxkiriya initial settings. | |
38 | +key.Initial.Setting.Dialog.Message: Moxkiriya Configuration settings. | |
39 | 39 | key.Initial.Setting.Heading.Approot: Approot: |
40 | 40 | key.Initial.Setting.Approot.textField.prompt.ChooseDirectory: Choose Approot Path. |
41 | 41 | key.Initial.Setting.Heading.Cluster.setting: Cluster setting: |
@@ -183,9 +183,11 @@ | ||
183 | 183 | </Journal> |
184 | 184 | --> |
185 | 185 | <Journal class="org.apache.jackrabbit.core.journal.DatabaseJournal"> |
186 | + <param name="revision" value="${rep.home}/revision.log" /> | |
186 | 187 | <param name="driver" value="${jdbc.driver}" /> |
187 | 188 | <param name="url" value="${dbserver.url}:${dbserver.port}/moxkiriyadb/journal/db;create=true"/> |
188 | - <param name="schemaObjectPrefix" value="journal_"/> | |
189 | - </Journal> </Cluster> | |
189 | + <param name="databaseType" value="derby"/> | |
190 | + </Journal> | |
191 | + </Cluster> | |
190 | 192 | </Repository> |
191 | 193 |