提交: 1c62b054271af0da2f4da630ee657d6271670eba - Moxkiriya (git)

Moxkiriya Stand-alone wikiエンジンのソースレポジトリ

Commit MetaInfo

• 修订版: 1c62b054271af0da2f4da630ee657d6271670eba (tree)
• 时间: 2018-11-04 20:27:29
• 作者: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• リポジトリのnamespace_uriをプロジェクトに合わせて変更
  
• Derbyクラスタのログインモジュールの設定を変更
  

更改概述

• add: .gitignore
• modified: Moxkiriya7/.classpath
• modified: Moxkiriya7/.settings/org.eclipse.core.resources.prefs
• modified: Moxkiriya7/src/com/wiki/standalone/moxkiriya/WikiRepository.java
• modified: Moxkiriya7/src/com/wiki/standalone/moxkiriya/resources/repository_cluster_derby.xml

差异

--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/.metadata/

--- a/Moxkiriya7/.classpath
+++ b/Moxkiriya7/.classpath
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/javax/jcr/jcr/2.0/jcr-2.0.jar"/>
-	<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" 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"/>
-	<classpathentry kind="lib" path="lib/org/apache/lucene/lucene-core/3.6.0/lucene-core-3.6.0.jar"/>
-	<classpathentry kind="lib" path="lib/org/apache/tika/tika-core/1.17/tika-core-1.17.jar"/>
-	<classpathentry kind="lib" path="lib/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar"/>
-	<classpathentry kind="lib" path="lib/org/slf4j/slf4j-simple/1.6.6/slf4j-simple-1.6.6.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar"/>
-	<classpathentry kind="lib" path="lib/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/commons-io/commons-io/2.6/commons-io-2.6.jar"/>
-	<classpathentry kind="lib" path="lib/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"/>
-	<classpathentry kind="lib" path="lib/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
-	<classpathentry kind="lib" path="lib/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
-	<classpathentry kind="lib" path="lib/xalan/serializer/2.7.1/serializer-2.7.1.jar"/>
-	<classpathentry kind="lib" path="lib/xalan/xalan/2.7.1/xalan-2.7.1.jar"/>
-	<classpathentry kind="lib" path="lib/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
-	<classpathentry kind="lib" path="lib/org/apache/derby/derby/10.12.1.1/derbyclient.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/javax/jcr/jcr/2.0/jcr-2.0.jar"/>
+	<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" 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"/>
+	<classpathentry kind="lib" path="lib/org/apache/lucene/lucene-core/3.6.0/lucene-core-3.6.0.jar"/>
+	<classpathentry kind="lib" path="lib/org/apache/tika/tika-core/1.17/tika-core-1.17.jar"/>
+	<classpathentry kind="lib" path="lib/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar"/>
+	<classpathentry kind="lib" path="lib/org/slf4j/slf4j-simple/1.6.6/slf4j-simple-1.6.6.jar"/>
+	<classpathentry kind="lib" path="lib/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar"/>
+	<classpathentry kind="lib" path="lib/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3.jar"/>
+	<classpathentry kind="lib" path="lib/commons-io/commons-io/2.6/commons-io-2.6.jar"/>
+	<classpathentry kind="lib" path="lib/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"/>
+	<classpathentry kind="lib" path="lib/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+	<classpathentry kind="lib" path="lib/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
+	<classpathentry kind="lib" path="lib/xalan/serializer/2.7.1/serializer-2.7.1.jar"/>
+	<classpathentry kind="lib" path="lib/xalan/xalan/2.7.1/xalan-2.7.1.jar"/>
+	<classpathentry kind="lib" path="lib/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+	<classpathentry kind="lib" path="lib/org/apache/derby/derby/10.12.1.1/derbyclient.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

--- a/Moxkiriya7/.settings/org.eclipse.core.resources.prefs
+++ b/Moxkiriya7/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,4 @@
 eclipse.preferences.version=1
+encoding//src/com/wiki/standalone/moxkiriya/WikiRepository.java=UTF-8
 encoding//src/com/wiki/standalone/moxkiriya/resources/defaultstylesheet.css=UTF-8
 encoding/license=UTF-8

--- a/Moxkiriya7/src/com/wiki/standalone/moxkiriya/WikiRepository.java
+++ b/Moxkiriya7/src/com/wiki/standalone/moxkiriya/WikiRepository.java
@@ -62,7 +62,7 @@ public class WikiRepository {
 	/** Moxkiriya repository generic namespace */
 	public static final String NAMESPACE_MOXKI = "moxki";
 	
-	public static final String NAMESPACE_MOXKI_URI = "https://osdn.net/users/ryuhei__terada/pf/Moxkiriya7/moxki/1.0";
+	public static final String NAMESPACE_MOXKI_URI = "https://osdn.net/projects/moxkiriya7/moxki/1.0";
 
 	/** Node name "wikiroot" */
 	public static final String NODE_WIKIROOT = NAMESPACE_MOXKI	+ ":wikiroot";
@@ -188,7 +188,7 @@ public class WikiRepository {
 	        wikiroot.addNode(NODE_PAGES);
 
 	        /*
-	         * "page"ノードを作成
+	         * "page"繝弱�ｼ繝峨ｒ菴懈��
 	         */
 	        checkin(pageData);
 		}
@@ -556,7 +556,7 @@ public class WikiRepository {
 				
 				if(map.size() == 0) {
 					/*
-					 * category pageが未作成の場合、
+					 * category page縺梧悴菴懈�舌�ｮ蝣ｴ蜷医��
 					 */
 					PageData pageData = new PageData();
 					pageData.setNamespace(PROPERTY_CATEGORY);

--- a/Moxkiriya7/src/com/wiki/standalone/moxkiriya/resources/repository_cluster_derby.xml
+++ b/Moxkiriya7/src/com/wiki/standalone/moxkiriya/resources/repository_cluster_derby.xml
@@ -76,13 +76,15 @@
             <!-- <param name="config" value="${rep.home}/access.xml"/> -->
         </AccessManager>
 
-		<!--
         <LoginModule class="org.apache.jackrabbit.core.security.authentication.DefaultLoginModule">
-		-->
-		<LoginModule class="com.sun.security.auth.module.NTLoginModule">
            <!-- 
               anonymous user name ('anonymous' is the default value)
             -->
+           <param name="anonymousId" value="anonymous"/>
+           <!--
+              administrator user id (default value if param is missing is 'admin')
+            -->
+           <param name="adminId" value="admin"/>
         </LoginModule>
     </Security>