[pal-cvs 2417] [149] sync up with the latest j2.

svnno****@sourc***** svnno****@sourc*****
2007年 5月 18日 (金) 16:39:12 JST


Revision: 149
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=149
Author:   shinsuke
Date:     2007-05-18 16:39:12 +0900 (Fri, 18 May 2007)

Log Message:
-----------
sync up with the latest j2.

Modified Paths:
--------------
    pal-portal/trunk/build.properties
    pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/decorator-macros.vm
    pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml


-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties	2007-05-14 12:20:41 UTC (rev 148)
+++ pal-portal/trunk/build.properties	2007-05-18 07:39:12 UTC (rev 149)
@@ -63,14 +63,14 @@
 org.apache.jetspeed.portal.currentVersion=${portal.version}
 
 # Jetspeed SVN revision
-jetspeed2.revision=534972
+jetspeed2.revision=539124
 
 # Dependencies for Jetspeed
 jetspeed.version=2.2-dev_pal-${portal.version}
 pluto.version=1.0.1
 portlet.api.version=1.0
 servlet.api.version=2.3
-myfaces.version=1.1.0
+myfaces.version=1.1.5
 bridges.groupId=org.apache.portals.bridges
 portals.bridges.version=1.0.2-RC
 portals.bridges.common.version=1.0.2-RC
@@ -82,15 +82,13 @@
 portals.bridges.jpetstore.version=1.0.2-RC
 portals.bridges.velocity.version=1.0.2-RC
 portals.bridges.portletfilter.version=1.0.2-RC
-commons.logging.version=1.0.3
-spring.version=2.0
-spring.modules.version=0.6
+commons.logging.version=1.1
+spring.version=2.0.5
+spring.modules.version=2.0-rc2
 derby.version=10.1.1.0
 hsql.version=1.8.0.2
 
 
-
-
 jetspeed2.build.options=\
 -Djetspeed.version="${jetspeed.version}" \
 -Dpluto.version=${pluto.version} \
@@ -179,7 +177,6 @@
 jetspeed-api/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java,\
 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,\
 
 

Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/decorator-macros.vm
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/decorator-macros.vm	2007-05-14 12:20:41 UTC (rev 148)
+++ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/decorator-macros.vm	2007-05-18 07:39:12 UTC (rev 149)
@@ -1,6 +1,5 @@
 #* define navigation constants *#
 #macro (defineNavigationConstants)
-  #* Constants for layout orientation *#	
   #set($LEFT_TO_RIGHT = "LeftToRight")
   #set($RIGHT_TO_LEFT = "RightToLeft")
   #set($TOP_TO_BOTTOM = "TopToBottom")

Modified: pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
===================================================================
--- pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml	2007-05-14 12:20:41 UTC (rev 148)
+++ pal-portal/trunk/portal/patches/applications/j2-admin/src/webapp/WEB-INF/portlet.xml	2007-05-18 07:39:12 UTC (rev 149)
@@ -1,8 +1,8 @@
 Index: applications/j2-admin/src/webapp/WEB-INF/portlet.xml
 ===================================================================
---- applications/j2-admin/src/webapp/WEB-INF/portlet.xml	(リビジョン 519203)
+--- applications/j2-admin/src/webapp/WEB-INF/portlet.xml	(リビジョン 539124)
 +++ applications/j2-admin/src/webapp/WEB-INF/portlet.xml	(作業コピー)
-@@ -1098,7 +1098,7 @@
+@@ -1100,7 +1100,7 @@
      <init-param>
          <description>This option will generate a new password for each user registration</description>
          <name>Option_Generate_Passwords</name>
@@ -11,7 +11,7 @@
      </init-param>
      <init-param>
          <description>This option will force email address to be system wide unique</description>
-@@ -1163,7 +1163,7 @@
+@@ -1165,7 +1165,7 @@
  	<portlet-preferences>
          <preference>
              <name>SendEmail</name>


pal-cvs メーリングリストの案内