Shinsuke SUGAYA
shins****@users*****
2007年 4月 2日 (月) 10:01:11 JST
Update of /cvsroot/pal/s2helloworld/src/main/resources In directory sf-cvs:/tmp/cvs-serv6301/src/main/resources Modified Files: convention.dicon creator.dicon customizer.dicon env.txt s2container.dicon teedaCustomize.dicon teedaErrorPage.dicon Log Message: replaced teeda with the latest one. added label.properties. DI'ed facesContext. updated dicon files. s2helloworld/src/main/resources/convention.dicon 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/s2helloworld/src/main/resources/convention.dicon.diff?r1=1.1&r2=1.2 s2helloworld/src/main/resources/creator.dicon 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/s2helloworld/src/main/resources/creator.dicon.diff?r1=1.1&r2=1.2 s2helloworld/src/main/resources/customizer.dicon 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/s2helloworld/src/main/resources/customizer.dicon.diff?r1=1.1&r2=1.2 s2helloworld/src/main/resources/env.txt 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/s2helloworld/src/main/resources/env.txt.diff?r1=1.1&r2=1.2 s2helloworld/src/main/resources/s2container.dicon 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/s2helloworld/src/main/resources/s2container.dicon.diff?r1=1.1&r2=1.2 s2helloworld/src/main/resources/teedaCustomize.dicon 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/s2helloworld/src/main/resources/teedaCustomize.dicon.diff?r1=1.1&r2=1.2 s2helloworld/src/main/resources/teedaErrorPage.dicon 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/s2helloworld/src/main/resources/teedaErrorPage.dicon.diff?r1=1.1&r2=1.2 =================================================================== RCS file: s2helloworld/src/main/resources/convention.dicon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- convention.dicon 2006/11/26 01:44:54 1.1 +++ convention.dicon 2007/04/02 01:01:11 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//SEASAR2.1//DTD S2Container//EN" - "http://www.seasar.org/dtd/components21.dtd"> +<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" + "http://www.seasar.org/dtd/components24.dtd"> <components> <component class="org.seasar.framework.convention.impl.NamingConventionImpl"> <initMethod name="addRootPackageName"> =================================================================== RCS file: s2helloworld/src/main/resources/creator.dicon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- creator.dicon 2006/11/26 01:44:54 1.1 +++ creator.dicon 2007/04/02 01:01:11 1.2 @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="Shift_JIS"?> -<!DOCTYPE components PUBLIC "-//SEASAR2.1//DTD S2Container//EN" - "http://www.seasar.org/dtd/components21.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" + "http://www.seasar.org/dtd/components24.dtd"> <components> <include path="convention.dicon"/> <include path="customizer.dicon"/> @@ -15,4 +15,4 @@ <component class="org.seasar.framework.container.creator.InterceptorCreator"/> <component class="org.seasar.framework.container.creator.ValidatorCreator"/> <component class="org.seasar.framework.container.creator.ConverterCreator"/> -</components> \ No newline at end of file +</components> =================================================================== RCS file: s2helloworld/src/main/resources/customizer.dicon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- customizer.dicon 2006/11/26 01:44:54 1.1 +++ customizer.dicon 2007/04/02 01:01:11 1.2 @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//SEASAR2.1//DTD S2Container//EN" - "http://www.seasar.org/dtd/components21.dtd"> +<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" + "http://www.seasar.org/dtd/components24.dtd"> <components> - <component name="defaultCustomizer" class="org.seasar.framework.container.customizer.AspectCustomizer"> - <property name="interceptorName">"aop.traceInterceptor"</property> - </component> + <include path="default-customizer.dicon"/> + <component name="commandAspectCustomizer" class="org.seasar.framework.container.customizer.AspectCustomizer"> - <property name="interceptorName">"aop.traceInterceptor"</property> + <property name="interceptorName">"aop.classLoaderAwareTraceInterceptor"</property> <property name="pointcut">"do.*, initialize, prerender"</property> </component> + <component name="actionSupportAspectCustomizer" class="org.seasar.framework.container.customizer.AspectCustomizer"> <property name="interceptorName">"app_aop.actionSupportInterceptor"</property> <property name="pointcut">"do.*, initialize, prerender"</property> </component> + <component name="actionCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> <initMethod name="addCustomizer"> <arg>commandAspectCustomizer</arg> @@ -21,51 +22,4 @@ <arg>actionSupportAspectCustomizer</arg> </initMethod> </component> - <component name="daoCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - <initMethod name="addCustomizer"> - <arg>defaultCustomizer</arg> - </initMethod> - </component> - <component name="dtoCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - </component> - <component name="dxoCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - <initMethod name="addCustomizer"> - <arg>defaultCustomizer</arg> - </initMethod> - </component> - <component name="helperCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - <initMethod name="addCustomizer"> - <arg>defaultCustomizer</arg> - </initMethod> - </component> - <component name="logicCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - <initMethod name="addCustomizer"> - <arg>defaultCustomizer</arg> - </initMethod> - </component> - <component name="pageSupportAspectCustomizer" class="org.seasar.framework.container.customizer.AspectCustomizer"> - <initMethod name="addInterceptorName"> - <arg>"aop.traceInterceptor"</arg> - </initMethod> - <initMethod name="addInterceptorName"> - <arg>"app_aop.appFacesExceptionThrowsInterceptor"</arg> - </initMethod> - <property name="pointcut">"do.*, initialize, prerender"</property> - </component> - <component name="pageCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - <initMethod name="addCustomizer"> - <arg>pageSupportAspectCustomizer</arg> - </initMethod> - </component> - <component name="serviceCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - <initMethod name="addCustomizer"> - <arg>defaultCustomizer</arg> - </initMethod> - </component> - <component name="interceptorCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - </component> - <component name="validatorCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - </component> - <component name="converterCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain"> - </component> </components> \ No newline at end of file =================================================================== RCS file: s2helloworld/src/main/resources/env.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- env.txt 2006/11/26 01:44:54 1.1 +++ env.txt 2007/04/02 01:01:11 1.2 @@ -1 +1 @@ -ut \ No newline at end of file +product =================================================================== RCS file: s2helloworld/src/main/resources/s2container.dicon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- s2container.dicon 2006/11/26 01:44:54 1.1 +++ s2container.dicon 2007/04/02 01:01:11 1.2 @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" +<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" "http://www.seasar.org/dtd/components24.dtd"> <components> <include condition="#ENV == 'ut'" path="hotdeploy.dicon"/> - <include condition="#ENV != 'ut'" path="cooldeploy.dicon"/> + <include condition="#ENV == 'ct' || #ENV == 'it'" path="warmdeploy.dicon"/> + <include condition="#ENV == 'product'" path="cooldeploy.dicon"/> </components> =================================================================== RCS file: s2helloworld/src/main/resources/teedaCustomize.dicon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- teedaCustomize.dicon 2006/11/26 01:44:54 1.1 +++ teedaCustomize.dicon 2007/04/02 01:01:11 1.2 @@ -4,6 +4,7 @@ <components> <component class="org.seasar.teeda.core.render.DefaultComponentIdLookupStrategy" /> <component class="org.seasar.teeda.core.application.impl.DefaultComponentLookupStrategy" /> - <component class="org.seasar.teeda.extension.render.AdjustableInputDecoder" /> - <component class="org.seasar.teeda.extension.util.SimpleLabelHelperImpl" /> + <component class="org.seasar.teeda.extension.util.TreeNavigationImageLocatorImpl"> + <property name="imageRoot">"/img/"</property> + </component> </components> =================================================================== RCS file: s2helloworld/src/main/resources/teedaErrorPage.dicon,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- teedaErrorPage.dicon 2006/11/26 01:44:54 1.1 +++ teedaErrorPage.dicon 2007/04/02 01:01:11 1.2 @@ -3,10 +3,12 @@ "http://www.seasar.org/dtd/components24.dtd"> <components namespace="teedaErrorPage" > - <component class="org.seasar.teeda.extension.util.TeedaExtensionErrorPageManagerImpl"> + <component class="org.seasar.teeda.core.util.PortletErrorPageManagerImpl"> +<!-- <initMethod name="addErrorPage"> <arg>@java.lang.Throwable ＠ class</arg> <arg>"/view/error/error.html"</arg> </initMethod> + --> </component> -</components> \ No newline at end of file +</components>
