From shinsuke @ users.sourceforge.jp Wed Mar 7 16:05:13 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Wed, 7 Mar 2007 16:05:13 +0900 Subject: [pal-cvs 2105] CVS-Update: pal-portal committed by shinsuke Message-ID: <20070307070513.54BAA2AC00E@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal In directory sf-cvs:/tmp/cvs-serv24719 Modified Files: build.xml Log Message: added useful build target pal-portal/build.xml 1.10 -> 1.11 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/build.xml.diff?r1=1.10&r2=1.11 =================================================================== RCS file: pal-portal/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- build.xml 2006/12/09 07:22:49 1.10 +++ build.xml 2007/03/07 07:05:13 1.11 @@ -251,5 +251,31 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + From shinsuke @ users.sourceforge.jp Thu Mar 8 07:09:21 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:09:21 +0900 Subject: [pal-cvs 2106] CVS-Update: pal-portal/portal/patches/etc/sql/min, NONE, NONE committed by shinsuke Message-ID: <20070307220924.C278B2AC089@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/etc/sql/min In directory sf-cvs:/tmp/cvs-serv14527/portal/patches/etc/sql/min Log Message: Directory /cvsroot/pal/pal-portal/portal/patches/etc/sql/min added to the repository From shinsuke @ users.sourceforge.jp Thu Mar 8 07:13:33 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:13:33 +0900 Subject: [pal-cvs 2107] CVS-Update: pal-portal committed by shinsuke Message-ID: <20070307221333.A084D2AC0B5@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal In directory sf-cvs:/tmp/cvs-serv16262 Modified Files: build.properties Log Message: update for 2.1 pal-portal/build.properties 1.33 -> 1.34 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/build.properties.diff?r1=1.33&r2=1.34 =================================================================== RCS file: pal-portal/build.properties,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- build.properties 2007/01/14 02:00:53 1.33 +++ build.properties 2007/03/07 22:13:32 1.34 @@ -61,8 +61,7 @@ org.apache.jetspeed.portal.currentVersion=${portal.version} # Jetspeed SVN revision -#jetspeed2.revision=489536 -jetspeed2.revision=495818 +jetspeed2.revision=514361 # Dependencies for Jetspeed jetspeed.version=2.1-dev @@ -153,6 +152,7 @@ src/webapp/decorations/portlet/decorator.vm,\ project.properties,\ commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties,\ +etc/sql/min/j2-seed.xml,\ etc/sql/j2-seed.xml,\ etc/schema/prefs-schema.xml,\ From shinsuke @ users.sourceforge.jp Thu Mar 8 07:13:41 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:13:41 +0900 Subject: [pal-cvs 2108] CVS-Update: pal-portal/portal/patches committed by shinsuke Message-ID: <20070307221341.7B3B02AC095@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches In directory sf-cvs:/tmp/cvs-serv16262/portal/patches Modified Files: project.properties Log Message: update for 2.1 pal-portal/portal/patches/project.properties 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/project.properties.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/patches/project.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project.properties 2006/12/17 00:09:20 1.1 +++ project.properties 2007/03/07 22:13:41 1.2 @@ -1,8 +1,8 @@ Index: project.properties =================================================================== ---- project.properties (リビジョン 487219) +--- project.properties (リビジョン 514361) +++ project.properties (作業コピー) -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ derby.include=true maven.mode.online = true From shinsuke @ users.sourceforge.jp Thu Mar 8 07:13:49 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:13:49 +0900 Subject: [pal-cvs 2109] CVS-Update: pal-portal/portal/patches/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration committed by shinsuke Message-ID: <20070307221349.42E0B2AC0BE@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration In directory sf-cvs:/tmp/cvs-serv16262/portal/patches/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration Modified Files: UserRegistrationPortlet.java Log Message: update for 2.1 pal-portal/portal/patches/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java.diff?r1=1.2&r2=1.3 =================================================================== RCS file: pal-portal/portal/patches/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- UserRegistrationPortlet.java 2006/09/27 12:56:39 1.2 +++ UserRegistrationPortlet.java 2007/03/07 22:13:49 1.3 @@ -1,8 +1,8 @@ Index: applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java =================================================================== ---- applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java (リビジョン 450196) +--- applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java (リビジョン 514361) +++ applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java (作業コピー) -@@ -348,8 +348,8 @@ +@@ -349,8 +349,8 @@ // These last two are special cases you must have them // comment them out here if you use the generated password option @@ -13,7 +13,7 @@ // the following can be placed in any order, and will appear in that order on the page -@@ -361,13 +361,13 @@ +@@ -362,13 +362,13 @@ {"user.employer", optional , new Integer(80), IS_STRING}, */ @@ -23,13 +23,13 @@ {"user.jobtitle", optional , new Integer(80), IS_STRING}, {"user.name.prefix", optional , new Integer(10), IS_STRING}, */ -- {"user.name.given", optional , new Integer(30), IS_STRING}, - {"user.name.family", optional , new Integer(30), IS_STRING}, -+ {"user.name.given", optional , new Integer(30), IS_STRING}, ++ {"user.name.family", optional , new Integer(30), IS_STRING}, + {"user.name.given", optional , new Integer(30), IS_STRING}, +- {"user.name.family", optional , new Integer(30), IS_STRING}, /* {"user.name.middle", optional , new Integer(30), IS_STRING}, {"user.name.suffix", optional , new Integer(10), IS_STRING}, -@@ -402,13 +402,13 @@ +@@ -403,13 +403,13 @@ {"user.home-info.online.email", optional , new Integer(80), IS_EMAIL}, {"user.home-info.online.uri", optional , new Integer(80), IS_URL}, */ @@ -50,11 +50,3 @@ /* {"user.business-info.telecom.telephone.intcode", optional , new Integer(80), IS_STRING}, {"user.business-info.telecom.telephone.loccode", optional , new Integer(80), IS_STRING}, -@@ -673,7 +673,6 @@ - admin.sendEmail(getPortletConfig(), (String) userInfo - .get(USER_ATTRIBUTE_EMAIL), - getEmailSubject(actionRequest), templ, userInfo); -- - if ((this.optionForceEmailAsUsername) - || (this.optionForceGeneratedPasswords)) - { From shinsuke @ users.sourceforge.jp Thu Mar 8 07:13:57 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:13:57 +0900 Subject: [pal-cvs 2110] CVS-Update: pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF committed by shinsuke Message-ID: <20070307221357.78F222AC095@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF In directory sf-cvs:/tmp/cvs-serv16262/portal/patches/applications/j2-admin/src/webapp/WEB-INF Modified Files: portlet.xml Log Message: update for 2.1 pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- portlet.xml 2006/09/26 03:09:17 1.1 +++ portlet.xml 2007/03/07 22:13:57 1.2 @@ -1,13 +1,13 @@ Index: applications/j2-admin/src/webapp/WEB-INF/portlet.xml =================================================================== ---- applications/j2-admin/src/webapp/WEB-INF/portlet.xml (リビジョン 449041) +--- applications/j2-admin/src/webapp/WEB-INF/portlet.xml (リビジョン 514361) +++ applications/j2-admin/src/webapp/WEB-INF/portlet.xml (作業コピー) -@@ -1070,7 +1070,7 @@ - +@@ -1097,7 +1097,7 @@ + This option will generate a new password for each user registration Option_Generate_Passwords -- false +- false + true - - + + This option will force email address to be system wide unique From shinsuke @ users.sourceforge.jp Thu Mar 8 07:14:05 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:14:05 +0900 Subject: [pal-cvs 2111] CVS-Update: pal-portal/portal/patches/etc/sql committed by shinsuke Message-ID: <20070307221405.8D4742AC0B6@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/etc/sql In directory sf-cvs:/tmp/cvs-serv16262/portal/patches/etc/sql Modified Files: j2-seed.xml Log Message: update for 2.1 pal-portal/portal/patches/etc/sql/j2-seed.xml 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/etc/sql/j2-seed.xml.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/patches/etc/sql/j2-seed.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- j2-seed.xml 2007/01/14 02:00:54 1.1 +++ j2-seed.xml 2007/03/07 22:14:05 1.2 @@ -1,204 +1,189 @@ Index: etc/sql/j2-seed.xml =================================================================== ---- etc/sql/j2-seed.xml (リビジョン 495818) +--- etc/sql/j2-seed.xml (リビジョン 514361) +++ etc/sql/j2-seed.xml (作業コピー) -@@ -244,8 +244,11 @@ - manager - user - guest -+ site -+ - - - accounting -@@ -254,21 +257,25 @@ - - - -- -+ - user,manager,admin - - -+ -+ - - - -- -+ - user,manager - - - - - -+ -+ -+ -+ user,site -+ -+ -+ -+ -+ -+ -+ -+ - - -- guest -+ guest,site - - - - -- -+ - - -+ - - - -+ -+ user,guest - - - -@@ -341,6 +366,7 @@ - - - -+ - - - -@@ -381,6 +408,7 @@ - - user - -+ - - admin - -@@ -426,6 +455,7 @@ - - - -+ - - admin - -@@ -446,11 +477,13 @@ - - - -+ - - - -@@ -590,6 +623,7 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - +@@ -246,10 +246,13 @@ + manager + user + guest ++ site ++ + + + accounting +@@ -258,9 +261,10 @@ + + + +- ++ + user,manager,admin + ++ + + + +- ++ + user,manager + + + + + ++ + + +- guest ++ guest,site + + + + +- ++ + + ++ ++ ++ ++ user,site ++ ++ ++ ++ ++ ++ ++ + + + +- user,guest,subsite,subsite2 ++ user,guest + + + +@@ -377,6 +396,7 @@ + + + ++ + + admin + +@@ -452,6 +473,7 @@ + + + ++ + + admin + +@@ -472,11 +495,13 @@ + + + ++ + + + +@@ -616,6 +641,7 @@ + + + ++ + + + +@@ -714,5 +741,32 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + From shinsuke @ users.sourceforge.jp Thu Mar 8 07:14:13 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:14:13 +0900 Subject: [pal-cvs 2112] CVS-Update: pal-portal/portal/patches/etc/sql/min committed by shinsuke Message-ID: <20070307221413.006A12AC089@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/etc/sql/min In directory sf-cvs:/tmp/cvs-serv16262/portal/patches/etc/sql/min Added Files: j2-seed.xml Log Message: update for 2.1 pal-portal/portal/patches/etc/sql/min/j2-seed.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/etc/sql/min/j2-seed.xml?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Thu Mar 8 07:14:22 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:14:22 +0900 Subject: [pal-cvs 2113] CVS-Update: pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF committed by shinsuke Message-ID: <20070307221422.8C0BD2AC0BE@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF In directory sf-cvs:/tmp/cvs-serv16262/portal/patches/layout-portlets/src/webapp/WEB-INF Modified Files: portlet.xml Log Message: update for 2.1 pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml.diff?r1=1.2&r2=1.3 =================================================================== RCS file: pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- portlet.xml 2006/11/14 22:05:37 1.2 +++ portlet.xml 2007/03/07 22:14:22 1.3 @@ -1,12 +1,41 @@ Index: layout-portlets/src/webapp/WEB-INF/portlet.xml =================================================================== ---- layout-portlets/src/webapp/WEB-INF/portlet.xml ($B%j%S%8%g%s(B 472432) +--- layout-portlets/src/webapp/WEB-INF/portlet.xml ($B%j%S%8%g%s(B 514361) +++ layout-portlets/src/webapp/WEB-INF/portlet.xml ($B:n6H%3%T!<(B) -@@ -18,10 +18,8 @@ +@@ -16,38 +16,10 @@ - + + +- +- The SimpleLayoutPortlet requires a ViewPage layout template set through the portlet preferences +- which provides its own layout algorithm +- SimpleLayout +- Simple readonly fixed Layout +- +- ViewPage +- columns +- +- +- MaxPage +- maximized +- +- org.apache.jetspeed.portlets.layout.LayoutPortlet +- org.apache.jetspeed.portlets.layout.resources.LayoutResource +- 0 +- +- text/html +- view +- +- +- SimpleLayoutPortlet +- SimpleLayout +- +- +- +- ++ VelocityOneColumn -- One Column Layout Using Velocity +- One Column - Velocity$B$rMxMQ$7$?(B 1 $BNs%l%$%"%&%H(B - $B4pP2(BVelocity$BE*(B??$BNsI[6I(B - $B4p1w(BVelocity$BE*SENs$(D0h$B6I(B @@ -15,13 +44,28 @@ ViewPage columns -@@ -57,53 +55,10 @@ +@@ -70,7 +42,7 @@ + + org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource +- 0 ++ -1 + + text/html + view +@@ -78,58 +50,15 @@ + help + + +- One Column ++ VelocityOneColumn + OneColumn - - VelocityOneColumnTable -- One Column Layout Using Velocity And Tables +- One Column with Tables - Velocity $B$H%F!<%V%k$rMxMQ$7$?(B 1 $BNs%l%$%"%&%H(B - $B4pP2(BVelocity$BI=3JE*(B??$BNsI[6I(B - $B4p1w(BVelocity$BI=3JE*SENs$(D0h$B6I(B @@ -47,7 +91,7 @@ - - org.apache.jetspeed.portlets.layout.MultiColumnPortlet - org.apache.jetspeed.portlets.layout.resources.LayoutResource -- -1 +- 0 - - text/html - view @@ -55,14 +99,14 @@ - help - - -- VelocityOneColumnTable +- One Column with Tables - OneColumnTable - - - VelocityTwoColumns -- Two Columns Layout Using Velocity +- Two Columns - Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B - $B4pP2(BVelocity$BE*APNsI[6I(B - $B4p1w(BVelocity$BE*RVNs$(D0h$B6I(B @@ -71,13 +115,34 @@ ViewPage columns -@@ -139,12 +94,10 @@ +@@ -150,13 +79,9 @@ + layoutType + TwoColumns + +- + org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource +- 0 ++ -1 + + text/html + view +@@ -164,17 +89,15 @@ + help + + +- Two Columns ++ VelocityTwoColumns + TwoColumns - - VelocityTwoColumnsSmallLeft -- Two Columns with a small Left column for navigation controls using Velocity +- Two Columns (15%/85%) - Velocity $B$rMxMQ$7$?:8B&$K%J%S%2!<%7%g%s%3%s%H%m!<%kMQ$N>.$5$JNs$r;}$D(B 2 $BNs(B - $B4pP2(BVelocity$B!$(B??$B9R(B????$B:uE*APNsI[6I(B - $B4p1w(BVelocity$B!$F39RMs3S:uE*RVNs$(D0h$B6I(B @@ -88,7 +153,7 @@ ViewPage columns -@@ -159,7 +112,7 @@ +@@ -189,7 +112,7 @@ sizes @@ -97,7 +162,13 @@ layoutType -@@ -172,21 +125,18 @@ +@@ -197,26 +120,23 @@ + + org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource +- 0 ++ -1 + text/html view edit @@ -105,8 +176,8 @@ + help -- VelocityTwoColumnsSmallLeft -- TwoColumnsSmallLeft +- Two Columns (15%/85%) +- Two Columns (15%/85%) + VelocityTwoColumns + TwoColumns @@ -115,7 +186,7 @@ - - - VelocityThreeColumns -- Three Columns Layout Using Velocity +- Three Columns - Velocity $B$rMxMQ$7$?(B 3 $BNs%l%$%"%&%H(B - $B4pP2(BVelocity$BE*(B3$BNsI[6I(B - $B4p1w(BVelocity$BE*(B3$BNs$(D0h$B6I(B @@ -126,7 +197,7 @@ ViewPage columns -@@ -197,15 +147,15 @@ +@@ -227,40 +147,38 @@ columns @@ -145,7 +216,9 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -214,23 +164,21 @@ +- 0 ++ -1 + text/html view edit @@ -153,7 +226,7 @@ + help -- VelocityThreeColumns +- Three Columns - ThreeColumns + VelocityTwoColumns + TwoColumns @@ -162,7 +235,7 @@ - - VelocityThreeColumnsTable -- Three Columns Layout Using Velocity And Tables +- Three Columns with Tables - Velocity $B$H%F!<%V%k$rMxMQ$7$?(B 3 $BNs%l%$%"%&%H(B - $B4pP2(BVelocity$BI=3JE*(B3$BNsI[6I(B - $B4p1w(BVelocity$BI=3JE*(B3$BNs$(D0h$B6I(B @@ -177,7 +250,7 @@ MaxPage -@@ -238,15 +186,15 @@ +@@ -268,37 +186,35 @@ columns @@ -196,7 +269,9 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -255,20 +203,18 @@ +- 0 ++ -1 + text/html view edit @@ -204,7 +279,7 @@ + help -- VelocityThreeColumnsTable +- Three Columns with Tables - ThreeColumnsTable + VelocityTwoColumns + TwoColumns @@ -213,7 +288,7 @@ - - VelocityOneColumnNoActions -- One Column Layout Using Velocity with No Page Actions allowed +- One Column - No Actions - $B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 1 $BNs%l%$%"%&%H(B - $BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*(B??$BNsI[6I(B - $B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*SENs$(D0h$B6I(B @@ -224,59 +299,27 @@ ViewPage columns -@@ -279,50 +225,11 @@ +@@ -309,35 +225,35 @@ columns - 1 -- -- -- sizes -- 100% -- -- -- layoutType -- OneColumn -- -- org.apache.jetspeed.portlets.layout.MultiColumnPortlet -- org.apache.jetspeed.portlets.layout.resources.LayoutResource -- -1 -- -- text/html -- view -- -- -- VelocityOneColumn -- OneColumn -- -- -- -- -- VelocityTwoColumnsNoActions -- Two Columns Layout Using Velocity with No Page Actions allowed -- $B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B -- $BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*APNsI[6I(B -- $B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*RVNs$(D0h$B6I(B -- -- ViewPage -- columns -- -- -- MaxPage -- maximized -- -- -- columns - 2 ++ 2 sizes -- 50%,50% +- 100% + 75%,25% layoutType -@@ -334,6 +241,8 @@ +- OneColumn ++ TwoColumns + + org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource +- 0 ++ -1 text/html view @@ -284,17 +327,19 @@ + help - VelocityTwoColumns -@@ -341,12 +250,10 @@ +- One Column - No Actions +- OneColumnNoActions ++ VelocityTwoColumns ++ TwoColumns -- -- VelocityThreeColumnsNoActions -- Three Columns Layout Using Velocity with No Actions allowed -- $B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 3 $BNs%l%$%"%&%H(B -- $BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*(B3$BNsI[6I(B -- $B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*(B3$BNs$(D0h$B6I(B +- +- VelocityTwoColumnsNoActions +- Two Columns Layout - No Actions +- $B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B +- $BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*APNsI[6I(B +- $B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*RVNs$(D0h$B6I(B + + VelocityThreeColumns + Three Columns Layout(33/33/33) @@ -302,7 +347,27 @@ ViewPage columns -@@ -373,18 +280,19 @@ +@@ -348,35 +264,35 @@ + + + columns +- 2 ++ 3 + + + sizes +- 50%,50% ++ 33%,33%,33% + + + layoutType +- TwoColumns ++ ThreeColumns + + org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource +- 0 ++ -1 text/html view @@ -310,17 +375,19 @@ + help - VelocityThreeColumns - ThreeColumns +- Two Columns - No Actions +- TwoColumnsNoActions ++ VelocityThreeColumns ++ ThreeColumns -- -- VelocityTwoColumns2575NoActions -- Two Columns Layout Using Velocity with No Page Actions allowed -- $B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B -- $BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*APNsI[6I(B -- $B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*RVNs$(D0h$B6I(B -+ + +- +- VelocityThreeColumnsNoActions +- Three Columns - No Actions +- $B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 3 $BNs%l%$%"%&%H(B +- $BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*(B3$BNsI[6I(B +- $B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*(B3$BNs$(D0h$B6I(B + + VelocityThreeColumns206020 + Three Columns Layout(20/60/20) @@ -328,26 +395,21 @@ ViewPage columns -@@ -395,15 +303,15 @@ - - - columns -- 2 -+ 3 +@@ -391,7 +307,7 @@ sizes -- 25%,75% +- 33%,33%,33% + 20%,60%,20% layoutType -- TwoColumns -+ ThreeColumns +@@ -399,22 +315,23 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -411,19 +319,19 @@ +- 0 ++ -1 text/html view @@ -355,19 +417,19 @@ + help -- VelocityTwoColumns2575NoActions -- VelocityTwoColumns2575NoActions +- Three Columns - No Actions +- ThreeColumnsNoActions + VelocityThreeColumns + ThreeColumns - -- -- VelocityTwoColumns2575 -- 25/75 Two Columns Layout Using Velocity -- Velocity $B$rMxMQ$7$?(B 25/75 $B$N(B 2 $BNs%l%$%"%&%H(B -- $B4pP2(BVelocity$BE*APNsI[6I(B -- $B4p1w(BVelocity$BE*RVNs$(D0h$B6I(B +- +- VelocityTwoColumns2575NoActions +- Two Columns (25%/75%) No Actions +- $B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B +- $BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*APNsI[6I(B +- $B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*RVNs$(D0h$B6I(B ++ + + VelocityFourColumns + Four Layout @@ -375,7 +437,7 @@ ViewPage columns -@@ -434,15 +342,15 @@ +@@ -425,38 +342,38 @@ columns @@ -394,23 +456,28 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -454,20 +362,18 @@ - help +- 0 ++ -1 + + text/html + view ++ edit ++ help -- VelocityTwoColumns2575NoActions +- Two Columns (25%/75%) No Actions - VelocityTwoColumns2575NoActions + VelocityFourColumns + FourColumns - -- -- VelocityTwoColumnsSmallLeftNoActions -- Two Columns with a small Left column for navigation controls using Velocity and No Actions -- $B%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?:8B&$K%J%S%2!<%7%g%s%3%s%H%m!<%kMQ$N>.$5$JNs$r;}$D(B 2 $BNs(B -- $BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$B!$(B??$B9R(B????$B:uE*(B??$BNsI[6I(B -- $B]sM-JGLL(B??$BBV!"4p1w(BVelocity$B!$F39RMs3S:uE*RVNs$(D0h$B6I(B +- +- VelocityTwoColumns2575 +- Two Columns (25%/75%) +- Velocity $B$rMxMQ$7$?(B 25/75 $B$N(B 2 $BNs%l%$%"%&%H(B +- $B4pP2(BVelocity$BE*APNsI[6I(B +- $B4p1w(BVelocity$BE*RVNs$(D0h$B6I(B + + -- -- FrameLayoutPortlet -- Frame Layout Portlet -- $B%U%l!<%`%l%$%"%&%H%]!<%H%l%C%H(B -- $B[Z2MI[6I(BPortlet -- $B[Z2M$(D0h$B6I(BPortlet +- +- VelocityTwoColumnsSmallLeftNoActions +- Two Columns (15%,85%) No Actions +- $B%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?:8B&$K%J%S%2!<%7%g%s%3%s%H%m!<%kMQ$N>.$5$JNs$r;}$D(B 2 $BNs(B +- $BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$B!$(B??$B9R(B????$B:uE*(B??$BNsI[6I(B +- $B]sM-JGLL(B??$BBV!"4p1w(BVelocity$B!$F39RMs3S:uE*RVNs$(D0h$B6I(B + + VelocityOneColumnNoActions + One Column Layout with No Page Actions allowed + $B%Z!<%8%"%/%7%g%s$N$J$$(B 1 $BNs%l%$%"%&%H(B ViewPage -- frames -+ columns - - - MaxPage -@@ -514,15 +418,15 @@ + columns +@@ -505,38 +418,36 @@ columns @@ -475,22 +538,25 @@ sizes -- 25%,75% +- 15%,85% + 100% layoutType -- Frame +- TwoColumns + OneColumn org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -532,20 +436,18 @@ +- 0 ++ -1 + + text/html view -- Frame Layout Portlet -- Frame Layout +- Two Columns (15%,85%) No Actions +- 2 Columns 15,85 No Actions + VelocityOneColumn + OneColumn @@ -498,7 +564,7 @@ - - VelocityTwoColumnsTable -- Two Columns Layout Using Velocity And Tables +- Two Columns with Tables - Velocity $B$H%F!<%V%k$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B - $B4pP2(BVelocity$BI=3JE*APNsI[6I(B - $B4p1w(BVelocity$BI=3JE*RVNs$(D0h$B6I(B @@ -513,7 +579,12 @@ MaxPage -@@ -569,20 +471,17 @@ +@@ -556,24 +467,21 @@ + + org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource +- 0 ++ -1 text/html view @@ -521,8 +592,8 @@ - help -- VelocityTwoColumnsTable -- TwoColumnsTable +- Two Columns with Tables +- Two Columns Tables + VelocityTwoColumns + TwoColumns @@ -530,7 +601,7 @@ - - VelocityFourColumns -- Four Layout Using Velocity +- Four Columns - $B4pP2(BVelocity$BI=3JE*(B4$BNsI[6I(B - $B4p1w(BVelocity$BI=3JE*(B4$BNs$(D0h$B6I(B + @@ -540,7 +611,7 @@ ViewPage columns -@@ -593,15 +492,15 @@ +@@ -584,30 +492,29 @@ columns @@ -559,7 +630,8 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -609,14 +508,13 @@ +- 0 ++ -1 text/html view @@ -567,7 +639,7 @@ - help -- VelocityFourColumns +- Four Columns - FourColumns + VelocityThreeColumns + ThreeColumns From shinsuke @ users.sourceforge.jp Thu Mar 8 07:14:31 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:14:31 +0900 Subject: [pal-cvs 2114] CVS-Update: pal-portal/portal/patches/src/webapp/WEB-INF/assembly committed by shinsuke Message-ID: <20070307221431.B6EDE2AC089@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/src/webapp/WEB-INF/assembly In directory sf-cvs:/tmp/cvs-serv16262/portal/patches/src/webapp/WEB-INF/assembly Modified Files: portal-url-generation.xml Log Message: update for 2.1 pal-portal/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml 1.1.1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml.diff?r1=1.1.1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- portal-url-generation.xml 2006/07/16 22:05:39 1.1.1.1 +++ portal-url-generation.xml 2007/03/07 22:14:31 1.2 @@ -1,6 +1,6 @@ Index: src/webapp/WEB-INF/assembly/portal-url-generation.xml =================================================================== ---- src/webapp/WEB-INF/assembly/portal-url-generation.xml (リビジョン 389873) +--- src/webapp/WEB-INF/assembly/portal-url-generation.xml (リビジョン 514361) +++ src/webapp/WEB-INF/assembly/portal-url-generation.xml (作業コピー) @@ -26,7 +26,7 @@ @@ -11,10 +11,10 @@ singleton="false" > -@@ -78,4 +78,4 @@ +@@ -81,4 +81,4 @@ DesktopPortalURL - -\ No newline at end of file +\ ファイルの末尾に改行がありません + From shinsuke @ users.sourceforge.jp Thu Mar 8 07:14:39 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Thu, 8 Mar 2007 07:14:39 +0900 Subject: [pal-cvs 2115] CVS-Update: pal-portal/portal/patches/src/webapp/decorations/portlet committed by shinsuke Message-ID: <20070307221439.6EF962AC0C4@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/src/webapp/decorations/portlet In directory sf-cvs:/tmp/cvs-serv16262/portal/patches/src/webapp/decorations/portlet Modified Files: decorator.vm Log Message: update for 2.1 pal-portal/portal/patches/src/webapp/decorations/portlet/decorator.vm 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/src/webapp/decorations/portlet/decorator.vm.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/patches/src/webapp/decorations/portlet/decorator.vm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- decorator.vm 2006/12/31 00:35:29 1.1 +++ decorator.vm 2007/03/07 22:14:39 1.2 @@ -1,16 +1,13 @@ Index: src/webapp/decorations/portlet/decorator.vm =================================================================== ---- src/webapp/decorations/portlet/decorator.vm (リビジョン 489536) +--- src/webapp/decorations/portlet/decorator.vm (リビジョン 514361) +++ src/webapp/decorations/portlet/decorator.vm (作業コピー) -@@ -44,9 +44,10 @@ - #if (!$solo) -
- #end --
  -+
- $f.renderedContent -
-+   - #if (!$solo) -
- #end +@@ -45,7 +45,7 @@ + #if (!$solo) +
+ #end +-
  ++
+ $f.renderedContent +
+ #if (!$solo) From shinsuke @ users.sourceforge.jp Sat Mar 10 10:05:25 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:05:25 +0900 Subject: [pal-cvs 2116] CVS-Update: pal-portal/installer/etc, NONE, NONE committed by shinsuke Message-ID: <20070310010525.D88802AC198@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc In directory sf-cvs:/tmp/cvs-serv23839/etc Log Message: Directory /cvsroot/pal/pal-portal/installer/etc added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:05:33 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:05:33 +0900 Subject: [pal-cvs 2117] CVS-Update: pal-portal/installer/etc/ant-installer, NONE, NONE committed by shinsuke Message-ID: <20070310010533.7F28B2AC195@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/ant-installer In directory sf-cvs:/tmp/cvs-serv23839/etc/ant-installer Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/ant-installer added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:05:41 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:05:41 +0900 Subject: [pal-cvs 2118] CVS-Update: pal-portal/installer/etc/ant-installer/lib, NONE, NONE committed by shinsuke Message-ID: <20070310010541.1D4892AC198@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/ant-installer/lib In directory sf-cvs:/tmp/cvs-serv23839/etc/ant-installer/lib Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/ant-installer/lib added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:05:48 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:05:48 +0900 Subject: [pal-cvs 2119] CVS-Update: pal-portal/installer/etc/ant-installer/license, NONE, NONE committed by shinsuke Message-ID: <20070310010548.ADE0C2AC196@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/ant-installer/license In directory sf-cvs:/tmp/cvs-serv23839/etc/ant-installer/license Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/ant-installer/license added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:05:56 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:05:56 +0900 Subject: [pal-cvs 2120] CVS-Update: pal-portal/installer/etc/ant-installer/resources, NONE, NONE committed by shinsuke Message-ID: <20070310010556.7C11E2AC18D@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/ant-installer/resources In directory sf-cvs:/tmp/cvs-serv23839/etc/ant-installer/resources Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/ant-installer/resources added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:06:04 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:06:04 +0900 Subject: [pal-cvs 2121] CVS-Update: pal-portal/installer/etc/tomcat, NONE, NONE committed by shinsuke Message-ID: <20070310010604.2334E2AC195@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat In directory sf-cvs:/tmp/cvs-serv23839/etc/tomcat Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/tomcat added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:06:11 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:06:11 +0900 Subject: [pal-cvs 2122] CVS-Update: pal-portal/installer/etc/tomcat/bin, NONE, NONE committed by shinsuke Message-ID: <20070310010611.C3D3F2AC18D@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/bin In directory sf-cvs:/tmp/cvs-serv23839/etc/tomcat/bin Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/tomcat/bin added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:06:19 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:06:19 +0900 Subject: [pal-cvs 2123] CVS-Update: pal-portal/installer/etc/tomcat/logs, NONE, NONE committed by shinsuke Message-ID: <20070310010619.758812AC199@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/logs In directory sf-cvs:/tmp/cvs-serv23839/etc/tomcat/logs Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/tomcat/logs added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:06:27 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:06:27 +0900 Subject: [pal-cvs 2124] CVS-Update: pal-portal/installer/etc/tomcat/webapps, NONE, NONE committed by shinsuke Message-ID: <20070310010627.166F52AC18D@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/webapps In directory sf-cvs:/tmp/cvs-serv23839/etc/tomcat/webapps Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/tomcat/webapps added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:06:34 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:06:34 +0900 Subject: [pal-cvs 2125] CVS-Update: pal-portal/installer/etc/tomcat/webapps/ROOT, NONE, NONE committed by shinsuke Message-ID: <20070310010634.B58912AC196@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/webapps/ROOT In directory sf-cvs:/tmp/cvs-serv23839/etc/tomcat/webapps/ROOT Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/tomcat/webapps/ROOT added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:06:42 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:06:42 +0900 Subject: [pal-cvs 2126] CVS-Update: pal-portal/installer/etc/tomcat/webapps/ROOT/WEB-INF, NONE, NONE committed by shinsuke Message-ID: <20070310010642.7CB632AC195@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/webapps/ROOT/WEB-INF In directory sf-cvs:/tmp/cvs-serv23839/etc/tomcat/webapps/ROOT/WEB-INF Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/tomcat/webapps/ROOT/WEB-INF added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:06:50 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:06:50 +0900 Subject: [pal-cvs 2127] CVS-Update: pal-portal/installer/etc/tomcat/conf, NONE, NONE committed by shinsuke Message-ID: <20070310010650.232502AC196@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/conf In directory sf-cvs:/tmp/cvs-serv23839/etc/tomcat/conf Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/tomcat/conf added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:06:57 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:06:57 +0900 Subject: [pal-cvs 2128] CVS-Update: pal-portal/installer/etc/database, NONE, NONE committed by shinsuke Message-ID: <20070310010657.BFF6B2AC198@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/database In directory sf-cvs:/tmp/cvs-serv23839/etc/database Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/database added to the repository From shinsuke @ users.sourceforge.jp Sat Mar 10 10:15:22 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:15:22 +0900 Subject: [pal-cvs 2129] CVS-Update: pal-portal committed by shinsuke Message-ID: <20070310011522.80D3F2AC195@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal In directory sf-cvs:/tmp/cvs-serv29214 Modified Files: build.properties build.xml Log Message: updated installer pal-portal/build.properties 1.34 -> 1.35 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/build.properties.diff?r1=1.34&r2=1.35 pal-portal/build.xml 1.11 -> 1.12 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/build.xml.diff?r1=1.11&r2=1.12 =================================================================== RCS file: pal-portal/build.properties,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- build.properties 2007/03/07 22:13:32 1.34 +++ build.properties 2007/03/10 01:15:22 1.35 @@ -23,6 +23,8 @@ installer.dir=${basedir}/installer installer.resources.dir=${installer.dir}/resources +installer.target.dir=${installer.dir}/target +installer.portlets.dir=${installer.target.dir}/portlets dist.name.prefix=PALPortal dist.dir=${basedir}/dist dist.build.dir=${dist.dir}/build @@ -64,27 +66,28 @@ jetspeed2.revision=514361 # Dependencies for Jetspeed -jetspeed.version=2.1-dev +jetspeed.version=2.1 pluto.version=1.0.1 portlet.api.version=1.0 servlet.api.version=2.3 myfaces.version=1.1.0 bridges.groupId=org.apache.portals.bridges -portals.bridges.version=1.0 -portals.bridges.common.version=1.0.1-dev -portals.bridges.frameworks.version=1.0.1-dev -portals.bridges.jsf.version=1.0 -portals.bridges.perl.version=1.0 -portals.bridges.php.version=1.0 -portals.bridges.struts.version=1.2.7-1.0 -portals.bridges.jpetstore.version=1.0 -portals.bridges.velocity.version=1.0.1-dev +portals.bridges.version=1.0.1 +portals.bridges.common.version=1.0.1 +portals.bridges.frameworks.version=1.0.1 +portals.bridges.jsf.version=1.0.1 +portals.bridges.perl.version=1.0.1 +portals.bridges.php.version=1.0.1 +portals.bridges.struts.version=1.2.7-1.0.1 +portals.bridges.jpetstore.version=1.0.1 +portals.bridges.velocity.version=1.0.1 +portals.bridges.portletfilter.version=1.0.1 commons.logging.version=1.0.3 spring.version=2.0 spring.modules.version=0.6 derby.version=10.1.1.0 hsql.version=1.8.0.2 -spring.modules.version=0.6 + jetspeed2.build.options=\ @@ -104,6 +107,7 @@ -Dportals.bridges.php.version="${portals.bridges.php.version}" \ -Dportals.bridges.struts.version="${portals.bridges.struts.version}" \ -Dportals.bridges.velocity.version="${portals.bridges.velocity.version}" \ +-Dportals.bridges.portletfilter.version="${portals.bridges.portletfilter.version}" \ -Dcommons.logging.version="${commons.logging.version}" \ -Dderby.version="${derby.version}" \ -Dhsql.version="${hsql.version}" \ @@ -141,6 +145,16 @@ -Dorg.apache.jetspeed.production.database.password=${org.apache.jetspeed.production.database.password} \ -Dorg.apache.jetspeed.production.jdbc.drivers.path=${org.apache.jetspeed.production.jdbc.drivers.path} \ +jetspeed2.installer.options=\ +-Dportal.dir="${portal.dir}" \ +-Dorg.apache.jetspeed.portal.groupId="${org.apache.jetspeed.portal.groupId}" \ +-Dorg.apache.jetspeed.portal.artifactId="${org.apache.jetspeed.portal.artifactId}" \ +-Dorg.apache.jetspeed.portal.name="${org.apache.jetspeed.portal.name}" \ +-Dorg.apache.jetspeed.portal.currentVersion="${org.apache.jetspeed.portal.currentVersion}" \ +-Ddist.name.prefix="${dist.name.prefix}" \ +-Djetspeed.version="${jetspeed.version}" \ +-Dportal.psml.dir="${portal.psml.dir}" \ +-Dportal.psml.name="${portal.psml.name}" \ portal.patch.files=\ applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java,\ @@ -178,6 +192,9 @@ # Portlets # portlets.list=\ +jp/sf/pal/cms-portlets,\ + +# Portlet List jp/sf/pal/jstock,\ jp/sf/pal/webparts,\ jp/sf/pal/blog,\ @@ -192,11 +209,7 @@ jp/sf/pal/jsfhelloworld,\ jp/sf/pal/teeda-ajax-portlet,\ jp/sf/pal/charttest,\ -jp/sf/pal/cms-portlets,\ jp/sf/pal/s2helloworld,\ - - -# Portlet List jp/sf/pal/googlegadgets,\ jp/sf/pal/blogparts,\ com/sun/portal/bookmarkportlet,\ =================================================================== RCS file: pal-portal/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- build.xml 2007/03/07 07:05:13 1.11 +++ build.xml 2007/03/10 01:15:22 1.12 @@ -197,7 +197,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -216,25 +216,17 @@ - - + - - - - + - - - - - + Update of /cvsroot/pal/pal-portal/installer In directory sf-cvs:/tmp/cvs-serv29214/installer Added Files: build.xml maven.xml project.xml Removed Files: build-installer.xml Log Message: updated installer pal-portal/installer/build-installer.xml 1.8 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/build-installer.xml?rev=1.8&content-type=text/vnd.viewcvs-markup pal-portal/installer/build.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/build.xml?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/maven.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/maven.xml?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/project.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/project.xml?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:15:38 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:15:38 +0900 Subject: [pal-cvs 2131] CVS-Update: pal-portal/installer/etc/ant-installer committed by shinsuke Message-ID: <20070310011538.C8B8F2AC198@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/ant-installer In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/ant-installer Added Files: antinstall-config.xml build.xml Log Message: updated installer pal-portal/installer/etc/ant-installer/antinstall-config.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/antinstall-config.xml?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/ant-installer/build.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/build.xml?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:15:46 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:15:46 +0900 Subject: [pal-cvs 2132] CVS-Update: pal-portal/installer/etc/ant-installer/lib committed by shinsuke Message-ID: <20070310011546.93D632AC196@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/ant-installer/lib In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/ant-installer/lib Added Files: ai-icons-eclipse.jar ant-installer.jar ant-launcher.jar ant.jar jgoodies-edited-1_2_2.jar xml-apis.jar Log Message: updated installer pal-portal/installer/etc/ant-installer/lib/ai-icons-eclipse.jar NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/lib/ai-icons-eclipse.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/ant-installer/lib/ant-installer.jar NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/lib/ant-installer.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/ant-installer/lib/ant-launcher.jar NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/lib/ant-launcher.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/ant-installer/lib/ant.jar NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/lib/ant.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/ant-installer/lib/jgoodies-edited-1_2_2.jar NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/lib/jgoodies-edited-1_2_2.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/ant-installer/lib/xml-apis.jar NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/lib/xml-apis.jar?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:15:54 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:15:54 +0900 Subject: [pal-cvs 2133] CVS-Update: pal-portal/installer/etc/ant-installer/license committed by shinsuke Message-ID: <20070310011554.854172AC195@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/ant-installer/license In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/ant-installer/license Added Files: LICENSE-dom.txt LICENSE-jgoodies.txt LICENSE-xerces.txt Log Message: updated installer pal-portal/installer/etc/ant-installer/license/LICENSE-dom.txt NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/license/LICENSE-dom.txt?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/ant-installer/license/LICENSE-jgoodies.txt NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/license/LICENSE-jgoodies.txt?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/ant-installer/license/LICENSE-xerces.txt NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/license/LICENSE-xerces.txt?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:16:02 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:16:02 +0900 Subject: [pal-cvs 2134] CVS-Update: pal-portal/installer/etc/ant-installer/resources committed by shinsuke Message-ID: <20070310011602.DF3562AC195@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/ant-installer/resources In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/ant-installer/resources Added Files: feather-small.png palportal.gif Log Message: updated installer pal-portal/installer/etc/ant-installer/resources/feather-small.png NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/resources/feather-small.png?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/ant-installer/resources/palportal.gif NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/resources/palportal.gif?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:16:10 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:16:10 +0900 Subject: [pal-cvs 2135] CVS-Update: pal-portal/installer/etc/database committed by shinsuke Message-ID: <20070310011610.BB1D22AC198@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/database In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/database Added Files: build.xml database.properties.template Log Message: updated installer pal-portal/installer/etc/database/build.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/database/build.xml?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/database/database.properties.template NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/database/database.properties.template?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:16:18 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:16:18 +0900 Subject: [pal-cvs 2136] CVS-Update: pal-portal/installer/etc/tomcat/bin committed by shinsuke Message-ID: <20070310011618.7BBDF2AC19A@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/bin In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/tomcat/bin Added Files: catalina.bat catalina.sh Log Message: updated installer pal-portal/installer/etc/tomcat/bin/catalina.bat NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/tomcat/bin/catalina.bat?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/tomcat/bin/catalina.sh NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/tomcat/bin/catalina.sh?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:16:26 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:16:26 +0900 Subject: [pal-cvs 2137] CVS-Update: pal-portal/installer/etc/tomcat/conf committed by shinsuke Message-ID: <20070310011626.90E482AC198@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/conf In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/tomcat/conf Added Files: context.xml server.xml tomcat-users.xml Log Message: updated installer pal-portal/installer/etc/tomcat/conf/context.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/tomcat/conf/context.xml?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/tomcat/conf/server.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/tomcat/conf/server.xml?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/etc/tomcat/conf/tomcat-users.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/tomcat/conf/tomcat-users.xml?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:16:34 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:16:34 +0900 Subject: [pal-cvs 2138] CVS-Update: pal-portal/installer/etc/tomcat/logs committed by shinsuke Message-ID: <20070310011634.51EDD2AC196@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/logs In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/tomcat/logs Added Files: catalina.out Log Message: updated installer pal-portal/installer/etc/tomcat/logs/catalina.out NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/tomcat/logs/catalina.out?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:16:42 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:16:42 +0900 Subject: [pal-cvs 2139] CVS-Update: pal-portal/installer/etc/tomcat/webapps/ROOT committed by shinsuke Message-ID: <20070310011642.2DDE22AC195@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/webapps/ROOT In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/tomcat/webapps/ROOT Added Files: index.jsp Log Message: updated installer pal-portal/installer/etc/tomcat/webapps/ROOT/index.jsp NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/tomcat/webapps/ROOT/index.jsp?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:16:49 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:16:49 +0900 Subject: [pal-cvs 2140] CVS-Update: pal-portal/installer/etc/tomcat/webapps/ROOT/WEB-INF committed by shinsuke Message-ID: <20070310011649.ED8882AC19D@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/webapps/ROOT/WEB-INF In directory sf-cvs:/tmp/cvs-serv29214/installer/etc/tomcat/webapps/ROOT/WEB-INF Added Files: web.xml Log Message: updated installer pal-portal/installer/etc/tomcat/webapps/ROOT/WEB-INF/web.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/tomcat/webapps/ROOT/WEB-INF/web.xml?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:16:57 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:16:57 +0900 Subject: [pal-cvs 2141] CVS-Update: pal-portal/installer/resources committed by shinsuke Message-ID: <20070310011657.C508B2AC198@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/resources In directory sf-cvs:/tmp/cvs-serv29214/installer/resources Removed Files: administration.xml antinstall-config-derby.xml antinstall-config-multi.xml build.xml catalina.bat catalina.sh server.xml tomcat-users.xml Log Message: updated installer pal-portal/installer/resources/administration.xml 1.2 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/administration.xml?rev=1.2&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/antinstall-config-derby.xml 1.4 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/antinstall-config-derby.xml?rev=1.4&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/antinstall-config-multi.xml 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/antinstall-config-multi.xml?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/build.xml 1.4 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/build.xml?rev=1.4&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/catalina.bat 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/catalina.bat?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/catalina.sh 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/catalina.sh?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/server.xml 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/server.xml?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/tomcat-users.xml 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/tomcat-users.xml?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:17:05 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:17:05 +0900 Subject: [pal-cvs 2142] CVS-Update: pal-portal/installer/resources/installclasspath/resources committed by shinsuke Message-ID: <20070310011705.9B20C2AC199@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/resources/installclasspath/resources In directory sf-cvs:/tmp/cvs-serv29214/installer/resources/installclasspath/resources Removed Files: LICENSE.TXT feather-small.png palportal.gif Log Message: updated installer pal-portal/installer/resources/installclasspath/resources/LICENSE.TXT 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installclasspath/resources/LICENSE.TXT?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installclasspath/resources/feather-small.png 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installclasspath/resources/feather-small.png?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installclasspath/resources/palportal.gif 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installclasspath/resources/palportal.gif?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:17:13 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:17:13 +0900 Subject: [pal-cvs 2143] CVS-Update: pal-portal/installer/resources/installlib committed by shinsuke Message-ID: <20070310011713.C62E12AC199@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/resources/installlib In directory sf-cvs:/tmp/cvs-serv29214/installer/resources/installlib Removed Files: LICENSE-ant-install.txt LICENSE-ant.txt LICENSE-dom.txt LICENSE-jgoodies.txt LICENSE-sax.txt LICENSE-sysout.txt LICENSE-xerces.txt ant-ext.jar ant-installer.jar ant-launcher.jar ant.jar derby-10.1.1.0.jar jgoodies-edited-1_2_2.jar sysout.jar xercesImpl.jar xml-apis.jar Log Message: updated installer pal-portal/installer/resources/installlib/LICENSE-ant-install.txt 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/LICENSE-ant-install.txt?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/LICENSE-ant.txt 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/LICENSE-ant.txt?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/LICENSE-dom.txt 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/LICENSE-dom.txt?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/LICENSE-jgoodies.txt 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/LICENSE-jgoodies.txt?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/LICENSE-sax.txt 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/LICENSE-sax.txt?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/LICENSE-sysout.txt 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/LICENSE-sysout.txt?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/LICENSE-xerces.txt 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/LICENSE-xerces.txt?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/ant-ext.jar 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/ant-ext.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/ant-installer.jar 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/ant-installer.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/ant-launcher.jar 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/ant-launcher.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/ant.jar 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/ant.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/derby-10.1.1.0.jar 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/derby-10.1.1.0.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/jgoodies-edited-1_2_2.jar 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/jgoodies-edited-1_2_2.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/sysout.jar 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/sysout.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/xercesImpl.jar 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/xercesImpl.jar?rev=1.1&content-type=text/vnd.viewcvs-markup pal-portal/installer/resources/installlib/xml-apis.jar 1.1 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/resources/installlib/xml-apis.jar?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sat Mar 10 10:17:21 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sat, 10 Mar 2007 10:17:21 +0900 Subject: [pal-cvs 2144] CVS-Update: pal-portal/portlets committed by shinsuke Message-ID: <20070310011721.17C212AC19B@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portlets In directory sf-cvs:/tmp/cvs-serv29214/portlets Modified Files: build.xml Log Message: updated installer pal-portal/portlets/build.xml 1.6 -> 1.7 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portlets/build.xml.diff?r1=1.6&r2=1.7 =================================================================== RCS file: pal-portal/portlets/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build.xml 2006/12/17 00:09:40 1.6 +++ build.xml 2007/03/10 01:17:21 1.7 @@ -229,7 +229,7 @@ value="${portlets.resource.dir}/@{portlet}.properties" /> + value="${installer.portlets.dir}" /> From shinsuke @ users.sourceforge.jp Sun Mar 11 08:12:10 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 08:12:10 +0900 Subject: [pal-cvs 2145] CVS-Update: pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/portalmanagement committed by shinsuke Message-ID: <20070310231210.170342AC3C5@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/portalmanagement In directory sf-cvs:/tmp/cvs-serv30723/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/portalmanagement Modified Files: folder.metadata Added Files: rpad.psml Log Message: added rpad pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/portalmanagement/folder.metadata 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/portalmanagement/folder.metadata.diff?r1=1.1&r2=1.2 pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/portalmanagement/rpad.psml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/portalmanagement/rpad.psml?rev=1.1&content-type=text/vnd.viewcvs-markup =================================================================== RCS file: pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/portalmanagement/folder.metadata,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- folder.metadata 2007/01/14 01:58:31 1.1 +++ folder.metadata 2007/03/10 23:12:09 1.2 @@ -5,9 +5,8 @@ palm.psml pam.psml - sso-admin.psml + rpad.psml site.psml - profiler.psml From shinsuke @ users.sourceforge.jp Sun Mar 11 08:12:46 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 08:12:46 +0900 Subject: [pal-cvs 2146] CVS-Update: pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/usermanagement committed by shinsuke Message-ID: <20070310231246.5E0632AC3C6@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/usermanagement In directory sf-cvs:/tmp/cvs-serv30796/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/usermanagement Modified Files: folder.metadata Log Message: added profiler to order pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/usermanagement/folder.metadata 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/usermanagement/folder.metadata.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/resources/psml/1.0-beta4/_user/admin/_mediatype/html/usermanagement/folder.metadata,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- folder.metadata 2007/01/14 01:58:31 1.1 +++ folder.metadata 2007/03/10 23:12:46 1.2 @@ -6,6 +6,7 @@ user-mgt.psml role-mgt.psml group-mgt.psml + profiler.psml From shinsuke @ users.sourceforge.jp Sun Mar 11 08:13:51 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 08:13:51 +0900 Subject: [pal-cvs 2147] CVS-Update: pal-portal/portal/resources/psml/1.0-beta4 committed by shinsuke Message-ID: <20070310231351.0F3322AC3C3@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/resources/psml/1.0-beta4 In directory sf-cvs:/tmp/cvs-serv31132/portal/resources/psml/1.0-beta4 Modified Files: my-account.psml Log Message: sync up with the latest one pal-portal/portal/resources/psml/1.0-beta4/my-account.psml 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/resources/psml/1.0-beta4/my-account.psml.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/resources/psml/1.0-beta4/my-account.psml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- my-account.psml 2007/01/14 01:58:31 1.1 +++ my-account.psml 2007/03/10 23:13:50 1.2 @@ -1,19 +1,26 @@ -
From shinsuke @ users.sourceforge.jp Sun Mar 11 23:10:50 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 23:10:50 +0900 Subject: [pal-cvs 2155] CVS-Update: pal-portal/installer/etc/tomcat/temp, NONE, NONE committed by shinsuke Message-ID: <20070311141050.5FC792AC4A9@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/temp In directory sf-cvs:/tmp/cvs-serv8987/installer/etc/tomcat/temp Log Message: Directory /cvsroot/pal/pal-portal/installer/etc/tomcat/temp added to the repository From shinsuke @ users.sourceforge.jp Sun Mar 11 23:14:37 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 23:14:37 +0900 Subject: [pal-cvs 2156] CVS-Update: pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF committed by shinsuke Message-ID: <20070311141437.B9F602AC4A4@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF In directory sf-cvs:/tmp/cvs-serv11197/portal/patches/applications/j2-admin/src/webapp/WEB-INF Modified Files: portlet.xml Log Message: enabled SendEmail pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml.diff?r1=1.2&r2=1.3 =================================================================== RCS file: pal-portal/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- portlet.xml 2007/03/07 22:13:57 1.2 +++ portlet.xml 2007/03/11 14:14:37 1.3 @@ -11,3 +11,12 @@ This option will force email address to be system wide unique +@@ -1162,7 +1162,7 @@ + + + SendEmail +- false ++ true + + +
From shinsuke @ users.sourceforge.jp Sun Mar 11 23:15:22 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 23:15:22 +0900 Subject: [pal-cvs 2157] CVS-Update: pal-portal/portal/patches/etc/sql/min committed by shinsuke Message-ID: <20070311141523.045E72AC4A8@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/etc/sql/min In directory sf-cvs:/tmp/cvs-serv11351/portal/patches/etc/sql/min Modified Files: j2-seed.xml Log Message: modified Permissions and ProfilingRule pal-portal/portal/patches/etc/sql/min/j2-seed.xml 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/etc/sql/min/j2-seed.xml.diff?r1=1.2&r2=1.3 =================================================================== RCS file: pal-portal/portal/patches/etc/sql/min/j2-seed.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- j2-seed.xml 2007/03/10 23:20:43 1.2 +++ j2-seed.xml 2007/03/11 14:15:22 1.3 @@ -39,7 +39,7 @@ user,dev,devmgr -@@ -295,6 +299,17 @@ +@@ -295,8 +299,35 @@ @@ -56,8 +56,52 @@ + ++ ++ user,guest ++ ++ ++ ++ ++ user ++ ++ ++ ++ ++ admin ++ ++ ++ ++ -@@ -500,5 +515,32 @@ + admin + +@@ -369,6 +400,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -379,12 +416,6 @@ + + + +- +- +- +- +- +- + + + +@@ -500,5 +531,32 @@ From shinsuke @ users.sourceforge.jp Sun Mar 11 23:16:23 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 23:16:23 +0900 Subject: [pal-cvs 2158] CVS-Update: pal-portal/installer/etc/tomcat/temp committed by shinsuke Message-ID: <20070311141623.400D82AC4A9@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/tomcat/temp In directory sf-cvs:/tmp/cvs-serv12334/installer/etc/tomcat/temp Added Files: administration.xml Log Message: added mail configuration pal-portal/installer/etc/tomcat/temp/administration.xml NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/tomcat/temp/administration.xml?rev=1.1&content-type=text/vnd.viewcvs-markup From shinsuke @ users.sourceforge.jp Sun Mar 11 23:16:31 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 23:16:31 +0900 Subject: [pal-cvs 2159] CVS-Update: pal-portal/installer/etc/ant-installer committed by shinsuke Message-ID: <20070311141631.5C1C02AC4A8@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/installer/etc/ant-installer In directory sf-cvs:/tmp/cvs-serv12334/installer/etc/ant-installer Modified Files: build.xml antinstall-config.xml Log Message: added mail configuration pal-portal/installer/etc/ant-installer/build.xml 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/build.xml.diff?r1=1.1&r2=1.2 pal-portal/installer/etc/ant-installer/antinstall-config.xml 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/installer/etc/ant-installer/antinstall-config.xml.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/installer/etc/ant-installer/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.xml 2007/03/10 01:15:38 1.1 +++ build.xml 2007/03/11 14:16:31 1.2 @@ -80,4 +80,19 @@ + + starting Mail server configuration + + + + + + + + + + Mail server configuration done! + + =================================================================== RCS file: pal-portal/installer/etc/ant-installer/antinstall-config.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- antinstall-config.xml 2007/03/10 01:15:38 1.1 +++ antinstall-config.xml 2007/03/11 14:16:31 1.2 @@ -44,6 +44,8 @@ + @@ -198,6 +200,17 @@ + + + + + + + + + + From shinsuke @ users.sourceforge.jp Sun Mar 11 23:17:25 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 23:17:25 +0900 Subject: [pal-cvs 2160] CVS-Update: pal-portal/portal/resources/psml/1.0-beta4/_user/template/_mediatype/html committed by shinsuke Message-ID: <20070311141725.6C4E82AC4AD@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/resources/psml/1.0-beta4/_user/template/_mediatype/html In directory sf-cvs:/tmp/cvs-serv12497/portal/resources/psml/1.0-beta4/_user/template/_mediatype/html Modified Files: default-page.psml Log Message: removed unavailable portlets pal-portal/portal/resources/psml/1.0-beta4/_user/template/_mediatype/html/default-page.psml 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/resources/psml/1.0-beta4/_user/template/_mediatype/html/default-page.psml.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/resources/psml/1.0-beta4/_user/template/_mediatype/html/default-page.psml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- default-page.psml 2007/01/14 01:58:32 1.1 +++ default-page.psml 2007/03/11 14:17:25 1.2 @@ -25,26 +25,9 @@ ホーム - - - - - - - - - - - - - - - - - - - - + + + From shinsuke @ users.sourceforge.jp Sun Mar 11 23:18:33 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Sun, 11 Mar 2007 23:18:33 +0900 Subject: [pal-cvs 2161] CVS-Update: pal-portal/portal/resources/psml/1.0-beta4/system/customizer committed by shinsuke Message-ID: <20070311141833.1C0BB2AC4AC@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/resources/psml/1.0-beta4/system/customizer In directory sf-cvs:/tmp/cvs-serv13303/portal/resources/psml/1.0-beta4/system/customizer Modified Files: folder.metadata selector.psml Log Message: updated selecotor psml pal-portal/portal/resources/psml/1.0-beta4/system/customizer/folder.metadata 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/resources/psml/1.0-beta4/system/customizer/folder.metadata.diff?r1=1.1&r2=1.2 pal-portal/portal/resources/psml/1.0-beta4/system/customizer/selector.psml 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/resources/psml/1.0-beta4/system/customizer/selector.psml.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/resources/psml/1.0-beta4/system/customizer/folder.metadata,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- folder.metadata 2007/01/14 01:58:32 1.1 +++ folder.metadata 2007/03/11 14:18:32 1.2 @@ -1,9 +1,11 @@ - -@@ -377,6 +396,7 @@ +@@ -393,6 +412,7 @@ @@ -100,7 +100,7 @@ user -@@ -437,6 +457,7 @@ +@@ -453,6 +473,7 @@ subsite2 @@ -108,7 +108,7 @@ admin -@@ -452,6 +473,7 @@ +@@ -468,6 +489,7 @@ @@ -116,7 +116,7 @@ guest -@@ -462,6 +484,7 @@ +@@ -478,6 +500,7 @@ @@ -124,7 +124,7 @@ admin -@@ -472,11 +495,13 @@ +@@ -488,11 +511,13 @@ @@ -138,7 +138,7 @@ -@@ -616,6 +641,7 @@ +@@ -632,6 +657,7 @@ @@ -146,7 +146,7 @@ -@@ -660,6 +686,7 @@ +@@ -676,6 +702,7 @@ @@ -154,7 +154,7 @@ -@@ -714,5 +741,32 @@ +@@ -730,5 +757,32 @@ From shinsuke @ users.sourceforge.jp Tue Mar 27 16:38:11 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Tue, 27 Mar 2007 16:38:11 +0900 Subject: [pal-cvs 2175] CVS-Update: pal-portal/portal/patches/etc/sql/min committed by shinsuke Message-ID: <20070327073811.BEF832AC020@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/etc/sql/min In directory sf-cvs:/tmp/cvs-serv18981/portal/patches/etc/sql/min Modified Files: j2-seed.xml Log Message: updated to the latest j2 version pal-portal/portal/patches/etc/sql/min/j2-seed.xml 1.3 -> 1.4 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/etc/sql/min/j2-seed.xml.diff?r1=1.3&r2=1.4 =================================================================== RCS file: pal-portal/portal/patches/etc/sql/min/j2-seed.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- j2-seed.xml 2007/03/11 14:15:22 1.3 +++ j2-seed.xml 2007/03/27 07:38:11 1.4 @@ -1,8 +1,8 @@ Index: etc/sql/min/j2-seed.xml =================================================================== ---- etc/sql/min/j2-seed.xml (リビジョン 514361) +--- etc/sql/min/j2-seed.xml (リビジョン 519203) +++ etc/sql/min/j2-seed.xml (作業コピー) -@@ -245,14 +245,17 @@ +@@ -261,14 +261,17 @@ admin guest user @@ -21,7 +21,7 @@ user,admin -@@ -269,14 +272,15 @@ +@@ -285,14 +288,15 @@ @@ -39,7 +39,7 @@ user,dev,devmgr -@@ -295,8 +299,35 @@ +@@ -311,8 +315,35 @@ @@ -75,7 +75,7 @@ admin -@@ -369,6 +400,12 @@ +@@ -385,6 +416,12 @@ @@ -88,7 +88,7 @@ -@@ -379,12 +416,6 @@ +@@ -395,12 +432,6 @@ @@ -101,7 +101,7 @@ -@@ -500,5 +531,32 @@ +@@ -516,5 +547,32 @@ From shinsuke @ users.sourceforge.jp Tue Mar 27 16:38:19 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Tue, 27 Mar 2007 16:38:19 +0900 Subject: [pal-cvs 2176] CVS-Update: pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF committed by shinsuke Message-ID: <20070327073819.AB8DE2AC01A@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF In directory sf-cvs:/tmp/cvs-serv18981/portal/patches/layout-portlets/src/webapp/WEB-INF Modified Files: portlet.xml Log Message: updated to the latest j2 version pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml 1.4 -> 1.5 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml.diff?r1=1.4&r2=1.5 =================================================================== RCS file: pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- portlet.xml 2007/03/14 22:10:57 1.4 +++ portlet.xml 2007/03/27 07:38:19 1.5 @@ -1,8 +1,8 @@ Index: layout-portlets/src/webapp/WEB-INF/portlet.xml =================================================================== ---- layout-portlets/src/webapp/WEB-INF/portlet.xml (リビジョン 514361) +--- layout-portlets/src/webapp/WEB-INF/portlet.xml (リビジョン 519203) +++ layout-portlets/src/webapp/WEB-INF/portlet.xml (作業コピー) -@@ -16,38 +16,10 @@ +@@ -18,38 +18,10 @@ @@ -44,7 +44,7 @@ ViewPage columns -@@ -78,58 +50,15 @@ +@@ -80,58 +52,15 @@ help @@ -106,7 +106,7 @@ ViewPage columns -@@ -150,10 +79,6 @@ +@@ -152,10 +81,6 @@ layoutType TwoColumns @@ -117,7 +117,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource 0 -@@ -164,17 +89,15 @@ +@@ -166,17 +91,15 @@ help @@ -140,7 +140,7 @@ ViewPage columns -@@ -189,7 +112,7 @@ +@@ -191,7 +114,7 @@ sizes @@ -149,7 +149,7 @@ layoutType -@@ -202,21 +125,18 @@ +@@ -204,21 +127,18 @@ text/html view edit @@ -178,7 +178,7 @@ ViewPage columns -@@ -227,15 +147,15 @@ +@@ -229,15 +149,15 @@ columns @@ -197,7 +197,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -244,23 +164,21 @@ +@@ -246,23 +166,21 @@ text/html view edit @@ -229,7 +229,7 @@ MaxPage -@@ -268,15 +186,15 @@ +@@ -270,15 +188,15 @@ columns @@ -248,7 +248,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -285,20 +203,18 @@ +@@ -287,20 +205,18 @@ text/html view edit @@ -276,7 +276,7 @@ ViewPage columns -@@ -309,15 +225,15 @@ +@@ -311,15 +227,15 @@ columns @@ -295,7 +295,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -325,19 +241,19 @@ +@@ -327,19 +243,19 @@ text/html view @@ -323,7 +323,7 @@ ViewPage columns -@@ -348,15 +264,15 @@ +@@ -350,15 +266,15 @@ columns @@ -342,7 +342,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -364,19 +280,19 @@ +@@ -366,19 +282,19 @@ text/html view @@ -370,7 +370,7 @@ ViewPage columns -@@ -391,7 +307,7 @@ +@@ -393,7 +309,7 @@ sizes @@ -379,7 +379,7 @@ layoutType -@@ -403,18 +319,19 @@ +@@ -405,18 +321,19 @@ text/html view @@ -407,7 +407,7 @@ ViewPage columns -@@ -425,15 +342,15 @@ +@@ -427,15 +344,15 @@ columns @@ -426,7 +426,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -441,22 +358,22 @@ +@@ -443,22 +360,22 @@ text/html view @@ -459,7 +459,7 @@ MaxPage -@@ -472,7 +389,7 @@ +@@ -474,7 +391,7 @@ layoutType @@ -468,7 +468,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -480,21 +397,17 @@ +@@ -482,21 +399,17 @@ text/html view @@ -497,7 +497,7 @@ ViewPage columns -@@ -505,15 +418,15 @@ +@@ -507,15 +420,15 @@ columns @@ -516,7 +516,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -523,20 +436,18 @@ +@@ -525,20 +438,18 @@ view @@ -544,7 +544,7 @@ MaxPage -@@ -560,20 +471,17 @@ +@@ -562,20 +473,17 @@ text/html view @@ -571,7 +571,7 @@ ViewPage columns -@@ -584,15 +492,15 @@ +@@ -586,15 +494,15 @@ columns @@ -590,7 +590,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -600,14 +508,13 @@ +@@ -602,14 +510,13 @@ text/html view From shinsuke @ users.sourceforge.jp Tue Mar 27 16:38:28 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Tue, 27 Mar 2007 16:38:28 +0900 Subject: [pal-cvs 2177] CVS-Update: pal-portal/portal/patches/src/webapp/WEB-INF/assembly committed by shinsuke Message-ID: <20070327073828.230002AC031@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/src/webapp/WEB-INF/assembly In directory sf-cvs:/tmp/cvs-serv18981/portal/patches/src/webapp/WEB-INF/assembly Modified Files: portal-url-generation.xml Log Message: updated to the latest j2 version pal-portal/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml.diff?r1=1.2&r2=1.3 =================================================================== RCS file: pal-portal/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- portal-url-generation.xml 2007/03/07 22:14:31 1.2 +++ portal-url-generation.xml 2007/03/27 07:38:27 1.3 @@ -1,8 +1,8 @@ Index: src/webapp/WEB-INF/assembly/portal-url-generation.xml =================================================================== ---- src/webapp/WEB-INF/assembly/portal-url-generation.xml (リビジョン 514361) +--- src/webapp/WEB-INF/assembly/portal-url-generation.xml (リビジョン 519203) +++ src/webapp/WEB-INF/assembly/portal-url-generation.xml (作業コピー) -@@ -26,7 +26,7 @@ +@@ -27,7 +27,7 @@ -@@ -81,4 +81,4 @@ +@@ -82,4 +82,4 @@ DesktopPortalURL From shinsuke @ users.sourceforge.jp Tue Mar 27 16:38:35 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Tue, 27 Mar 2007 16:38:35 +0900 Subject: [pal-cvs 2178] CVS-Update: pal-portal/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized committed by shinsuke Message-ID: <20070327073835.C64462AC01A@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized In directory sf-cvs:/tmp/cvs-serv18981/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized Modified Files: layout.vm Log Message: updated to the latest j2 version pal-portal/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm.diff?r1=1.1&r2=1.2 =================================================================== RCS file: pal-portal/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- layout.vm 2006/10/05 23:14:52 1.1 +++ layout.vm 2007/03/27 07:38:35 1.2 @@ -1,9 +1,9 @@ Index: src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm =================================================================== ---- src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (リビジョン 453273) +--- src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (リビジョン 519203) +++ src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (作業コピー) @@ -1,4 +1,3 @@ - #* - Copyright 2004 The Apache Software Foundation - + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with From shinsuke @ users.sourceforge.jp Tue Mar 27 16:38:43 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Tue, 27 Mar 2007 16:38:43 +0900 Subject: [pal-cvs 2179] CVS-Update: pal-portal/portal/patches/src/webapp/WEB-INF/templates/login/html committed by shinsuke Message-ID: <20070327073843.970C22AC020@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/src/webapp/WEB-INF/templates/login/html In directory sf-cvs:/tmp/cvs-serv18981/portal/patches/src/webapp/WEB-INF/templates/login/html Modified Files: login.jsp Log Message: updated to the latest j2 version pal-portal/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp.diff?r1=1.2&r2=1.3 =================================================================== RCS file: pal-portal/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- login.jsp 2006/09/28 13:22:06 1.2 +++ login.jsp 2007/03/27 07:38:43 1.3 @@ -1,8 +1,8 @@ Index: src/webapp/WEB-INF/templates/login/html/login.jsp =================================================================== ---- src/webapp/WEB-INF/templates/login/html/login.jsp (リビジョン 450196) +--- src/webapp/WEB-INF/templates/login/html/login.jsp (リビジョン 519203) +++ src/webapp/WEB-INF/templates/login/html/login.jsp (作業コピー) -@@ -18,13 +18,92 @@ +@@ -19,13 +19,92 @@ From shinsuke @ users.sourceforge.jp Tue Mar 27 16:38:51 2007 From: shinsuke @ users.sourceforge.jp (Shinsuke SUGAYA) Date: Tue, 27 Mar 2007 16:38:51 +0900 Subject: [pal-cvs 2180] CVS-Update: pal-portal/portal/patches/src/webapp/decorations/portlet committed by shinsuke Message-ID: <20070327073851.772F72AC01A@users.sourceforge.jp> Update of /cvsroot/pal/pal-portal/portal/patches/src/webapp/decorations/portlet In directory sf-cvs:/tmp/cvs-serv18981/portal/patches/src/webapp/decorations/portlet Modified Files: decorator.vm Log Message: updated to the latest j2 version pal-portal/portal/patches/src/webapp/decorations/portlet/decorator.vm 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/src/webapp/decorations/portlet/decorator.vm.diff?r1=1.2&r2=1.3 =================================================================== RCS file: pal-portal/portal/patches/src/webapp/decorations/portlet/decorator.vm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- decorator.vm 2007/03/07 22:14:39 1.2 +++ decorator.vm 2007/03/27 07:38:51 1.3 @@ -1,8 +1,8 @@ Index: src/webapp/decorations/portlet/decorator.vm =================================================================== ---- src/webapp/decorations/portlet/decorator.vm (リビジョン 514361) +--- src/webapp/decorations/portlet/decorator.vm (リビジョン 519203) +++ src/webapp/decorations/portlet/decorator.vm (作業コピー) -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ #if (!$solo)
#end