@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<install4j version="4.1.3" transformSequenceNumber="2"> - <directoryPresets config="./src/java-rebel-1.1.1/Notice.txt" /> - <application name="Lift Framework" distributionSourceDir="" applicationId="5718-3659-1334-6595" mediaDir="./target" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="true" excludeSignedFromPacking="true" keepModificationTimes="false" shortName="liftweb" publisher="The Lift Open Source Comunity" publisherWeb="http://www.liftweb.net/" version="0.8" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" javaMinVersion="1.5" javaMaxVersion="" allowBetaVM="true" jdkMode="jdk" jdkName="JRE 1.5"> +<install4j version="4.1.5" transformSequenceNumber="2"> + <directoryPresets config="./src/javarebel-1.2.2/Install.html" /> + <application name="Lift Framework" distributionSourceDir="" applicationId="5718-3659-1334-6595" mediaDir="./target" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="true" excludeSignedFromPacking="true" keepModificationTimes="false" shortName="liftweb" publisher="The Lift Open Source Comunity" publisherWeb="http://www.liftweb.net/" version="0.11" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" installerName="" javaMinVersion="1.5" javaMaxVersion="" allowBetaVM="true" jdkMode="runtimeJre" jdkName=""> <languages skipLanguageSelection="false"> <principalLanguage id="en" customLocalizationFile="" /> <additionalLanguages /> @@ -18,18 +18,18 @@ <mountPoints> <mountPoint id="171" root="" location="apache-maven" mode="755" /> <mountPoint id="172" root="" location="java-rebel" mode="755" /> - <mountPoint id="120" root="" location="bin" mode="755" /> </mountPoints> <entries> - <dirEntry mountPoint="171" file="./src/apache-maven-2.0.8" overwrite="0" shared="false" mode="755" uninstallMode="2" excludeSuffixes="" dirMode="755"> + <dirEntry mountPoint="171" file="./src/apache-maven-2.0.9" overwrite="0" shared="false" mode="755" uninstallMode="2" excludeSuffixes="" dirMode="755"> <exclude> <entry location=".DS_Store" fileType="regular" /> </exclude> </dirEntry> - <fileEntry mountPoint="172" file="./src/java-rebel-1.1.1/javarebel.jar" overwrite="1" shared="false" mode="755" uninstallMode="2" /> - <fileEntry mountPoint="172" file="./src/java-rebel-1.1.1/javarebel.lic" overwrite="1" shared="false" mode="755" uninstallMode="2" /> - <fileEntry mountPoint="172" file="./src/java-rebel-1.1.1/License.txt" overwrite="1" shared="false" mode="755" uninstallMode="2" /> - <fileEntry mountPoint="172" file="./src/java-rebel-1.1.1/Notice.txt" overwrite="1" shared="false" mode="755" uninstallMode="2" /> + <fileEntry mountPoint="172" file="./src/javarebel-1.2.2/javarebel.jar" overwrite="1" shared="false" mode="755" uninstallMode="2" /> + <fileEntry mountPoint="172" file="./src/javarebel-1.2.2/javarebel.lic" overwrite="1" shared="false" mode="755" uninstallMode="2" /> + <fileEntry mountPoint="172" file="./src/javarebel-1.2.2/License.txt" overwrite="1" shared="false" mode="755" uninstallMode="2" /> + <fileEntry mountPoint="172" file="./src/javarebel-1.2.2/Notice.txt" overwrite="1" shared="false" mode="755" uninstallMode="2" /> + <fileEntry mountPoint="172" file="./src/javarebel-1.2.2/Install.html" overwrite="1" shared="false" mode="755" uninstallMode="2" /> </entries> <components> <component name="Apache Maven 2.0.8" id="123" displayDescription="false" selected="true" mandatory="false" downloadable="false"> @@ -541,7 +541,7 @@ if(WinEnvVars.getenv("JAVA_HOME") == null){ <exclude /> <variables /> </macosFolder> - <win32 name="Windows" id="57" mediaFileName="" installDir="${compiler:sys.shortName}-${compiler:sys.version}" overridePrincipalLanguage="false" requires64bit="false" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" includedJRE="windows-x86-1.6.0_06" manualJREEntry="false" bundleType="1" jreURL="http://scala-tools.org/windows-x86-1.6.0_06.tar.gz" jreFtpURL="" jreShared="false" customInstallBaseDir="" createUninstallIcon="true" contentFilesType="1" downloadURL="" runAsAdmin="true"> + <win32 name="Windows" id="57" mediaFileName="" installDir="${compiler:sys.shortName}-${compiler:sys.version}" overridePrincipalLanguage="false" requires64bit="false" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" includedJRE="windows-x86-1.6.0_12" manualJREEntry="false" bundleType="2" jreURL="http://scala-tools.org/windows-x86-1.6.0_12.tar.gz" jreFtpURL="" jreShared="true" customInstallBaseDir="" createUninstallIcon="true" contentFilesType="1" downloadURL="" runAsAdmin="true"> <excludedLaunchers /> <excludedComponents /> <excludedBeans /> @@ -562,6 +562,7 @@ if(WinEnvVars.getenv("JAVA_HOME") == null){ </unixInstaller> </mediaSets> <buildIds buildAll="false"> + <mediaSet refId="54" /> <mediaSet refId="57" /> </buildIds> </install4j> lift-installer/lift-enviroment-installer.install4j @@ -23,7 +23,7 @@ import _root_.net.liftweb.http.js.JSArtifacts import _root_.net.liftweb.http.js.jquery._ import _root_.scala.xml._ import _root_.scala.collection.mutable.{ListBuffer} -import _root_.java.util.{Locale, TimeZone} +import _root_.java.util.{Locale, TimeZone, ResourceBundle} import _root_.javax.servlet.http.{HttpServlet, HttpServletRequest , HttpServletResponse, HttpSession, Cookie} import _root_.javax.servlet.{ServletContext} import _root_.java.io.{InputStream, ByteArrayOutputStream, BufferedReader, StringReader} @@ -44,8 +44,8 @@ object LiftRules { type ViewDispatchPF = PartialFunction[List[String], Either[() => Box[NodeSeq], LiftView]] type HttpAuthProtectedResourcePF = PartialFunction[ParsePath, Box[Role]] type ExceptionHandlerPF = PartialFunction[(Props.RunModes.Value, Req, Throwable), LiftResponse] - - + type ResourceBundleFactoryPF = PartialFunction[(String,Locale), ResourceBundle] + /** * A partial function that allows the application to define requests that should be * handled by lift rather than the default servlet handler @@ -312,9 +312,11 @@ object LiftRules { * A function that takes the current HTTP request and returns the current */ var localeCalculator: Box[HttpServletRequest] => Locale = defaultLocaleCalculator _ - + def defaultLocaleCalculator(request: Box[HttpServletRequest]) = request.flatMap(_.getLocale() match {case null => Empty case l: Locale => Full(l)}).openOr(Locale.getDefault()) - + + var resourceBundleFactories = RulesSeq[ResourceBundleFactoryPF] + private val (hasContinuations_?, contSupport, getContinuation, getObject, setObject, suspend, resume) = { try { val cc = Class.forName("org.mortbay.util.ajax.ContinuationSupport") lift/src/main/scala/net/liftweb/http/LiftRules.scala @@ -232,17 +232,20 @@ object S extends HasParams { /** * Get the resource bundle for the current locale */ - def resourceBundles: List[ResourceBundle] = { - _resBundle.value match { - case Nil => _resBundle.set(LiftRules.resourceNames.flatMap(name => tryo( - List(ResourceBundle.getBundle(name, locale)) - ) openOr Nil)) - _resBundle.value - case bundles => bundles - - } - } - + def resourceBundles: List[ResourceBundle] = { + _resBundle.value match { + case Nil => { + _resBundle.set(LiftRules.resourceNames.flatMap(name => tryo( + List(ResourceBundle.getBundle(name, locale)) + ).openOr( + NamedPF.applyBox((name, locale), LiftRules.resourceBundleFactories.toList).map(List(_)) openOr Nil + ))) + _resBundle.value + } + case bundles => bundles + } + } + /** * Get the lift core resource bundle for the current locale */ lift/src/main/scala/net/liftweb/http/S.scala lift-installer/src/apache-maven-2.0.8/LICENSE.txt lift-installer/src/apache-maven-2.0.8/NOTICE.txt lift-installer/src/apache-maven-2.0.8/README.txt lift-installer/src/apache-maven-2.0.8/bin/m2 lift-installer/src/apache-maven-2.0.8/bin/m2.bat lift-installer/src/apache-maven-2.0.8/bin/m2.conf lift-installer/src/apache-maven-2.0.8/bin/mvn lift-installer/src/apache-maven-2.0.8/bin/mvn.bat lift-installer/src/apache-maven-2.0.8/bin/mvnDebug lift-installer/src/apache-maven-2.0.8/bin/mvnDebug.bat lift-installer/src/apache-maven-2.0.8/boot/classworlds-1.1.jar lift-installer/src/apache-maven-2.0.8/conf/settings.xml lift-installer/src/apache-maven-2.0.8/lib/maven-2.0.8-uber.jar lift-installer/src/java-rebel-1.1.1/Changelog.txt lift-installer/src/java-rebel-1.1.1/Install.html lift-installer/src/java-rebel-1.1.1/License.txt lift-installer/src/java-rebel-1.1.1/Notice.txt lift-installer/src/java-rebel-1.1.1/javarebel.jar lift-installer/src/java-rebel-1.1.1/javarebel.lic lift-installer/src/lift-helpers/TODO.txt bcb72cd09d664e96e5dad42bd7a54c807ebec7b2 Timothy Perrett timperrett hello@timperrett.com http://github.com/dpp/liftweb/commit/6b9cb7d6c97fd69f4a565b448d8f0d3077a6047a 6b9cb7d6c97fd69f4a565b448d8f0d3077a6047a 2009-02-27T16:12:35-08:00 2009-02-27T16:12:35-08:00 Added localization extensions 23c55718cf85c5d4673dca69603060114f78acd0 Timothy Perrett timperrett hello@timperrett.com