svnno****@sourc*****
svnno****@sourc*****
2008年 10月 8日 (水) 13:55:07 JST
Revision: 2011
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=2011
Author: daisuke_m
Date: 2008-10-08 13:55:07 +0900 (Wed, 08 Oct 2008)
Log Message:
-----------
refactor
Modified Paths:
--------------
sandbox/JiemamyPolls/.classpath
sandbox/JiemamyPolls/.project
sandbox/JiemamyPolls/.settings/org.eclipse.wst.common.component
sandbox/JiemamyPolls/pom.xml
sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/CreateAction.java
sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/HomeAction.java
sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/IndexAction.java
sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/PollAction.java
sandbox/JiemamyPolls/src/main/webapp/WEB-INF/view/common/header.html
Removed Paths:
-------------
sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/SessionKey.java
sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/form/
-------------- next part --------------
Modified: sandbox/JiemamyPolls/.classpath
===================================================================
--- sandbox/JiemamyPolls/.classpath 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/.classpath 2008-10-08 04:55:07 UTC (rev 2011)
@@ -1,67 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/main/webapp/WEB-INF/view"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils-core/1.7.0/commons-beanutils-core-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar" sourcepath="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar" sourcepath="M2_REPO/org/easymock/easymock/2.2/easymock-2.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.9/freemarker-2.3.9.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.0/geronimo-annotation_1.0_spec-1.0.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.0/geronimo-annotation_1.0_spec-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.1/geronimo-ejb_2.1_spec-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-interceptor_3.0_spec/1.0/geronimo-interceptor_3.0_spec-1.0.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-interceptor_3.0_spec/1.0/geronimo-interceptor_3.0_spec-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jpa_3.0_spec/1.0/geronimo-jpa_3.0_spec-1.0.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-jpa_3.0_spec/1.0/geronimo-jpa_3.0_spec-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.0/geronimo-jsp_2.0_spec-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.0/geronimo-jta_1.1_spec-1.0.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.0/geronimo-jta_1.1_spec-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0/geronimo-servlet_2.4_spec-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20061217/h2-1.0.20061217.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/rhino/js/1.6R5/js-1.6R5.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/mayaa/mayaa/1.1.18/mayaa-1.1.18.jar"/>
- <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/0.9.5/nekohtml-0.9.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9-patch-20070908/ognl-2.6.9-patch-20070908.jar" sourcepath="M2_REPO/ognl/ognl/2.6.9-patch-20070908/ognl-2.6.9-patch-20070908-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar" sourcepath="M2_REPO/oro/oro/2.0.8/oro-2.0.8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ozacc-mail/ozacc-mail/1.2.1/ozacc-mail-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL.jar" sourcepath="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/postgresql/postgresql/8.2-504.jdbc3/postgresql-8.2-504.jdbc3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.24/s2-extension-2.4.24.jar" sourcepath="M2_REPO/org/seasar/container/s2-extension/2.4.24/s2-extension-2.4.24-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.24/s2-framework-2.4.24.jar" sourcepath="M2_REPO/org/seasar/container/s2-framework/2.4.24/s2-framework-2.4.24-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-tiger/2.4.24/s2-tiger-2.4.24.jar" sourcepath="M2_REPO/org/seasar/container/s2-tiger/2.4.24/s2-tiger-2.4.24-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/chronos/s2chronos-core/0.0.1-RC6/s2chronos-core-0.0.1-RC6.jar" sourcepath="M2_REPO/org/seasar/chronos/s2chronos-core/0.0.1-RC6/s2chronos-core-0.0.1-RC6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/chronos/s2chronos-extension/0.0.1-RC6/s2chronos-extension-0.0.1-RC6.jar" sourcepath="M2_REPO/org/seasar/chronos/s2chronos-extension/0.0.1-RC6/s2chronos-extension-0.0.1-RC6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/mai/s2mai/0.9.3/s2mai-0.9.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/mai/s2mai-tiger/0.9.3/s2mai-tiger-0.9.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/sastruts/sa-struts/1.0.3-rc1/sa-struts-1.0.3-rc1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar" sourcepath="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar" sourcepath="M2_REPO/struts/struts/1.2.9/struts-1.2.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.5.1/xalan-2.5.1.jar" sourcepath="M2_REPO/xalan/xalan/2.5.1/xalan-2.5.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar" sourcepath="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3-sources.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>
+</classpath>
Modified: sandbox/JiemamyPolls/.project
===================================================================
--- sandbox/JiemamyPolls/.project 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/.project 2008-10-08 04:55:07 UTC (rev 2011)
@@ -1,22 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>JiemamyPolls</name>
- <comment/>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>JiemamyPolls</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
Modified: sandbox/JiemamyPolls/.settings/org.eclipse.wst.common.component
===================================================================
--- sandbox/JiemamyPolls/.settings/org.eclipse.wst.common.component 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/.settings/org.eclipse.wst.common.component 2008-10-08 04:55:07 UTC (rev 2011)
@@ -182,9 +182,6 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/webapp/WEB-INF/view"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp/WEB-INF/view"/>
</wb-module>
</project-modules>
Modified: sandbox/JiemamyPolls/pom.xml
===================================================================
--- sandbox/JiemamyPolls/pom.xml 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/pom.xml 2008-10-08 04:55:07 UTC (rev 2011)
@@ -22,7 +22,7 @@
<plugin>
<groupId>jp.xet.jiemamy</groupId>
<artifactId>maven-jiemamy-plugin</artifactId>
- <!-- <version>${project.version}</version> -->
+ <version>0.1.1</version>
<executions>
<execution>
<id>execute-porter</id>
Deleted: sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/SessionKey.java
===================================================================
--- sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/SessionKey.java 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/SessionKey.java 2008-10-08 04:55:07 UTC (rev 2011)
@@ -1,11 +0,0 @@
-package org.jiemamy.polls;
-
-
-/**
- * TODO describe
- * @author daisuke
- */
-public class SessionKey {
-
- public static final String LOGIN_USER = "loginUser";
-}
Modified: sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/CreateAction.java
===================================================================
--- sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/CreateAction.java 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/CreateAction.java 2008-10-08 04:55:07 UTC (rev 2011)
@@ -94,9 +94,9 @@
}
/**
- * 新規投票を登録する�?
+ * 新規投票を登録する。
*
- * @return 遷移�?
+ * @return 遷移先
*/
@Execute(input = "index.html", validate = "validateSubmit")
public String submit() throws ParseException {
Modified: sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/HomeAction.java
===================================================================
--- sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/HomeAction.java 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/HomeAction.java 2008-10-08 04:55:07 UTC (rev 2011)
@@ -22,7 +22,7 @@
@Execute(validator = false)
public String index() {
- if (!currentUserDto.authed) {
+ if (currentUserDto.authed == false) {
return "/?redirect=true";
}
username = currentUserDto.username;
Modified: sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/IndexAction.java
===================================================================
--- sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/IndexAction.java 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/IndexAction.java 2008-10-08 04:55:07 UTC (rev 2011)
@@ -11,7 +11,7 @@
@Execute(validator = false)
public String index() {
- if (!currentUserDto.authed) {
+ if (currentUserDto.authed == false) {
return "/login/?redirect=true";
}
return "/home/?redirect=true";
Modified: sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/PollAction.java
===================================================================
--- sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/PollAction.java 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/src/main/java/org/jiemamy/polls/action/PollAction.java 2008-10-08 04:55:07 UTC (rev 2011)
@@ -114,7 +114,7 @@
}
private Vote myVote() {
- if (!currentUserDto.authed) {
+ if (currentUserDto.authed == false) {
return null;
}
pollDto.choiceId = null;
Modified: sandbox/JiemamyPolls/src/main/webapp/WEB-INF/view/common/header.html
===================================================================
--- sandbox/JiemamyPolls/src/main/webapp/WEB-INF/view/common/header.html 2008-10-07 15:04:17 UTC (rev 2010)
+++ sandbox/JiemamyPolls/src/main/webapp/WEB-INF/view/common/header.html 2008-10-08 04:55:07 UTC (rev 2011)
@@ -5,6 +5,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
<body id="header">
- <h1><a href="/JiemamyPolls/">Jiemamy Polls</a> v0.0.1</h1>
+ <h1><a href="/JiemamyPolls/">Jiemamy Polls</a> v0.0.2</h1>
</body>
</html>
\ No newline at end of file