Author: sshafroi Date: 2008-05-09 09:39:12 +0200 (Fri, 09 May 2008) New Revision: 6592
Modified: trunk/ trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/MobileSearchCommand.java trunk/generic.sesam/war/pom.xml trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java Log: Merged revisions 6568-6591 via svnmerge from https://sesat.no/svn/sesat-kernel/branches/2.17 ........ r6576 | ssmiweve | 2008-05-06 13:16:14 +0200 (Tue, 06 May 2008) | 1 line error in error message (SEARCH-4705) ........ r6588 | sshafroi | 2008-05-08 09:51:37 +0200 (Thu, 08 May 2008) | 5 lines Issue SKER4656: (sesat-mojo:deploy runs twice during non-development builds) Move the searchModesSchemaGenerator into the development profile. ........ r6590 | ssmiweve | 2008-05-08 12:11:02 +0200 (Thu, 08 May 2008) | 1 line Issue SKER4735: (MobileSearchCommand, AbstractSearchCommand: RuntimeException occurred java.lang.NullPointerException. MobileSearchCommand.java, line 116) ........ Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated - /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6567 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 + /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6591 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 Modified: trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/MobileSearchCommand.java =================================================================== --- trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/MobileSearchCommand.java 2008-05-08 12:25:19 UTC (rev 6591) +++ trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/MobileSearchCommand.java 2008-05-09 07:39:12 UTC (rev 6592) @@ -113,9 +113,9 @@ String personalizationGroup = cfg.getPersonalizationGroup(); - if (getParameter(ORIGINATION_PARAMETER).equals("telenor") - && !cfg.getTelenorPersonalizationGroup().equals("")) - { + if ("telenor".equals(getParameter(ORIGINATION_PARAMETER)) + && !cfg.getTelenorPersonalizationGroup().equals("")){ + personalizationGroup = cfg.getTelenorPersonalizationGroup(); } Modified: trunk/generic.sesam/war/pom.xml =================================================================== --- trunk/generic.sesam/war/pom.xml 2008-05-08 12:25:19 UTC (rev 6591) +++ trunk/generic.sesam/war/pom.xml 2008-05-09 07:39:12 UTC (rev 6592) @@ -277,36 +277,4 @@ <version>${sesat.version}</version> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>sesat</groupId> - <artifactId>sesat-mojo</artifactId> - <version>${sesat.version}</version> - <configuration> - <outputDir> - src/main/conf/ - </outputDir> - <classpaths> - <classpath>../query-transform-config/src/main/java/</classpath> - <classpath>../search-command-config/src/main/java/</classpath> - <classpath>../result-handler-config/src/main/java/</classpath> - - <classpath>../../query-transform-config-spi/src/main/java/</classpath> - <classpath>../../search-command-config-spi/src/main/java/</classpath> - <classpath>../../result-handler-config-spi/src/main/java/</classpath> - </classpaths> - </configuration> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>searchModesSchemaGenerator</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> Modified: trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java =================================================================== --- trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java 2008-05-08 12:25:19 UTC (rev 6591) +++ trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java 2008-05-09 07:39:12 UTC (rev 6592) @@ -496,7 +496,7 @@ if (nav != null) { navigation.addReset(nav); } else { - LOG.error("Error in config, <reset id=\"" + resetNavId + "\" />, in mode " + modeId + " not found"); + LOG.error("Error in config, <reset id=\"" + resetNavId + "\" />, in tab " + modeId + " not found"); } } } _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
