jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgoes...@apache.org
Subject svn commit: r1695981 - in /jspwiki/trunk/jspwiki-portable: ./ src/overlay/tomcat/webapps/ROOT/ src/overlay/woas/webapps/department/ src/overlay/woas/webapps/department/WEB-INF/ src/overlay/woas/webapps/department/WEB-INF/classes/ src/overlay/woas/webap...
Date Fri, 14 Aug 2015 20:19:05 GMT
Author: sgoeschl
Date: Fri Aug 14 20:19:05 2015
New Revision: 1695981

URL: http://svn.apache.org/r1695981
Log:
Renaming the pre-configured wikis to 'personal' and 'department'

Added:
    jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/department/
      - copied from r1695966, jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/public/
    jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/groupdatabase.xml
      - copied unchanged from r1695977, jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/public/WEB-INF/groupdatabase.xml
    jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/personal/
      - copied from r1695966, jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/private/
Removed:
    jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/private/
    jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/public/
Modified:
    jspwiki/trunk/jspwiki-portable/build.xml
    jspwiki/trunk/jspwiki-portable/pom.xml
    jspwiki/trunk/jspwiki-portable/readme.md
    jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/index.html
    jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
    jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties

Modified: jspwiki/trunk/jspwiki-portable/build.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/build.xml?rev=1695981&r1=1695980&r2=1695981&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/build.xml (original)
+++ jspwiki/trunk/jspwiki-portable/build.xml Fri Aug 14 20:19:05 2015
@@ -66,20 +66,20 @@
   <!-- ############################################################## -->
 
   <target name="woas:copy-woas" description="Prepares a customized JSPWiki installation">
 
-    <!-- copy the exploded war for the "private" wiki -->
-    <copy todir="${jspwiki.woas.assembly.dir}/webapps/private" overwrite="true">
+    <!-- copy the exploded war for the "personal" wiki -->
+    <copy todir="${jspwiki.woas.assembly.dir}/webapps/personal" overwrite="true">
       <fileset dir="${jspwiki.woas.unpack.dir}/jspwiki-war/"/>
     </copy>
-    <delete dir="${jspwiki.woas.assembly.dir}/webapps/private/WEB-INF/lib"/>    
-    <!-- copy the exploded war for the "public" wiki -->
-    <copy todir="${jspwiki.woas.assembly.dir}/webapps/public" overwrite="true">
+    <delete dir="${jspwiki.woas.assembly.dir}/webapps/personal/WEB-INF/lib"/>    
+    <!-- copy the exploded war for the "department" wiki -->
+    <copy todir="${jspwiki.woas.assembly.dir}/webapps/department" overwrite="true">
       <fileset dir="${jspwiki.woas.unpack.dir}/jspwiki-war/"/>
     </copy>
     <!-- overlay the custom configuration for JSPWiki -->  
     <copy todir="${jspwiki.woas.assembly.dir}" overwrite="true">
       <fileset dir="${basedir}/src/overlay/woas"/>
     </copy>        
-    <delete dir="${jspwiki.woas.assembly.dir}/webapps/public/WEB-INF/lib"/>       

+    <delete dir="${jspwiki.woas.assembly.dir}/webapps/department/WEB-INF/lib"/>   
    
   </target>  
 
   <!-- ############################################################## -->

Modified: jspwiki/trunk/jspwiki-portable/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/pom.xml?rev=1695981&r1=1695980&r2=1695981&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/pom.xml (original)
+++ jspwiki/trunk/jspwiki-portable/pom.xml Fri Aug 14 20:19:05 2015
@@ -118,9 +118,9 @@
               <outputDirectory>${project.build.directory}/unpack/jspwiki-war</outputDirectory>
             </configuration>
           </execution>
-          <!-- Unpack the JSP Wiki Pages for the "private" wiki -->
+          <!-- Unpack the JSP Wiki Pages for the "personal" wiki -->
           <execution>
-            <id>unpack-wikipages-private</id>
+            <id>unpack-wikipages-personal</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>unpack</goal>
@@ -134,12 +134,12 @@
                 </artifactItem>
               </artifactItems>
               <excludes>META-INF/**</excludes>
-              <outputDirectory>${project.build.directory}/woas/data/private</outputDirectory>
+              <outputDirectory>${project.build.directory}/woas/data/personal</outputDirectory>
             </configuration>
           </execution>
-          <!-- Unpack the JSP Wiki Pages for the "public" wiki -->
+          <!-- Unpack the JSP Wiki Pages for the "department" wiki -->
           <execution>
-            <id>unpack-wikipages-public</id>
+            <id>unpack-wikipages-department</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>unpack</goal>
@@ -153,7 +153,7 @@
                 </artifactItem>
               </artifactItems>
               <excludes>META-INF/**</excludes>
-              <outputDirectory>${project.build.directory}/woas/data/public</outputDirectory>
+              <outputDirectory>${project.build.directory}/woas/data/department</outputDirectory>
             </configuration>
           </execution>
           <!-- Unpack the tomcat distribution -->

Modified: jspwiki/trunk/jspwiki-portable/readme.md
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/readme.md?rev=1695981&r1=1695980&r2=1695981&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/readme.md (original)
+++ jspwiki/trunk/jspwiki-portable/readme.md Fri Aug 14 20:19:05 2015
@@ -102,7 +102,7 @@ mvn clean package
 
 # 3. The Public Wiki
 
-To secure the "public" wiki the following accounts were created
+To secure the "department" wiki the following accounts were created
 
 * "admin", "lEtMeIn"
 * "user", "user" 

Modified: jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/index.html
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/index.html?rev=1695981&r1=1695980&r2=1695981&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/index.html (original)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/tomcat/webapps/ROOT/index.html Fri Aug 14 20:19:05
2015
@@ -33,10 +33,10 @@
   	<table width="100%">
   	  <tr>
   	    <td id="left">
-  		    <a href="./private"><img src="images/jspwiki.png"/>Your Private Wiki</a>
+  		    <a href="./personal"><img src="images/jspwiki.png"/>Your Personal Wiki</a>
   		  </td>
         <td id="left">
-          <a href="./public"><img src="images/jspwiki.png"/>Your Public Wiki</a>
+          <a href="./department"><img src="images/jspwiki.png"/>Your Department
Wiki</a>
         </td>        
   	  </tr>
   	</table>

Modified: jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties?rev=1695981&r1=1695966&r2=1695981&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
(original)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/department/WEB-INF/classes/jspwiki-custom.properties
Fri Aug 14 20:19:05 2015
@@ -19,12 +19,12 @@
 # Overriding values on classpath:/ini/jspwiki.properties
 #
 
-jspwiki.applicationName=public
-jspwiki.baseURL=http://localhost:9627/public/
-jspwiki.basicAttachmentProvider.storageDir=./data/public
-jspwiki.fileSystemProvider.pageDir=./data/public
+jspwiki.applicationName=department
+jspwiki.baseURL=http://localhost:9627/department/
+jspwiki.basicAttachmentProvider.storageDir=./data/department
+jspwiki.fileSystemProvider.pageDir=./data/department
 jspwiki.pageProvider=VersioningFileProvider
-jspwiki.workDir=./temp/public
+jspwiki.workDir=./temp/department
 
 jspwiki.attachment.forbid=.html .htm .php .asp .exe .sh .dll
 jspwiki.attachment.maxsize=4000000

Modified: jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties?rev=1695981&r1=1695966&r2=1695981&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
(original)
+++ jspwiki/trunk/jspwiki-portable/src/overlay/woas/webapps/personal/WEB-INF/classes/jspwiki-custom.properties
Fri Aug 14 20:19:05 2015
@@ -19,11 +19,11 @@
 # Overriding values on classpath:/ini/jspwiki.properties
 #
 
-jspwiki.applicationName=private
-jspwiki.baseURL=http://localhost:9627/private/
-jspwiki.basicAttachmentProvider.storageDir=./data/private
-jspwiki.fileSystemProvider.pageDir=./data/private
-jspwiki.workDir=./temp/private
+jspwiki.applicationName=personal
+jspwiki.baseURL=http://localhost:9627/personal/
+jspwiki.basicAttachmentProvider.storageDir=./data/personal
+jspwiki.fileSystemProvider.pageDir=./data/personal
+jspwiki.workDir=./temp/personal
 
 jspwiki.attachment.forbid=.html .htm .php .asp .exe .sh .dll
 jspwiki.attachment.maxsize=4000000



Mime
View raw message