Change comment:
minor improvements
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -6,11 +6,11 @@ 6 6 7 7 There are 3 ways of installing XWiki: 8 8 9 -* Use the [[Standalone distribution>>AdminGuide.InstallationStandalone]] which already packages a Servlet Container (Jetty) and a database (HSQL). This is the recommended option for first time XWiki users and for users who wish to quickly try out XWiki. 9 +* Use the [[Standalone distribution>>AdminGuide.InstallationStandalone]] which already packages a Servlet Container (Jetty) and a database (HSQL), filled with default wiki pages. This is the recommended option for first time XWiki users and for users who wish to quickly try out XWiki. 10 10 * Use the [[WAR distribution>>AdminGuide.InstallationWAR]] and configure both your container and your database to work with it. 11 11 * Use the [[.deb package>>AdminGuide.InstallationViaAPT]] to install the last version of XWiki and the dependencies. 12 12 13 -If you're insteadupgrading an existing XWiki install check the [[Upgrade instructions page>>AdminGuide.Upgrade]].13 +If you're upgrading an existing XWiki install check the [[Upgrade instructions page>>AdminGuide.Upgrade]]. 14 14 15 15 Pick one of the trails in the outline on the right to get started. 16 16 ... ... @@ -47,11 +47,12 @@ 47 47 == [[Using a standalone distribution >>AdminGuide.InstallationStandalone]] == 48 48 49 49 It provides a built-in XWiki, with a portable database and a lightweight Java container. 50 -A standalone distribution is not recommended in a production environment. If you need to use it in a production basis, you may look at the two other options. 51 51 51 +This standalone distribution is not recommended in a production environment. If you need to use it in a production basis, you may look at the two other options. 52 + 52 52 == [[Using .war package (usable for production)>>AdminGuide.InstallationWAR]] == 53 53 54 -It provides a java application package that has to be installed in a Java container (such as Tomcat). This can be used on almost any operating system.55 +It provides a Java application package that has to be installed in a Java container (such as Tomcat). This can be used on almost any operating system. 55 55 56 56 == [[Using .deb package (usable for production)>>AdminGuide.InstallationViaAPT]] == 57 57 ... ... @@ -75,7 +75,6 @@ 75 75 76 76 You need to edit ##WEB-INF/cache/infinispan/config.xml## for each instance of XWiki, and change the ##jmxDomain## value (found under the ##globalJmxStatistics## tag) to have a unique name. 77 77 78 - 79 79 == Running XWiki behind proxy-server == 80 80 81 81 Extension manager relies on remote repositories for searching and fetching available extensions, so if your XWiki is installed in a network accessing the internet through proxy-server, most likely extensions search will return you nothing and log files will contain ##connection refused## exceptions. ... ... @@ -88,3 +88,8 @@ 88 88 E.g. for Tomcat 6 it could be done in the following way: modify ##/<tomcat-home>/bin/catalina.sh## and added proxies to the ##JAVA_OPTS## variable definition: 89 89 90 90 ##JAVA_OPTS="$JAVA_OPTS -Dappserver.home=$CATALINA_HOME -Dappserver.base=$CATALINA_HOME **-Dhttp.proxyHost=proxy.mycompany.com -Dhttp.proxyPort=7777 -Dhttps.proxyHost=proxy.mycompany.com -Dhttps.proxyPort=7777** -Xmx512m -XX:MaxPermSize=196m $XWIKI_OPTS"## 91 + 92 +== Unsupported major.minor version 51.0 == 93 + 94 +This is because starting with version 6.0, XWiki requires Java 7 and you're using Java 6. You need to upgrade your Java version. 95 +