svnno****@sourc*****
svnno****@sourc*****
2008年 12月 4日 (木) 14:48:00 JST
Revision: 1521 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1521 Author: shinsuke Date: 2008-12-04 14:48:00 +0900 (Thu, 04 Dec 2008) Log Message: ----------- reverted.. Modified Paths: -------------- bookmark/trunk/src/main/resources/env.txt bookmark/trunk/src/main/resources/jdbc.dicon bookmark/trunk/src/main/webapp/WEB-INF/web.xml -------------- next part -------------- Modified: bookmark/trunk/src/main/resources/env.txt =================================================================== --- bookmark/trunk/src/main/resources/env.txt 2008-12-04 05:44:25 UTC (rev 1520) +++ bookmark/trunk/src/main/resources/env.txt 2008-12-04 05:48:00 UTC (rev 1521) @@ -1 +1 @@ -ct +product Modified: bookmark/trunk/src/main/resources/jdbc.dicon =================================================================== --- bookmark/trunk/src/main/resources/jdbc.dicon 2008-12-04 05:44:25 UTC (rev 1520) +++ bookmark/trunk/src/main/resources/jdbc.dicon 2008-12-04 05:48:00 UTC (rev 1521) @@ -40,7 +40,7 @@ "org.h2.Driver" </property> <property name="URL"> - "jdbc:h2:tcp://localhost:9092/userinfo" + "jdbc:h2:file:" + container.getComponent(@java.lang.Class @ forName("javax.servlet.ServletContext")).getRealPath("/WEB-INF/db/bookmark") </property> <!-- "jdbc:h2:tcp://localhost:9092/bookmark" --> <property name="user">"sa"</property> Modified: bookmark/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/web.xml 2008-12-04 05:44:25 UTC (rev 1520) +++ bookmark/trunk/src/main/webapp/WEB-INF/web.xml 2008-12-04 05:48:00 UTC (rev 1521) @@ -118,7 +118,7 @@ <servlet-class>org.seasar.framework.container.servlet.S2ContainerServlet</servlet-class> <load-on-startup>2</load-on-startup> </servlet> -<!-- BEGIN: J2 --> +<!-- BEGIN: J2 <servlet> <description>MVC Servlet for Jetspeed Portlet Applications</description> <display-name>Jetspeed Container</display-name> @@ -130,7 +130,7 @@ </init-param> <load-on-startup>0</load-on-startup> </servlet> -<!-- END: J2 --> + END: J2 --> <servlet-mapping> <servlet-name>action</servlet-name> <url-pattern>*.do</url-pattern> @@ -139,24 +139,24 @@ <servlet-name>s2container</servlet-name> <url-pattern>/s2container</url-pattern> </servlet-mapping> -<!-- BEGIN: J2 --> +<!-- BEGIN: J2 <servlet-mapping> <servlet-name>JetspeedContainer</servlet-name> <url-pattern>/container/*</url-pattern> </servlet-mapping> -<!-- END: J2 --> + END: J2 --> <welcome-file-list> <welcome-file>index.html</welcome-file> <welcome-file>index.htm</welcome-file> <welcome-file>index.jsp</welcome-file> </welcome-file-list> <jsp-config> -<!-- BEGIN: J2 --> +<!-- BEGIN: J2 <taglib> <taglib-uri>http://java.sun.com/portlet</taglib-uri> <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location> </taglib> -<!-- END: J2 --> + END: J2 --> <jsp-property-group> <url-pattern>*.jsp</url-pattern> <el-ignored>false</el-ignored>