From shinsuke ＠ users.sourceforge.jp Fri Feb 2 07:16:58 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Fri, 2 Feb 2007 07:16:58 +0900 Subject: [pal-cvs 2062] CVS-Update: wiki/src/main/java/jp/sf/pal/wiki/entity, NONE, NONE committed by shinsuke Message-ID: <20070201221658.BE6792AC198@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/java/jp/sf/pal/wiki/entity In directory sf-cvs:/tmp/cvs-serv4601/src/main/java/jp/sf/pal/wiki/entity Log Message: Directory /cvsroot/pal/wiki/src/main/java/jp/sf/pal/wiki/entity added to the repository From shinsuke ＠ users.sourceforge.jp Fri Feb 2 07:30:24 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Fri, 2 Feb 2007 07:30:24 +0900 Subject: [pal-cvs 2063] CVS-Update: wiki committed by shinsuke Message-ID: <20070201223024.7C80D2AC198@users.sourceforge.jp> Update of /cvsroot/pal/wiki In directory sf-cvs:/tmp/cvs-serv11495 Modified Files: .classpath pom.xml Log Message: added list page. supported WikiName. wiki/.classpath 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/.classpath.diff?r1=1.2&r2=1.3 wiki/pom.xml 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/pom.xml.diff?r1=1.2&r2=1.3 =================================================================== RCS file: wiki/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .classpath 2007/01/27 15:38:33 1.2 +++ .classpath 2007/02/01 22:30:24 1.3 @@ -5,29 +5,29 @@ - - + - + - + + + - + - =================================================================== RCS file: wiki/pom.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pom.xml 2007/01/27 15:38:33 1.2 +++ pom.xml 2007/02/01 22:30:24 1.3 @@ -137,9 +137,9 @@ @@@@ SERVLET DEV: END --> - com.marevol - marevol-faces-utils - 0.3 + jp.sf.pal + faces-utils + 0.3.1 jp.sf.streamconverter @@ -194,12 +194,12 @@ org.apache.portals.bridges portals-bridges-portletfilter - 1.0.1-20061109 + 1.0.1-20070113 jp.sf.pal faces-response-filter - 0.1 + 0.2 jp.sf.pal From shinsuke ＠ users.sourceforge.jp Fri Feb 2 07:30:24 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Fri, 2 Feb 2007 07:30:24 +0900 Subject: [pal-cvs 2064] CVS-Update: wiki/src/main/java/jp/sf/pal/wiki/entity committed by shinsuke Message-ID: <20070201223024.990422AC19B@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/java/jp/sf/pal/wiki/entity In directory sf-cvs:/tmp/cvs-serv11495/src/main/java/jp/sf/pal/wiki/entity Added Files: WikiPage.java Log Message: added list page. supported WikiName. wiki/src/main/java/jp/sf/pal/wiki/entity/WikiPage.java NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/java/jp/sf/pal/wiki/entity/WikiPage.java?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke ＠ users.sourceforge.jp Fri Feb 2 07:30:24 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Fri, 2 Feb 2007 07:30:24 +0900 Subject: [pal-cvs 2065] CVS-Update: wiki/src/main/java/jp/sf/pal/wiki/service committed by shinsuke Message-ID: <20070201223024.C32282AC198@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/java/jp/sf/pal/wiki/service In directory sf-cvs:/tmp/cvs-serv11495/src/main/java/jp/sf/pal/wiki/service Modified Files: WikiContentService.java Log Message: added list page. supported WikiName. wiki/src/main/java/jp/sf/pal/wiki/service/WikiContentService.java 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/java/jp/sf/pal/wiki/service/WikiContentService.java.diff?r1=1.2&r2=1.3 =================================================================== RCS file: wiki/src/main/java/jp/sf/pal/wiki/service/WikiContentService.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- WikiContentService.java 2007/01/27 15:38:33 1.2 +++ WikiContentService.java 2007/02/01 22:30:24 1.3 @@ -24,11 +24,15 @@ import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.io.Writer; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import javax.faces.context.FacesContext; import jp.sf.pal.wiki.WikiConstants; import jp.sf.pal.wiki.callback.WikiLinkGeneratorCallback; +import jp.sf.pal.wiki.entity.WikiPage; import jp.sf.pal.wiki.util.WikiUtil; import jp.sf.stconv.pipeline.PipelineException; import jp.sf.stconv.pipeline.StreamConverterPipeline; @@ -41,7 +45,7 @@ import org.apache.commons.logging.LogFactory; import org.seasar.framework.container.S2Container; -import com.marevol.utils.faces.application.FacesMessageUtil; +import jp.sf.pal.common.faces.application.FacesMessageUtil; /** * @author shinsuke @@ -242,6 +246,38 @@ } protected File getPageFile(String pageName) { + File dataDir = getDataDir(); + return new File(dataDir, pageName + WikiConstants.DATA_SUFFIX); + } + + public List getPages() { + ArrayList list = new ArrayList(); + File dataDir = getDataDir(); + + File[] files = dataDir.listFiles(); + for (int i = 0; i < files.length; i++) { + String filename = files[i].getName(); + if (log.isDebugEnabled()) { + log.debug("getPages() - filename=" + filename); + } + + if (filename != null + && filename.lastIndexOf(WikiConstants.DATA_SUFFIX) >= 0) { + WikiPage page = new WikiPage(); + page.setFile(files[i]); + page.setPageName(filename.substring(0, filename.length() + - WikiConstants.DATA_SUFFIX.length())); + page.setUpdated(new Date(files[i].lastModified())); + list.add(page); + } + + } + //TODO sort? + + return list; + } + + protected File getDataDir() { String dataDirName = WikiUtil.getWikiDataDir(); File dataDir = new File(dataDirName); if (!dataDir.exists()) { @@ -253,7 +289,7 @@ log.debug("Created directory: " + dataDirName); } } - return new File(dataDir, pageName + WikiConstants.DATA_SUFFIX); + return dataDir; } protected void setCurrentPageNameToSession(String pageName) { From shinsuke ＠ users.sourceforge.jp Fri Feb 2 07:30:24 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Fri, 2 Feb 2007 07:30:24 +0900 Subject: [pal-cvs 2066] CVS-Update: wiki/src/main/java/jp/sf/pal/wiki/web/viewer committed by shinsuke Message-ID: <20070201223024.E2E0E2AC19B@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/java/jp/sf/pal/wiki/web/viewer In directory sf-cvs:/tmp/cvs-serv11495/src/main/java/jp/sf/pal/wiki/web/viewer Modified Files: CreateNewContentPage.java CreateNewNamePage.java EditContentPage.java Added Files: DisplayListPage.java Log Message: added list page. supported WikiName. wiki/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewContentPage.java 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewContentPage.java.diff?r1=1.2&r2=1.3 wiki/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewNamePage.java 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewNamePage.java.diff?r1=1.2&r2=1.3 wiki/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayListPage.java NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayListPage.java?rev=1.1&content-type=text/vnd.viewcvs-markup wiki/src/main/java/jp/sf/pal/wiki/web/viewer/EditContentPage.java 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/java/jp/sf/pal/wiki/web/viewer/EditContentPage.java.diff?r1=1.2&r2=1.3 =================================================================== RCS file: wiki/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewContentPage.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CreateNewContentPage.java 2007/01/27 15:38:33 1.2 +++ CreateNewContentPage.java 2007/02/01 22:30:24 1.3 @@ -23,7 +23,7 @@ import org.seasar.framework.container.S2Container; -import com.marevol.utils.faces.application.FacesMessageUtil; +import jp.sf.pal.common.faces.application.FacesMessageUtil; /** * @author shinsuke =================================================================== RCS file: wiki/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewNamePage.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CreateNewNamePage.java 2007/01/27 15:38:33 1.2 +++ CreateNewNamePage.java 2007/02/01 22:30:24 1.3 @@ -20,7 +20,7 @@ import org.seasar.framework.container.S2Container; -import com.marevol.utils.faces.application.FacesMessageUtil; +import jp.sf.pal.common.faces.application.FacesMessageUtil; /** * @author shinsuke =================================================================== RCS file: wiki/src/main/java/jp/sf/pal/wiki/web/viewer/EditContentPage.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- EditContentPage.java 2007/01/27 15:38:33 1.2 +++ EditContentPage.java 2007/02/01 22:30:24 1.3 @@ -23,7 +23,7 @@ import org.seasar.framework.container.S2Container; -import com.marevol.utils.faces.application.FacesMessageUtil; +import jp.sf.pal.common.faces.application.FacesMessageUtil; /** * @author shinsuke From shinsuke ＠ users.sourceforge.jp Fri Feb 2 07:30:25 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Fri, 2 Feb 2007 07:30:25 +0900 Subject: [pal-cvs 2067] CVS-Update: wiki/src/main/resources committed by shinsuke Message-ID: <20070201223025.0D8F02AC198@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/resources In directory sf-cvs:/tmp/cvs-serv11495/src/main/resources Modified Files: streamconverter.dicon teedaErrorPage.dicon Log Message: added list page. supported WikiName. wiki/src/main/resources/streamconverter.dicon 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/streamconverter.dicon.diff?r1=1.2&r2=1.3 wiki/src/main/resources/teedaErrorPage.dicon 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/teedaErrorPage.dicon.diff?r1=1.2&r2=1.3 =================================================================== RCS file: wiki/src/main/resources/streamconverter.dicon,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- streamconverter.dicon 2007/01/27 15:38:33 1.2 +++ streamconverter.dicon 2007/02/01 22:30:24 1.3 @@ -8,6 +8,7 @@ ConvertListValve, ConvertNumberListValve, ConvertPageLinkValve, +ConvertPageNameLinkValve, ConvertPreValve, ConvertTableValve, ConvertLineBreakValve } @@ -19,6 +20,8 @@ + + =================================================================== RCS file: wiki/src/main/resources/teedaErrorPage.dicon,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- teedaErrorPage.dicon 2007/01/27 15:38:33 1.2 +++ teedaErrorPage.dicon 2007/02/01 22:30:24 1.3 @@ -4,9 +4,11 @@ + From shinsuke ＠ users.sourceforge.jp Fri Feb 2 07:30:25 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Fri, 2 Feb 2007 07:30:25 +0900 Subject: [pal-cvs 2068] CVS-Update: wiki/src/main/webapp/view/viewer committed by shinsuke Message-ID: <20070201223025.2C70E2AC19B@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/webapp/view/viewer In directory sf-cvs:/tmp/cvs-serv11495/src/main/webapp/view/viewer Modified Files: displayContent.html Added Files: displayList.html Log Message: added list page. supported WikiName. wiki/src/main/webapp/view/viewer/displayContent.html 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/webapp/view/viewer/displayContent.html.diff?r1=1.2&r2=1.3 wiki/src/main/webapp/view/viewer/displayList.html NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/webapp/view/viewer/displayList.html?rev=1.1&content-type=text/vnd.viewcvs-markup =================================================================== RCS file: wiki/src/main/webapp/view/viewer/displayContent.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- displayContent.html 2007/01/27 15:38:34 1.2 +++ displayContent.html 2007/02/01 22:30:25 1.3 @@ -11,10 +11,13 @@ +
- New + New - Edit + Edit + + List
From shinsuke ＠ users.sourceforge.jp Sat Feb 3 07:07:26 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 3 Feb 2007 07:07:26 +0900 Subject: [pal-cvs 2069] CVS-Update: wiki/src/main/resources committed by shinsuke Message-ID: <20070202220726.C1A872AC201@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/resources In directory sf-cvs:/tmp/cvs-serv22421/src/main/resources Modified Files: streamconverter.dicon Log Message: changed order wiki/src/main/resources/streamconverter.dicon 1.3 -> 1.4 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/streamconverter.dicon.diff?r1=1.3&r2=1.4 =================================================================== RCS file: wiki/src/main/resources/streamconverter.dicon,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- streamconverter.dicon 2007/02/01 22:30:24 1.3 +++ streamconverter.dicon 2007/02/02 22:07:26 1.4 @@ -7,8 +7,8 @@ {ConvertBlockQuotationValve, ConvertListValve, ConvertNumberListValve, -ConvertPageLinkValve, ConvertPageNameLinkValve, +ConvertPageLinkValve, ConvertPreValve, ConvertTableValve, ConvertLineBreakValve } From shinsuke ＠ users.sourceforge.jp Sun Feb 11 07:41:13 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Feb 2007 07:41:13 +0900 Subject: [pal-cvs 2070] CVS-Update: libraries/portletoutputoptimizer/src/main/java/jp/sf/pal/pooptimizer committed by shinsuke Message-ID: <20070210224113.A7B892AC039@users.sourceforge.jp> Update of /cvsroot/pal/libraries/portletoutputoptimizer/src/main/java/jp/sf/pal/pooptimizer In directory sf-cvs:/tmp/cvs-serv629/src/main/java/jp/sf/pal/pooptimizer Modified Files: OptimizerFilter.java Log Message: replaced writer with stream libraries/portletoutputoptimizer/src/main/java/jp/sf/pal/pooptimizer/OptimizerFilter.java 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/libraries/portletoutputoptimizer/src/main/java/jp/sf/pal/pooptimizer/OptimizerFilter.java.diff?r1=1.2&r2=1.3 =================================================================== RCS file: libraries/portletoutputoptimizer/src/main/java/jp/sf/pal/pooptimizer/OptimizerFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OptimizerFilter.java 2007/01/27 15:22:00 1.2 +++ OptimizerFilter.java 2007/02/10 22:41:13 1.3 @@ -15,7 +15,7 @@ */ package jp.sf.pal.pooptimizer; -import java.io.BufferedWriter; +import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; @@ -44,7 +44,11 @@ */ private static final Log log = LogFactory.getLog(OptimizerFilter.class); - private static final int BLOCK_SIZE = 4096; + private static final int DEFAULT_BLOCK_SIZE = 4096; + + private static final String BLOCK_SIZE_KEY = "block-size"; + + private int blockSize = DEFAULT_BLOCK_SIZE; /* * (non-Javadoc) @@ -61,7 +65,14 @@ * @see org.apache.portals.bridges.portletfilter.PortletFilter#init(org.apache.portals.bridges.portletfilter.PortletFilterConfig) */ public void init(PortletFilterConfig config) throws PortletException { - + String blockSizeStr = config.getInitParameter(BLOCK_SIZE_KEY); + if (blockSizeStr != null) { + try { + blockSize = Integer.parseInt(blockSizeStr); + } catch (NumberFormatException e) { + log.warn("Could not parse " + blockSizeStr, e); + } + } } /* @@ -112,36 +123,44 @@ bufferedResponseStream.commit(); InputStream reader = bufferedResponseStream.getInputStream(); - BufferedWriter writer = new BufferedWriter(bufferedResponseStream - .getWriter()); + BufferedOutputStream outputStream = new BufferedOutputStream( + bufferedResponseStream.getOutputStream()); - byte[] bytes = new byte[BLOCK_SIZE]; + byte[] bytes = new byte[blockSize]; try { int length = reader.read(bytes); if (length != -1) { - String str = new String(bytes, 0, length, - bufferedResponseStream.getEncoding()); + String str = new String(bytes, 0, length, "ISO-8859-1"); int beginBodyIndex = str.indexOf("= 0) { - str = str.substring(beginBodyIndex).replaceFirst( - "]*>", ""); + int beginBodyIndexEnd = str + .indexOf(">", beginBodyIndex); int endBodyIndex = str.indexOf("= 0) { - writer.write(str.substring(0, endBodyIndex)); + if (endBodyIndex == -1) { + endBodyIndex = str.indexOf(" beginBodyIndex) { + outputStream.write(bytes, beginBodyIndexEnd + 1, + endBodyIndex - beginBodyIndexEnd - 1); } else { + outputStream.write(bytes, beginBodyIndexEnd + 1, + length - beginBodyIndexEnd - 1); length = reader.read(bytes); while (length != -1) { - str = new String(bytes, 0, length, - bufferedResponseStream.getEncoding()); + str = new String(bytes, 0, length, "ISO-8859-1"); endBodyIndex = str.indexOf("= 0) { - writer - .write(str.substring(0, - endBodyIndex)); + outputStream.write(bytes, 0, endBodyIndex); break; } else { - if (length != 0) { - writer.write(str); + if (length > 0) { + outputStream.write(bytes, 0, length); } length = reader.read(bytes); } @@ -149,20 +168,20 @@ } } else { if (length != -1) { - writer.write(str); + outputStream.write(bytes, 0, length); } length = reader.read(bytes); while (length != -1) { str = new String(bytes, 0, length, bufferedResponseStream.getEncoding()); - if (length != 0) { - writer.write(str); + if (length > 0) { + outputStream.write(bytes, 0, length); } length = reader.read(bytes); } } } - writer.flush(); + outputStream.flush(); } finally { bytes = null; } From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:40 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:40 +0900 Subject: [pal-cvs 2071] CVS-Update: weather/target/test-classes, NONE, NONE committed by karma Message-ID: <20070213074540.CDF262AC06B@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/test-classes In directory sf-cvs:/tmp/cvs-serv32092/target/test-classes Log Message: Directory /cvsroot/pal/weather/target/test-classes added to the repository From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:40 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:40 +0900 Subject: [pal-cvs 2072] CVS-Update: weather/target/test-reports, NONE, NONE committed by karma Message-ID: <20070213074540.F21982AC0A1@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/test-reports In directory sf-cvs:/tmp/cvs-serv32092/target/test-reports Log Message: Directory /cvsroot/pal/weather/target/test-reports added to the repository From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:41 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:41 +0900 Subject: [pal-cvs 2073] CVS-Update: weather/target/weather/WEB-INF/tld, NONE, NONE committed by karma Message-ID: <20070213074541.244652AC0AC@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/weather/WEB-INF/tld In directory sf-cvs:/tmp/cvs-serv32092/target/weather/WEB-INF/tld Log Message: Directory /cvsroot/pal/weather/target/weather/WEB-INF/tld added to the repository From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:43 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:43 +0900 Subject: [pal-cvs 2074] CVS-Update: weather/src/java/jp/sf/pal/weather/resources committed by karma Message-ID: <20070213074543.709AC2AC06B@users.sourceforge.jp> Update of /cvsroot/pal/weather/src/java/jp/sf/pal/weather/resources In directory sf-cvs:/tmp/cvs-serv32130/src/java/jp/sf/pal/weather/resources Modified Files: WeatherResources.properties WeatherResources_ja.properties Log Message: 概況の表示，非表示の選択を可能にした． weather/src/java/jp/sf/pal/weather/resources/WeatherResources.properties 1.5 -> 1.6 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/java/jp/sf/pal/weather/resources/WeatherResources.properties.diff?r1=1.5&r2=1.6 weather/src/java/jp/sf/pal/weather/resources/WeatherResources_ja.properties 1.6 -> 1.7 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/java/jp/sf/pal/weather/resources/WeatherResources_ja.properties.diff?r1=1.6&r2=1.7 =================================================================== RCS file: weather/src/java/jp/sf/pal/weather/resources/WeatherResources.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- WeatherResources.properties 2006/08/02 12:50:34 1.5 +++ WeatherResources.properties 2007/02/13 07:45:43 1.6 @@ -26,3 +26,5 @@ weather.label.EditDispDay=Display weather.label.Today=Today's Weather weather.label.Tomorrow=Tomorrow's Weather +weather.label.DayAfterTomorrow=The Day After Tomorrow's Weather +weather.label.Description=Display Overview \ No newline at end of file =================================================================== RCS file: weather/src/java/jp/sf/pal/weather/resources/WeatherResources_ja.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- WeatherResources_ja.properties 2006/08/02 12:50:34 1.6 +++ WeatherResources_ja.properties 2007/02/13 07:45:43 1.7 @@ -30,6 +30,8 @@ #edit.jsp weather.label.EditSubmit=\u8a2d\u5b9a -weather.label.EditDispDay=\u8868\u793a +weather.label.EditDispDay=\u5929\u6c17\u306e\u8868\u793a weather.label.Today=\u4eca\u65e5\u306e\u5929\u6c17 -weather.label.Tomorrow=\u660e\u65e5\u306e\u5929\u6c17 \ No newline at end of file +weather.label.Tomorrow=\u660e\u65e5\u306e\u5929\u6c17 +weather.label.DayAfterTomorrow=\u3042\u3055\u3063\u3066\u306e\u5929\u6c17 +weather.label.Description=\u6982\u6cc1\u306e\u8868\u793a \ No newline at end of file From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:43 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:43 +0900 Subject: [pal-cvs 2075] CVS-Update: weather committed by karma Message-ID: <20070213074543.8E3CD2AC0D3@users.sourceforge.jp> Update of /cvsroot/pal/weather In directory sf-cvs:/tmp/cvs-serv32130 Modified Files: CHANGES.ja Log Message: 概況の表示，非表示の選択を可能にした． weather/CHANGES.ja 1.3 -> 1.4 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/CHANGES.ja.diff?r1=1.3&r2=1.4 =================================================================== RCS file: weather/CHANGES.ja,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CHANGES.ja 2006/08/02 12:50:34 1.3 +++ CHANGES.ja 2007/02/13 07:45:43 1.4 @@ -1,4 +1,8 @@ -Version 0.3 - +Version 0.4 - +=========================== +- 概況の表示，非表示を選べるようにした． + +Version 0.3 - 2006-08-16 =========================== - 今日と明日の天気を同時に表示可能とした． - 最高，最低気温の表示を追加した． From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:43 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:43 +0900 Subject: [pal-cvs 2076] CVS-Update: weather/target/weather/WEB-INF/view committed by karma Message-ID: <20070213074543.B63562AC06B@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/weather/WEB-INF/view In directory sf-cvs:/tmp/cvs-serv32130/target/weather/WEB-INF/view Added Files: edit.jsp weather.jsp Log Message: 概況の表示，非表示の選択を可能にした． weather/target/weather/WEB-INF/view/edit.jsp 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/view/edit.jsp.diff?r1=1.2&r2=1.3 weather/target/weather/WEB-INF/view/weather.jsp 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/view/weather.jsp.diff?r1=1.2&r2=1.3 =================================================================== RCS file: weather/target/weather/WEB-INF/view/edit.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- edit.jsp 2006/05/25 05:12:58 1.2 +++ edit.jsp 2007/02/13 07:45:43 1.3 @@ -47,6 +47,16 @@ + : + + > + + > + + + "> =================================================================== RCS file: weather/target/weather/WEB-INF/view/weather.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:43 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:43 +0900 Subject: [pal-cvs 2077] CVS-Update: weather/src/webapp/WEB-INF/view committed by karma Message-ID: <20070213074543.D2F752AC0FF@users.sourceforge.jp> Update of /cvsroot/pal/weather/src/webapp/WEB-INF/view In directory sf-cvs:/tmp/cvs-serv32130/src/webapp/WEB-INF/view Modified Files: weather.jsp edit.jsp Log Message: 概況の表示，非表示の選択を可能にした． weather/src/webapp/WEB-INF/view/weather.jsp 1.4 -> 1.5 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/webapp/WEB-INF/view/weather.jsp.diff?r1=1.4&r2=1.5 weather/src/webapp/WEB-INF/view/edit.jsp 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/webapp/WEB-INF/view/edit.jsp.diff?r1=1.2&r2=1.3 =================================================================== RCS file: weather/src/webapp/WEB-INF/view/weather.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- weather.jsp 2006/08/02 12:50:34 1.4 +++ weather.jsp 2007/02/13 07:45:43 1.5 @@ -62,7 +62,11 @@ : - + +<% + Boolean isDisplayDescription = (Boolean)renderRequest.getAttribute("description") ; + if (isDisplayDescription.booleanValue()) { +%> : @@ -70,6 +74,9 @@ +<% + } +%> " style="font-size:x-small"> =================================================================== RCS file: weather/src/webapp/WEB-INF/view/edit.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- edit.jsp 2006/05/25 05:09:21 1.2 +++ edit.jsp 2007/02/13 07:45:43 1.3 @@ -21,9 +21,9 @@
- +
- + - + + + +
::
:: > +
: > - +
> - +
+ > +
From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:44 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:44 +0900 Subject: [pal-cvs 2078] CVS-Update: weather/target/weather/WEB-INF/lib committed by karma Message-ID: <20070213074544.06A362AC06B@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/weather/WEB-INF/lib In directory sf-cvs:/tmp/cvs-serv32130/target/weather/WEB-INF/lib Added Files: jstl-1.0.2.jar standard-1.0.4.jar Log Message: 概況の表示，非表示の選択を可能にした． weather/target/weather/WEB-INF/lib/jstl-1.0.2.jar 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/lib/jstl-1.0.2.jar.diff?r1=1.2&r2=1.3 weather/target/weather/WEB-INF/lib/standard-1.0.4.jar 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/lib/standard-1.0.4.jar.diff?r1=1.2&r2=1.3 =================================================================== RCS file: weather/target/weather/WEB-INF/lib/jstl-1.0.2.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 =================================================================== RCS file: weather/target/weather/WEB-INF/lib/standard-1.0.4.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:44 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:44 +0900 Subject: [pal-cvs 2079] CVS-Update: weather/src/java/jp/sf/pal/weather committed by karma Message-ID: <20070213074544.2DA862AC0D3@users.sourceforge.jp> Update of /cvsroot/pal/weather/src/java/jp/sf/pal/weather In directory sf-cvs:/tmp/cvs-serv32130/src/java/jp/sf/pal/weather Modified Files: WeatherPortlet.java Log Message: 概況の表示，非表示の選択を可能にした． weather/src/java/jp/sf/pal/weather/WeatherPortlet.java 1.10 -> 1.11 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/java/jp/sf/pal/weather/WeatherPortlet.java.diff?r1=1.10&r2=1.11 =================================================================== RCS file: weather/src/java/jp/sf/pal/weather/WeatherPortlet.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- WeatherPortlet.java 2006/06/28 07:55:21 1.10 +++ WeatherPortlet.java 2007/02/13 07:45:44 1.11 @@ -47,6 +47,12 @@ /** Attribute Name of Tomorrow's Weather */ public static final String TOMORROW_WEATHER_ATTR_NAME = "tomorrowweather" ; + /** Parameter Name of The Day After Tomorror (checkbox) */ + public static final String DAYAFTERTOMORROW_ATTR_NAME = "dayaftertomorrow"; + + /** Parameter Name of Description Display Mode (checkbox) */ + public static final String DESCRIPTIONDISPMODE_ATTR_NAME = "description"; + // // Parameter Name // @@ -59,6 +65,12 @@ /** Parameter Name of Tomorrow (checkbox) */ public static final String TOMORROW_PARAM_NAME = "tomorrow" ; + /** Parameter Name of The Day After Tomorror (checkbox) */ + public static final String DAYAFTERTOMORROW_PARAM_NAME = "dayaftertomorrow"; + + /** Parameter Name of Description Display Mode (checkbox) */ + public static final String DESCRIPTIONDISPMODE_PARAM_NAME = "description"; + // // Parameter Value // @@ -68,6 +80,9 @@ /** Parameter Value of Today/Tomorrow Checkbox */ public static final String DAY_PARAM_ON_VALUE = "on" ; + /** Parameter Value of Overview display mode checkbox */ + public static final String DESCRIPTIONDISPMODE_ON_VALUE = "on"; + // // JSP File Path // @@ -146,6 +161,11 @@ request.setAttribute(CITYMAP_ATTR_NAME, cityMap) ; request.setAttribute(CITYID_ATTR_NAME, id) ; + // 概況を表示する or しない + boolean isDispOverview + = prefs.getValue(DESCRIPTIONDISPMODE_PARAM_NAME, null).equals(DESCRIPTIONDISPMODE_ON_VALUE); + request.setAttribute(DESCRIPTIONDISPMODE_ATTR_NAME, new Boolean(isDispOverview)); + // inclde JSP PortletRequestDispatcher rd = null ; if (!(dispToday && dispTomorrow)) { @@ -192,10 +212,12 @@ private void processActionForEdit(ActionRequest request, ActionResponse response) throws PortletException, IOException { - // 天気を表示したい都市のidの取得 + // parameterの取得 String id = request.getParameter(CITY_PARAM_NAME); String today = request.getParameter(TODAY_PARAM_NAME) ; String tomorrow = request.getParameter(TOMORROW_PARAM_NAME) ; + String dayaftertomorrow = request.getParameter(DAYAFTERTOMORROW_PARAM_NAME); + String descriptionDisplayMode = request.getParameter(DESCRIPTIONDISPMODE_PARAM_NAME); // PortletPreferencesの取得 PortletPreferences prefs = request.getPreferences() ; @@ -205,7 +227,7 @@ id = prefs.getValue(CITY_PARAM_NAME, null) ; } - // チェックボックスに全くチェックがない場合 + // チェックボックスにチェックがない場合 if (today == null && tomorrow == null) { return ; } @@ -218,10 +240,20 @@ tomorrow = "" ; } + if (dayaftertomorrow == null) { + dayaftertomorrow = ""; + } + + if (descriptionDisplayMode == null) { + descriptionDisplayMode = ""; + } + // パラメータのセット prefs.setValue(CITY_PARAM_NAME, id) ; prefs.setValue(TODAY_PARAM_NAME, today) ; prefs.setValue(TOMORROW_PARAM_NAME, tomorrow) ; + prefs.setValue(DAYAFTERTOMORROW_PARAM_NAME, dayaftertomorrow); + prefs.setValue(DESCRIPTIONDISPMODE_PARAM_NAME, descriptionDisplayMode); prefs.store() ; } @@ -240,6 +272,8 @@ String id = prefs.getValue(CITY_PARAM_NAME, null) ; String today = prefs.getValue(TODAY_PARAM_NAME, null) ; String tomorrow = prefs.getValue(TOMORROW_PARAM_NAME, null) ; + String dayaftertomorrow = prefs.getValue(DAYAFTERTOMORROW_PARAM_NAME, null); + String descriptionDisplayMode = prefs.getValue(DESCRIPTIONDISPMODE_PARAM_NAME, null); // WebService から都市Mapを取得 WeatherWebService webService = new WeatherWebService() ; @@ -250,6 +284,10 @@ request.setAttribute(CITYID_ATTR_NAME, id) ; request.setAttribute(TODAY_PARAM_NAME, today.equals("on") ? "checked" : "") ; request.setAttribute(TOMORROW_PARAM_NAME, tomorrow.equals("on") ? "checked" : "") ; + request.setAttribute(DAYAFTERTOMORROW_PARAM_NAME, + dayaftertomorrow.equals("on") ? "checked" : "") ; + request.setAttribute(DESCRIPTIONDISPMODE_PARAM_NAME, + descriptionDisplayMode.equals("on") ? "checked" : "") ; // inclde JSP PortletRequestDispatcher rd = context.getRequestDispatcher(EDIT_MODE_JSP_PATH) ; From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:44 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:44 +0900 Subject: [pal-cvs 2080] CVS-Update: weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources committed by karma Message-ID: <20070213074544.6B4F92AC0D3@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources In directory sf-cvs:/tmp/cvs-serv32130/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources Added Files: WeatherResources_ja.properties WeatherResources.properties Log Message: 概況の表示，非表示の選択を可能にした． weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources_ja.properties 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources_ja.properties.diff?r1=1.2&r2=1.3 weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources.properties 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources.properties.diff?r1=1.2&r2=1.3 =================================================================== RCS file: weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources_ja.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 =================================================================== RCS file: weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 From karma ＠ users.sourceforge.jp Tue Feb 13 16:45:44 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 16:45:44 +0900 Subject: [pal-cvs 2081] CVS-Update: weather/target/weather/WEB-INF committed by karma Message-ID: <20070213074544.4E2F12AC06B@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/weather/WEB-INF In directory sf-cvs:/tmp/cvs-serv32130/target/weather/WEB-INF Added Files: portlet.xml web.xml Log Message: 概況の表示，非表示の選択を可能にした． weather/target/weather/WEB-INF/portlet.xml 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/portlet.xml.diff?r1=1.2&r2=1.3 weather/target/weather/WEB-INF/web.xml 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/web.xml.diff?r1=1.2&r2=1.3 =================================================================== RCS file: weather/target/weather/WEB-INF/portlet.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- portlet.xml 2006/05/25 05:12:58 1.2 +++ portlet.xml 2007/02/13 07:45:44 1.3 @@ -40,6 +40,14 @@ city 81 + + today + on + + + tomorrow + + =================================================================== RCS file: weather/target/weather/WEB-INF/web.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 From karma ＠ users.sourceforge.jp Tue Feb 13 17:02:58 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 17:02:58 +0900 Subject: [pal-cvs 2082] CVS-Update: weather/target/weather/WEB-INF committed by karma Message-ID: <20070213080258.EEC872AC06B@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/weather/WEB-INF In directory sf-cvs:/tmp/cvs-serv9772/weather/WEB-INF Removed Files: portlet.xml web.xml Log Message: weather/target/weather/WEB-INF/portlet.xml 1.3 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/portlet.xml?rev=1.3&content-type=text/vnd.viewcvs-markup weather/target/weather/WEB-INF/web.xml 1.3 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/web.xml?rev=1.3&content-type=text/vnd.viewcvs-markup From karma ＠ users.sourceforge.jp Tue Feb 13 17:02:59 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 17:02:59 +0900 Subject: [pal-cvs 2083] CVS-Update: weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources committed by karma Message-ID: <20070213080259.21AC32AC0A1@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources In directory sf-cvs:/tmp/cvs-serv9772/weather/WEB-INF/classes/jp/sf/pal/weather/resources Removed Files: WeatherResources.properties WeatherResources_ja.properties Log Message: weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources.properties 1.3 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources.properties?rev=1.3&content-type=text/vnd.viewcvs-markup weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources_ja.properties 1.3 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/classes/jp/sf/pal/weather/resources/WeatherResources_ja.properties?rev=1.3&content-type=text/vnd.viewcvs-markup From karma ＠ users.sourceforge.jp Tue Feb 13 17:02:59 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 17:02:59 +0900 Subject: [pal-cvs 2084] CVS-Update: weather/target/weather/WEB-INF/lib committed by karma Message-ID: <20070213080259.4519C2AC06B@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/weather/WEB-INF/lib In directory sf-cvs:/tmp/cvs-serv9772/weather/WEB-INF/lib Removed Files: jstl-1.0.2.jar standard-1.0.4.jar Log Message: weather/target/weather/WEB-INF/lib/jstl-1.0.2.jar 1.3 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/lib/jstl-1.0.2.jar?rev=1.3&content-type=text/vnd.viewcvs-markup weather/target/weather/WEB-INF/lib/standard-1.0.4.jar 1.3 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/lib/standard-1.0.4.jar?rev=1.3&content-type=text/vnd.viewcvs-markup From karma ＠ users.sourceforge.jp Tue Feb 13 17:02:59 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 17:02:59 +0900 Subject: [pal-cvs 2085] CVS-Update: weather/target/weather/WEB-INF/view committed by karma Message-ID: <20070213080259.6EC512AC0A1@users.sourceforge.jp> Update of /cvsroot/pal/weather/target/weather/WEB-INF/view In directory sf-cvs:/tmp/cvs-serv9772/weather/WEB-INF/view Removed Files: edit.jsp weather.jsp Log Message: weather/target/weather/WEB-INF/view/edit.jsp 1.3 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/view/edit.jsp?rev=1.3&content-type=text/vnd.viewcvs-markup weather/target/weather/WEB-INF/view/weather.jsp 1.3 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/target/weather/WEB-INF/view/weather.jsp?rev=1.3&content-type=text/vnd.viewcvs-markup From karma ＠ users.sourceforge.jp Tue Feb 13 21:51:19 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 21:51:19 +0900 Subject: [pal-cvs 2086] CVS-Update: weather committed by karma Message-ID: <20070213125119.EEC492AC03D@users.sourceforge.jp> Update of /cvsroot/pal/weather In directory sf-cvs:/tmp/cvs-serv18106 Modified Files: CHANGES.ja Log Message: 3日分の天気を表示可能とした．jspファイルを一本化した． weather/CHANGES.ja 1.4 -> 1.5 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/CHANGES.ja.diff?r1=1.4&r2=1.5 =================================================================== RCS file: weather/CHANGES.ja,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- CHANGES.ja 2007/02/13 07:45:43 1.4 +++ CHANGES.ja 2007/02/13 12:51:19 1.5 @@ -1,6 +1,7 @@ Version 0.4 - =========================== - 概況の表示，非表示を選べるようにした． +- 3 日分の天気を表示可能にした． Version 0.3 - 2006-08-16 =========================== From karma ＠ users.sourceforge.jp Tue Feb 13 21:51:20 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 21:51:20 +0900 Subject: [pal-cvs 2087] CVS-Update: weather/src/webapp/WEB-INF committed by karma Message-ID: <20070213125120.2087B2AC087@users.sourceforge.jp> Update of /cvsroot/pal/weather/src/webapp/WEB-INF In directory sf-cvs:/tmp/cvs-serv18106/src/webapp/WEB-INF Modified Files: portlet.xml Log Message: 3日分の天気を表示可能とした．jspファイルを一本化した． weather/src/webapp/WEB-INF/portlet.xml 1.4 -> 1.5 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/webapp/WEB-INF/portlet.xml.diff?r1=1.4&r2=1.5 =================================================================== RCS file: weather/src/webapp/WEB-INF/portlet.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- portlet.xml 2006/05/25 05:09:21 1.4 +++ portlet.xml 2007/02/13 12:51:20 1.5 @@ -48,6 +48,14 @@ tomorrow + + dayaftertomorrow + + + + description + + From karma ＠ users.sourceforge.jp Tue Feb 13 21:51:20 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 21:51:20 +0900 Subject: [pal-cvs 2088] CVS-Update: weather/src/webapp/WEB-INF/view committed by karma Message-ID: <20070213125120.3E9312AC03D@users.sourceforge.jp> Update of /cvsroot/pal/weather/src/webapp/WEB-INF/view In directory sf-cvs:/tmp/cvs-serv18106/src/webapp/WEB-INF/view Modified Files: weather.jsp Removed Files: twodaysview.jsp Log Message: 3日分の天気を表示可能とした．jspファイルを一本化した． weather/src/webapp/WEB-INF/view/weather.jsp 1.5 -> 1.6 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/webapp/WEB-INF/view/weather.jsp.diff?r1=1.5&r2=1.6 weather/src/webapp/WEB-INF/view/twodaysview.jsp 1.2 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/webapp/WEB-INF/view/twodaysview.jsp?rev=1.2&content-type=text/vnd.viewcvs-markup =================================================================== RCS file: weather/src/webapp/WEB-INF/view/weather.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- weather.jsp 2007/02/13 07:45:43 1.5 +++ weather.jsp 2007/02/13 12:51:20 1.6 @@ -16,7 +16,9 @@ <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> <%@ page import="java.util.*"%> - + + + @@ -24,8 +26,10 @@ @@ -33,45 +37,104 @@ - - - - - - <% - Boolean isDisplayDescription = (Boolean)renderRequest.getAttribute("description") ; - if (isDisplayDescription.booleanValue()) { + Boolean isDescription = (Boolean)renderRequest.getAttribute("description") ; + if (isDescription.booleanValue()) { %> <% @@ -79,8 +142,8 @@ %> From karma ＠ users.sourceforge.jp Tue Feb 13 21:51:20 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Tue, 13 Feb 2007 21:51:20 +0900 Subject: [pal-cvs 2089] CVS-Update: weather/src/java/jp/sf/pal/weather committed by karma Message-ID: <20070213125120.5BD542AC087@users.sourceforge.jp> Update of /cvsroot/pal/weather/src/java/jp/sf/pal/weather In directory sf-cvs:/tmp/cvs-serv18106/src/java/jp/sf/pal/weather Modified Files: WeatherPortlet.java Log Message: 3日分の天気を表示可能とした．jspファイルを一本化した． weather/src/java/jp/sf/pal/weather/WeatherPortlet.java 1.11 -> 1.12 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/java/jp/sf/pal/weather/WeatherPortlet.java.diff?r1=1.11&r2=1.12 =================================================================== RCS file: weather/src/java/jp/sf/pal/weather/WeatherPortlet.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- WeatherPortlet.java 2007/02/13 07:45:44 1.11 +++ WeatherPortlet.java 2007/02/13 12:51:20 1.12 @@ -48,11 +48,15 @@ public static final String TOMORROW_WEATHER_ATTR_NAME = "tomorrowweather" ; /** Parameter Name of The Day After Tomorror (checkbox) */ - public static final String DAYAFTERTOMORROW_ATTR_NAME = "dayaftertomorrow"; + public static final String DAYAFTERTOMORROW_WEATHER_ATTR_NAME = "dayaftertomorrowweather"; /** Parameter Name of Description Display Mode (checkbox) */ public static final String DESCRIPTIONDISPMODE_ATTR_NAME = "description"; + public static final String IS_TODAY_WEATHER_DISPLAYED_ATTR_NAME = "istodaydisplay"; + public static final String IS_TOMORROW_WEATHER_DISPLAYED_ATTR_NAME = "istomorrowdisplay"; + public static final String IS_DAYAFTERTOMORROW_WEATHER_DISPLAYED_ATTR_NAME = "isdayaftertomorrowdisplay"; + // // Parameter Name // @@ -128,36 +132,46 @@ Weather today_weather = null ; boolean dispToday = prefs.getValue(TODAY_PARAM_NAME, null).equals(DAY_PARAM_ON_VALUE) ; + request.setAttribute(IS_TODAY_WEATHER_DISPLAYED_ATTR_NAME, new Boolean(dispToday)); if (dispToday) { WeatherWebService todayService = new WeatherWebService(id); todayService.setDay(TODAY_PARAM_NAME) ; today_weather = todayService.getWeather() ; + request.setAttribute(TODAY_WEATHER_ATTR_NAME, today_weather); } // 明日の天気の取得 Weather tomorrow_weather = null ; boolean dispTomorrow = prefs.getValue(TOMORROW_PARAM_NAME, null).equals(DAY_PARAM_ON_VALUE) ; + request.setAttribute(IS_TOMORROW_WEATHER_DISPLAYED_ATTR_NAME, new Boolean(dispTomorrow)); if (dispTomorrow) { WeatherWebService tomorrowService = new WeatherWebService(id); tomorrowService.setDay(TOMORROW_PARAM_NAME) ; tomorrow_weather = tomorrowService.getWeather() ; + request.setAttribute(TOMORROW_WEATHER_ATTR_NAME, tomorrow_weather); } - // 天気のセット - if (dispToday && !dispTomorrow) { - request.setAttribute(WEATHER_ATTR_NAME, today_weather); - } - if (!dispToday && dispTomorrow) { - request.setAttribute(WEATHER_ATTR_NAME, tomorrow_weather); - } - if (dispToday && dispTomorrow) { - request.setAttribute(TODAY_WEATHER_ATTR_NAME, today_weather); - request.setAttribute(TOMORROW_WEATHER_ATTR_NAME, tomorrow_weather) ; - } - if (!dispToday && !dispTomorrow) { - // TODO: 今日も明日もチェックされなかったときのエラー処理 + // あさっての天気の取得 + Weather dayaftertomorrow_weather = null ; + boolean dispDayAfterTomorrow + = prefs.getValue(DAYAFTERTOMORROW_PARAM_NAME, null).equals(DAY_PARAM_ON_VALUE); + request.setAttribute(IS_DAYAFTERTOMORROW_WEATHER_DISPLAYED_ATTR_NAME, new Boolean(dispDayAfterTomorrow)); + if (dispDayAfterTomorrow) { + WeatherWebService dayAfterTomorrowService = new WeatherWebService(id); + dayAfterTomorrowService.setDay(DAYAFTERTOMORROW_PARAM_NAME); + dayaftertomorrow_weather = dayAfterTomorrowService.getWeather() ; + request.setAttribute(DAYAFTERTOMORROW_WEATHER_ATTR_NAME, dayaftertomorrow_weather); + } + + if (!dispToday) { + if (dispTomorrow) { + request.setAttribute(TODAY_WEATHER_ATTR_NAME, tomorrow_weather); + } else { + request.setAttribute(TODAY_WEATHER_ATTR_NAME, dayaftertomorrow_weather); + } } + request.setAttribute(CITYMAP_ATTR_NAME, cityMap) ; request.setAttribute(CITYID_ATTR_NAME, id) ; @@ -168,11 +182,7 @@ // inclde JSP PortletRequestDispatcher rd = null ; - if (!(dispToday && dispTomorrow)) { - rd = context.getRequestDispatcher(VIEW_MODE_ONE_DAY_JSP_PATH) ; - } else { - rd = context.getRequestDispatcher(VIEW_MODE_TWO_DAYS_JSP_PATH) ; - } + rd = context.getRequestDispatcher(VIEW_MODE_ONE_DAY_JSP_PATH) ; rd.include(request, response); } From karma ＠ users.sourceforge.jp Wed Feb 14 20:20:32 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Wed, 14 Feb 2007 20:20:32 +0900 Subject: [pal-cvs 2090] CVS-Update: weather/src/java/jp/sf/pal/weather committed by karma Message-ID: <20070214112032.13B252AC114@users.sourceforge.jp> Update of /cvsroot/pal/weather/src/java/jp/sf/pal/weather In directory sf-cvs:/tmp/cvs-serv12450/src/java/jp/sf/pal/weather Modified Files: WeatherPortlet.java Log Message: あさってだけ選択するとエラーになっていたので修正 weather/src/java/jp/sf/pal/weather/WeatherPortlet.java 1.12 -> 1.13 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/java/jp/sf/pal/weather/WeatherPortlet.java.diff?r1=1.12&r2=1.13 =================================================================== RCS file: weather/src/java/jp/sf/pal/weather/WeatherPortlet.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- WeatherPortlet.java 2007/02/13 12:51:20 1.12 +++ WeatherPortlet.java 2007/02/14 11:20:31 1.13 @@ -238,7 +238,7 @@ } // チェックボックスにチェックがない場合 - if (today == null && tomorrow == null) { + if (today == null && tomorrow == null && dayaftertomorrow == null) { return ; } From karma ＠ users.sourceforge.jp Wed Feb 14 20:20:46 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Wed, 14 Feb 2007 20:20:46 +0900 Subject: [pal-cvs 2091] CVS-Update: weather/src/webapp/WEB-INF/view committed by karma Message-ID: <20070214112046.840FF2AC0B4@users.sourceforge.jp> Update of /cvsroot/pal/weather/src/webapp/WEB-INF/view In directory sf-cvs:/tmp/cvs-serv12487/src/webapp/WEB-INF/view Modified Files: weather.jsp Log Message: デザインの調整 weather/src/webapp/WEB-INF/view/weather.jsp 1.6 -> 1.7 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/webapp/WEB-INF/view/weather.jsp.diff?r1=1.6&r2=1.7 =================================================================== RCS file: weather/src/webapp/WEB-INF/view/weather.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- weather.jsp 2007/02/13 12:51:20 1.6 +++ weather.jsp 2007/02/14 11:20:46 1.7 @@ -66,7 +66,7 @@ : -     +
: @@ -90,7 +90,7 @@ : -     +
: @@ -114,7 +114,7 @@ : -     +
: From shinsuke ＠ users.sourceforge.jp Sun Feb 18 17:54:28 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 18 Feb 2007 17:54:28 +0900 Subject: [pal-cvs 2092] CVS-Update: libraries/portletoutputoptimizer committed by shinsuke Message-ID: <20070218085428.41CBB2AC06B@users.sourceforge.jp> Update of /cvsroot/pal/libraries/portletoutputoptimizer In directory sf-cvs:/tmp/cvs-serv30529 Modified Files: pom.xml Log Message: changed to release version libraries/portletoutputoptimizer/pom.xml 1.4 -> 1.5 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/libraries/portletoutputoptimizer/pom.xml.diff?r1=1.4&r2=1.5 =================================================================== RCS file: libraries/portletoutputoptimizer/pom.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pom.xml 2007/01/27 15:21:36 1.4 +++ pom.xml 2007/02/18 08:54:28 1.5 @@ -4,7 +4,7 @@ jp.sf.palportlet-output-optimizerjar - 0.2-SNAPSHOT + 0.2Portlet Output OptimizerFilterPortlet Filter To Rewrite HTML Responsehttp://pal.sourceforge.jp/ From karma ＠ users.sourceforge.jp Mon Feb 26 19:13:16 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Mon, 26 Feb 2007 19:13:16 +0900 Subject: [pal-cvs 2093] CVS-Update: weather/src/webapp/WEB-INF committed by karma Message-ID: <20070226101316.BCBA42AC08D@users.sourceforge.jp> Update of /cvsroot/pal/weather/src/webapp/WEB-INF In directory sf-cvs:/tmp/cvs-serv27129/src/webapp/WEB-INF Modified Files: portlet.xml Log Message: change description weather/src/webapp/WEB-INF/portlet.xml 1.5 -> 1.6 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/webapp/WEB-INF/portlet.xml.diff?r1=1.5&r2=1.6 =================================================================== RCS file: weather/src/webapp/WEB-INF/portlet.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- portlet.xml 2007/02/13 12:51:20 1.5 +++ portlet.xml 2007/02/26 10:13:16 1.6 @@ -12,12 +12,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - + WeatherPortlet Weather Portlet - Display Weather Forecast + Display Japanese Weather Forecast jp.sf.pal.weather.WeatherPortlet 600 From karma ＠ users.sourceforge.jp Mon Feb 26 19:13:52 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Mon, 26 Feb 2007 19:13:52 +0900 Subject: [pal-cvs 2094] CVS-Update: weather committed by karma Message-ID: <20070226101352.CBBAC2AC08D@users.sourceforge.jp> Update of /cvsroot/pal/weather In directory sf-cvs:/tmp/cvs-serv27240 Modified Files: project.properties Log Message: comment maven.repo.remote weather/project.properties 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/project.properties.diff?r1=1.2&r2=1.3 =================================================================== RCS file: weather/project.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project.properties 2006/11/02 14:13:26 1.2 +++ project.properties 2007/02/26 10:13:52 1.3 @@ -26,4 +26,4 @@ maven.compile.encoding=UTF-8 # repo -maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/, http://dist.codehaus.org/, http://people.apache.org/repository/, http://marevol-utils.sourceforge.jp/maven/, http://seasar.sourceforge.jp/maven/, http://www.marevol.com/maven +#maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/, http://dist.codehaus.org/, http://people.apache.org/repository/, http://marevol-utils.sourceforge.jp/maven/, http://seasar.sourceforge.jp/maven/, http://www.marevol.com/maven From karma ＠ users.sourceforge.jp Mon Feb 26 19:20:20 2007 From: karma ＠ users.sourceforge.jp (KATOH Yasufumi) Date: Mon, 26 Feb 2007 19:20:20 +0900 Subject: [pal-cvs 2095] CVS-Update: weather committed by karma Message-ID: <20070226102020.7955E2AC0A2@users.sourceforge.jp> Update of /cvsroot/pal/weather In directory sf-cvs:/tmp/cvs-serv30782 Modified Files: README README.ja Log Message: IEでダウンロードしたときの注釈を入れてみた． weather/README 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/README.diff?r1=1.1.1.1&r2=1.2 weather/README.ja 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/README.ja.diff?r1=1.1.1.1&r2=1.2 =================================================================== RCS file: weather/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- README 2006/04/03 07:59:41 1.1.1.1 +++ README 2007/02/26 10:20:20 1.2 @@ -11,7 +11,10 @@ * How to use 1. Get weather.war file. Or If you get source distribution, you make a war file. -2. Copy war file according to your portal server specification. +2. Copy war file according to your portal server specification.(*) -2006/03/30 +(*) If you download war file using Internet Explorer, war file name is renamed +"weather.war.zip". So you should rename your downloaded file to "weather.war". + +2007/02/26 PAL Project \ No newline at end of file =================================================================== RCS file: weather/README.ja,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- README.ja 2006/04/03 07:59:41 1.1.1.1 +++ README.ja 2007/02/26 10:20:20 1.2 @@ -11,7 +11,10 @@ * 配備方法 1. war ファイル (weather.war) を取得してください．ソースを取得した場合は，war ファイル を作成してください． -2. お使いのポータルサーバの仕様に合わせて，war ファイルの配備を行ってください． +2. お使いのポータルサーバの仕様に合わせて，war ファイルの配備を行ってください．(*) + +(*) war ファイルを Internet Explorer でダウンロードした場合，ファイル名が "weather.war.zip" +となっている場合があります．その場合，"weather.war" とリネームして配備してください． 2006/03/30 PAL Project \ No newline at end of file From shinsuke ＠ users.sourceforge.jp Wed Feb 28 08:08:35 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 28 Feb 2007 08:08:35 +0900 Subject: [pal-cvs 2096] CVS-Update: wiki/src/main/resources committed by shinsuke Message-ID: <20070227230835.5EC152AC02C@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/resources In directory sf-cvs:/tmp/cvs-serv25545/src/main/resources Modified Files: streamconverter.dicon Log Message: added paragraph converter wiki/src/main/resources/streamconverter.dicon 1.4 -> 1.5 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/streamconverter.dicon.diff?r1=1.4&r2=1.5 =================================================================== RCS file: wiki/src/main/resources/streamconverter.dicon,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- streamconverter.dicon 2007/02/02 22:07:26 1.4 +++ streamconverter.dicon 2007/02/27 23:08:34 1.5 @@ -11,7 +11,8 @@ ConvertPageLinkValve, ConvertPreValve, ConvertTableValve, -ConvertLineBreakValve } +ConvertLineBreakValve, +ConvertParagraphValve} @@ -32,4 +33,6 @@ + + From shinsuke ＠ users.sourceforge.jp Wed Feb 28 08:08:50 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 28 Feb 2007 08:08:50 +0900 Subject: [pal-cvs 2097] CVS-Update: wiki/src/main/webapp/WEB-INF/wiki/data committed by shinsuke Message-ID: <20070227230850.619D92AC02C@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/webapp/WEB-INF/wiki/data In directory sf-cvs:/tmp/cvs-serv25582/src/main/webapp/WEB-INF/wiki/data Modified Files: FrontPage.txt Log Message: updated default wiki page wiki/src/main/webapp/WEB-INF/wiki/data/FrontPage.txt 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/webapp/WEB-INF/wiki/data/FrontPage.txt.diff?r1=1.1.1.1&r2=1.2 =================================================================== RCS file: wiki/src/main/webapp/WEB-INF/wiki/data/FrontPage.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- FrontPage.txt 2007/01/04 12:10:44 1.1.1.1 +++ FrontPage.txt 2007/02/27 23:08:50 1.2 @@ -1,5 +1,8 @@ -* Test Message -- span -- span -test -ほげほげ \ No newline at end of file +* Wiki Portlet +This is a portlet to implement wiki on a portlet. +* Features +- Create a new wiki page +- Display wiki pages +* TODO +- many... + From shinsuke ＠ users.sourceforge.jp Wed Feb 28 08:09:57 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 28 Feb 2007 08:09:57 +0900 Subject: [pal-cvs 2098] CVS-Update: wiki/src/main/resources committed by shinsuke Message-ID: <20070227230957.653F52AC0C3@users.sourceforge.jp> Update of /cvsroot/pal/wiki/src/main/resources In directory sf-cvs:/tmp/cvs-serv25735/src/main/resources Modified Files: app_aop.dicon creator.dicon customizer.dicon env.txt s2container.dicon teedaCustomize.dicon Log Message: sync up with teeda 1.0.4 config wiki/src/main/resources/app_aop.dicon 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/app_aop.dicon.diff?r1=1.1.1.1&r2=1.2 wiki/src/main/resources/creator.dicon 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/creator.dicon.diff?r1=1.1.1.1&r2=1.2 wiki/src/main/resources/customizer.dicon 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/customizer.dicon.diff?r1=1.1.1.1&r2=1.2 wiki/src/main/resources/env.txt 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/env.txt.diff?r1=1.1.1.1&r2=1.2 wiki/src/main/resources/s2container.dicon 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/s2container.dicon.diff?r1=1.1.1.1&r2=1.2 wiki/src/main/resources/teedaCustomize.dicon 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/src/main/resources/teedaCustomize.dicon.diff?r1=1.1.1.1&r2=1.2 =================================================================== RCS file: wiki/src/main/resources/app_aop.dicon,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- app_aop.dicon 2007/01/04 12:10:44 1.1.1.1 +++ app_aop.dicon 2007/02/27 23:09:57 1.2 @@ -4,5 +4,4 @@ - =================================================================== RCS file: wiki/src/main/resources/creator.dicon,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- creator.dicon 2007/01/04 12:10:44 1.1.1.1 +++ creator.dicon 2007/02/27 23:09:57 1.2 @@ -1,16 +1,16 @@ - - + + - + =================================================================== RCS file: wiki/src/main/resources/customizer.dicon,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- customizer.dicon 2007/01/04 12:10:44 1.1.1.1 +++ customizer.dicon 2007/02/27 23:09:57 1.2 @@ -1,18 +1,19 @@ - + - - "aop.traceInterceptor" - + + - "aop.traceInterceptor" + "aop.classLoaderAwareTraceInterceptor" "do.*, initialize, prerender" + "app_aop.actionSupportInterceptor" "do.*, initialize, prerender" + commandAspectCustomizer @@ -21,51 +22,4 @@ actionSupportAspectCustomizer - - - defaultCustomizer - - - - - - - defaultCustomizer - - - - - defaultCustomizer - - - - - defaultCustomizer - - - - - "aop.traceInterceptor" - - - "app_aop.appFacesExceptionThrowsInterceptor" - - "do.*, initialize, prerender" - - - - pageSupportAspectCustomizer - - - - - defaultCustomizer - - - - - - - - \ No newline at end of file =================================================================== RCS file: wiki/src/main/resources/env.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- env.txt 2007/01/04 12:10:44 1.1.1.1 +++ env.txt 2007/02/27 23:09:57 1.2 @@ -1 +1 @@ -ut \ No newline at end of file + =================================================================== RCS file: wiki/src/main/resources/s2container.dicon,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- s2container.dicon 2007/01/04 12:10:44 1.1.1.1 +++ s2container.dicon 2007/02/27 23:09:57 1.2 @@ -1,7 +1,8 @@ - - + + =================================================================== RCS file: wiki/src/main/resources/teedaCustomize.dicon,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- teedaCustomize.dicon 2007/01/04 12:10:44 1.1.1.1 +++ teedaCustomize.dicon 2007/02/27 23:09:57 1.2 @@ -4,6 +4,7 @@ - - + + "/img/" + From shinsuke ＠ users.sourceforge.jp Wed Feb 28 08:26:50 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 28 Feb 2007 08:26:50 +0900 Subject: [pal-cvs 2099] CVS-Update: wiki committed by shinsuke Message-ID: <20070227232650.F23D52AC25C@users.sourceforge.jp> Update of /cvsroot/pal/wiki In directory sf-cvs:/tmp/cvs-serv798 Modified Files: pom.xml Log Message: changed to release version wiki/pom.xml 1.3 -> 1.4 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/wiki/pom.xml.diff?r1=1.3&r2=1.4 =================================================================== RCS file: wiki/pom.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pom.xml 2007/02/01 22:30:24 1.3 +++ pom.xml 2007/02/27 23:26:50 1.4 @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal wiki - 0.1-SNAPSHOT + 0.1 war Wiki Portlet Using Teeda @@ -144,12 +144,12 @@ jp.sf.streamconverter streamconverter-framework - 0.2-SNAPSHOT + 0.2 jp.sf.streamconverter streamconverter-wiki - 0.2-SNAPSHOT + 0.2 xerces @@ -177,13 +177,13 @@ org.seasar.teeda teeda-core - 1.0.4-SNAPSHOT + 1.0.4 jar org.seasar.teeda teeda-extension - 1.0.4-SNAPSHOT + 1.0.4 jar @@ -204,7 +204,7 @@ jp.sf.pal portlet-output-optimizer - 0.2-SNAPSHOT + 0.2 jar From shinsuke ＠ users.sourceforge.jp Wed Feb 28 08:49:09 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 28 Feb 2007 08:49:09 +0900 Subject: [pal-cvs 2100] CVS-Update: site/src/script committed by shinsuke Message-ID: <20070227234909.3D91A2AC043@users.sourceforge.jp> Update of /cvsroot/pal/site/src/script In directory sf-cvs:/tmp/cvs-serv11090/src/script Modified Files: create_portlet_repository.sh Log Message: updated format site/src/script/create_portlet_repository.sh 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/site/src/script/create_portlet_repository.sh.diff?r1=1.1&r2=1.2 =================================================================== RCS file: site/src/script/create_portlet_repository.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- create_portlet_repository.sh 2007/01/21 21:55:42 1.1 +++ create_portlet_repository.sh 2007/02/27 23:49:09 1.2 @@ -13,47 +13,40 @@ RUN_COMMAND="$RUN_COMMAND,\$d /tmp/files.html"; echo "" -echo "" +echo "" +echo " " #$RUN_COMMAND | sed -e "s//\1 /g" -e "s/<[^>]*>/ /g" -e "s/ / /g" -e "s/^ *//g" $RUN_COMMAND | perl -pi -e "s/\r//g" | perl -pi -e "s/\n//g" | perl -pi -e "s/\<\/TR\>/\<\/TR\>\n/g"|sed -e "s/ / /g" -e "s//\1 /g" -e "s/<[^>]*>/ /g" -e "s/ */ /g" -e "s/ - \[.*//g" | grep -v zip |grep -v tar.gz | grep -v jar | perl -pi -e "s/\n//g" | perl -pi -e "s/ /\n/g"|grep http|sed -e "s/^ //g" | sed -e "s/prdownloads\.sourceforge\.jp/osdn.dl.sourceforge.jp/g" -e "s/\(20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]\) \([0-9][0-9]:[0-9][0-9]\)/\1T\2+09:00/" -e "s/\([0-9][^ ]*\) \(http[^ ]*\) \([^ ][^ ]*\)\.war .*\(20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]+[0-9][0-9]:[0-9][0-9]\).*/\n\ - \n\ - \1<\/portlet-spec-version>\n\ - jp.sf.pal<\/group-id>\n\ - \3<\/artifact-id>\n\ - war<\/packaging>\n\ - \1<\/version>\n\ - \3<\/name>\n\ - \n\ - \n\ - PALab<\/cateogry>\n\ - <\/categories>\n\ - \n\ - Portal Application Laboratory<\/name>\n\ - http:\/\/pal.sourceforge.jp\/<\/url>\n\ - <\/publisher>\n\ - \n\ - \2<\/binary>\n\ - \n\ - \n\ - <\/url>\n\ - \n\ - \n\ + \n\ + 1.0<\/portletSpecVersion>\n\ + war<\/packaging>\n\ + \3<\/name>\n\ + \n\ + \2<\/binaryURL>\n\ + \n\ + \n\ \n\ The Apache Software License, Version 2.0<\/name>\n\ http:\/\/www.apache.org\/licenses\/LICENSE-2.0.txt<\/url>\n\ - repo<\/distribution>\n\ <\/license>\n\ - <\/licenses>\n\ - \n\ - 1.5<\/build>\n\ - 1.5<\/runtime>\n\ - <\/java-version>\n\ - \n\ - en<\/default-locale>\n\ - ja<\/supported-locale>\n\ - <\/locale-config>\n\ - <\/portlet>\n\ + \n\ + \n\ + PALab<\/tag>\n\ + <\/tags>\n\ + \n\ + en<\/locale>\n\ + ja<\/locale>\n\ + <\/locales>\n\ + 1.5<\/compiledJDKVersion>\n\ + \4<\/dateCreated>\n\ + \4<\/dateModified>\n\ + \n\ + Portal Application Laboratory<\/name>\n\ + http:\/\/pal.sourceforge.jp\/<\/url>\n\ + <\/publisher>\n\ + <\/portlet>\n\ /g" +echo " " echo "" From shinsuke ＠ users.sourceforge.jp Wed Feb 28 08:54:59 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 28 Feb 2007 08:54:59 +0900 Subject: [pal-cvs 2101] CVS-Update: site/xdocs committed by shinsuke Message-ID: <20070227235459.4F02B2AC260@users.sourceforge.jp> Update of /cvsroot/pal/site/xdocs In directory sf-cvs:/tmp/cvs-serv13568/xdocs Modified Files: download.xml Log Message: updated download lists site/xdocs/download.xml 1.8 -> 1.9 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/site/xdocs/download.xml.diff?r1=1.8&r2=1.9 =================================================================== RCS file: site/xdocs/download.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- download.xml 2007/01/21 22:14:52 1.8 +++ download.xml 2007/02/27 23:54:59 1.9 @@ -12,6 +12,7 @@ 現在、ダウンロード可能なポータルサーバー、ポータルアプリケーション、および、ライブラリは以下の通りです。

+
- " style="font-size:x-small;"> - + " style="font-size: x-small"> +   + +
( : - + )
- "> - " - alt="" - width="" - height="" + + + +<% + Boolean isTodayDisp = (Boolean)renderRequest.getAttribute("istodaydisplay"); + if (isTodayDisp.booleanValue()) { +%> + +<% + } + Boolean isTomorrowDisp = (Boolean)renderRequest.getAttribute("istomorrowdisplay"); + if (isTomorrowDisp.booleanValue()) { +%> + +<% + } + Boolean isDayAfterTomorrowDisp = (Boolean)renderRequest.getAttribute("isdayaftertomorrowdisplay"); + if (isDayAfterTomorrowDisp.booleanValue()) { +%> + +<% + } +%> + +
+
+ "> + " + alt="" + width="" + height="" border="0" /> +
+ +
+ + : + +     + : + + 		+
+ "> + " + alt="" + width="" + height="" + border="0" /> + +
+ +
+ + : + +     + : + + 		+
+ "> + " + alt="" + width="" + height="" + border="0" /> + +
+ +
+ + : + +     + : + +
+
-
- - : - -     - : - -
: - +
- " style="font-size:x-small"> - + " style="font-size:x-small"> +
@@ -124,10 +125,10 @@ - - - - + + + + @@ -173,10 +174,10 @@ - - - - + + + + @@ -186,6 +187,13 @@ + + + + + + + @@ -200,3 +208,5 @@ + + From shinsuke ＠ users.sourceforge.jp Wed Feb 28 08:54:59 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 28 Feb 2007 08:54:59 +0900 Subject: [pal-cvs 2102] CVS-Update: site/xdocs/en committed by shinsuke Message-ID: <20070227235459.792092AC261@users.sourceforge.jp> Update of /cvsroot/pal/site/xdocs/en In directory sf-cvs:/tmp/cvs-serv13568/xdocs/en Modified Files: download.xml Log Message: updated download lists site/xdocs/en/download.xml 1.8 -> 1.9 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/site/xdocs/en/download.xml.diff?r1=1.8&r2=1.9 =================================================================== RCS file: site/xdocs/en/download.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- download.xml 2007/01/21 22:14:53 1.8 +++ download.xml 2007/02/27 23:54:59 1.9 @@ -12,6 +12,7 @@ Available Portal Server, Portlets and Libraries are:

+
最新リリース情報
portletoutputoptimizer0.12006-12-17 07:09Document / DocumentDownload0.22007-02-18 18:08Document / DocumentDownload
s2helloworld
weather0.32006-08-16 17:56Document / DocumentDownload1.02007-02-26 19:28Document / DocumentDownload
webpartsDownload
wiki0.12007-02-28 08:33Document / DocumentDownload
yahoosearch 0.1 2005-12-28 06:52
@@ -124,10 +125,10 @@ - - - - + + + + @@ -173,10 +174,10 @@ - - - - + + + + @@ -186,6 +187,13 @@ + + + + + + + @@ -200,3 +208,4 @@ + From shinsuke ＠ users.sourceforge.jp Wed Feb 28 21:42:51 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 28 Feb 2007 21:42:51 +0900 Subject: [pal-cvs 2103] CVS-Update: libraries/tomahawkbridge committed by shinsuke Message-ID: <20070228124252.029C82AC044@users.sourceforge.jp> Update of /cvsroot/pal/libraries/tomahawkbridge In directory sf-cvs:/tmp/cvs-serv22122 Modified Files: pom.xml Log Message: changed to snapshot version libraries/tomahawkbridge/pom.xml 1.4 -> 1.5 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/libraries/tomahawkbridge/pom.xml.diff?r1=1.4&r2=1.5 =================================================================== RCS file: libraries/tomahawkbridge/pom.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pom.xml 2007/01/13 07:02:28 1.4 +++ pom.xml 2007/02/28 12:42:51 1.5 @@ -5,7 +5,7 @@ jp.sf.pal tomahawk-bridge jar - 0.9.1 + 0.9.2-SNAPSHOT Tomahawk Portlet Filter Portlet Filter For Tomahawk http://pal.sourceforge.jp/ From shinsuke ＠ users.sourceforge.jp Wed Feb 28 21:44:35 2007 From: shinsuke ＠ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 28 Feb 2007 21:44:35 +0900 Subject: [pal-cvs 2104] CVS-Update: libraries/tomahawkbridge/src/main/java/jp/sf/pal/tomahawk/filter committed by shinsuke Message-ID: <20070228124435.A82FB2AC03F@users.sourceforge.jp> Update of /cvsroot/pal/libraries/tomahawkbridge/src/main/java/jp/sf/pal/tomahawk/filter In directory sf-cvs:/tmp/cvs-serv23007/src/main/java/jp/sf/pal/tomahawk/filter Modified Files: ExtensionsPortletFilter.java Log Message: added encoding for multipart request libraries/tomahawkbridge/src/main/java/jp/sf/pal/tomahawk/filter/ExtensionsPortletFilter.java 1.4 -> 1.5 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/libraries/tomahawkbridge/src/main/java/jp/sf/pal/tomahawk/filter/ExtensionsPortletFilter.java.diff?r1=1.4&r2=1.5 =================================================================== RCS file: libraries/tomahawkbridge/src/main/java/jp/sf/pal/tomahawk/filter/ExtensionsPortletFilter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ExtensionsPortletFilter.java 2007/01/12 23:02:10 1.4 +++ ExtensionsPortletFilter.java 2007/02/28 12:44:35 1.5 @@ -63,12 +63,16 @@ private static final String UPLOAD_MAX_FILE_SIZE = "uploadMaxFileSize"; + private static final String MULTIPART_ENCODING = "multipartEncoding"; + private int uploadMaxFileSize = 100 * 1024 * 1024; // 10 MB private int uploadThresholdSize = 1 * 1024 * 1024; // 1 MB private String uploadRepositoryPath = null; // standard temp directory + private String multipartEncoding = null; + private PortletConfig portletConfig; /** @@ -96,10 +100,13 @@ uploadRepositoryPath = filterConfig .getInitParameter(UPLOAD_REPOSITORY_PATH); + multipartEncoding = filterConfig.getInitParameter(MULTIPART_ENCODING); + if (log.isDebugEnabled()) { log.debug("uploadMaxFileSize=" + uploadMaxFileSize); log.debug("uploadThresholdSize=" + uploadThresholdSize); log.debug("uploadRepositoryPath=" + uploadRepositoryPath); + log.debug("multipartEncoding=" + multipartEncoding); // log.debug("mimeType=" + mimeType); } } @@ -249,6 +256,11 @@ if (PortletFileUpload.isMultipartContent(request)) { if (log.isDebugEnabled()) log.debug("ActionRequest is multipart content."); + if (multipartEncoding != null) { + if (log.isDebugEnabled()) + log.debug("Mutlipart encoding is " + multipartEncoding); + request.setCharacterEncoding(multipartEncoding); + } request = new MultipartPortletRequestWrapper(request, uploadMaxFileSize, uploadThresholdSize, uploadRepositoryPath);
Latest File Releases
portletoutputoptimizer0.12006-12-17 07:09Document / DocumentDownload0.22007-02-18 18:08Document / DocumentDownload
s2helloworld
weather0.32006-08-16 17:56Document / DocumentDownload1.02007-02-26 19:28Document / DocumentDownload
webpartsDownload
wiki0.12007-02-28 08:33Document / DocumentDownload
yahoosearch 0.1 2005-12-28 06:52