svnno****@sourc*****
svnno****@sourc*****
2008年 4月 18日 (金) 15:54:50 JST
Revision: 882
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=882
Author: shinsuke
Date: 2008-04-18 15:54:50 +0900 (Fri, 18 Apr 2008)
Log Message:
-----------
supported psml in db.
Modified Paths:
--------------
pal-portal/trunk/build.properties
pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml
Added Paths:
-----------
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/om/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/om/page/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/
pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
pal-portal/trunk/portal/patches/etc/schema/phase2-schema.xml
pal-portal/trunk/portal/patches/etc/sql/derby/
pal-portal/trunk/portal/patches/etc/sql/derby/schema/
pal-portal/trunk/portal/patches/etc/sql/derby/schema/phase2-schema.sql
pal-portal/trunk/portal/patches/etc/sql/derby/schema/prefs-schema.sql
-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties 2008-04-17 08:08:29 UTC (rev 881)
+++ pal-portal/trunk/build.properties 2008-04-18 06:54:50 UTC (rev 882)
@@ -160,6 +160,7 @@
portal.patch.files=\
components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesImpl.java,\
components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java,\
+components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java,\
components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties,\
@@ -185,6 +186,9 @@
jetspeed-api/src/java/org/apache/jetspeed/security/spi/SecurityAccess.java,\
jetspeed-api/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java,\
commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties,\
+etc/sql/derby/schema/prefs-schema.sql,\
+etc/sql/derby/schema/phase2-schema.sql,\
+etc/schema/phase2-schema.xml,\
etc/schema/prefs-schema.xml,\
portal.delete.files=\
Modified: pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml
===================================================================
--- pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml 2008-04-17 08:08:29 UTC (rev 881)
+++ pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml 2008-04-18 06:54:50 UTC (rev 882)
@@ -49,7 +49,7 @@
<target displayText="@PORTAL_NAME@ Configration for Tomcat" target="install.tomcat.config" defaultValue="true"/>
<target displayText="Mail Server Configuration" target="mailServerConfiguration" defaultValue="true"/>
<checkbox displayText="DB Configuration" property="dummy" defaultValue="true" force="true"/>
- <checkbox displayText="Store PSML in DB" property="dbImportPsml" defaultValue="false" force="true"/>
+ <checkbox displayText="Store PSML in DB" property="dbImportPsml" defaultValue="true"/>
</page>
<!-- Components For Upgrade Installation -->
<page type="input" name="requiredUpgradeComponents" displayText="Components Selection" ifProperty="${installType}=upgrade">
Added: pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
===================================================================
--- pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java (rev 0)
+++ pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java 2008-04-18 06:54:50 UTC (rev 882)
@@ -0,0 +1,13 @@
+Index: components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
+===================================================================
+--- components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java (リビジョン 648465)
++++ components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java (作業コピー)
+@@ -395,4 +395,8 @@
+ {
+ return DOCUMENT_TYPE;
+ }
++
++ public String toString() {
++ return getPath();
++ }
+ }
Property changes on: pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-portal/trunk/portal/patches/etc/schema/phase2-schema.xml
===================================================================
--- pal-portal/trunk/portal/patches/etc/schema/phase2-schema.xml (rev 0)
+++ pal-portal/trunk/portal/patches/etc/schema/phase2-schema.xml 2008-04-18 06:54:50 UTC (rev 882)
@@ -0,0 +1,22 @@
+Index: etc/schema/phase2-schema.xml
+===================================================================
+--- etc/schema/phase2-schema.xml (リビジョン 648465)
++++ etc/schema/phase2-schema.xml (作業コピー)
+@@ -398,7 +398,7 @@
+ <table name="FRAGMENT_PREF">
+ <column name="PREF_ID" primaryKey="true" required="true" type="INTEGER"/>
+ <column name="FRAGMENT_ID" type="INTEGER" required="true"/>
+- <column name="NAME" size="40" type="VARCHAR" required="true"/>
++ <column name="NAME" size="80" type="VARCHAR" required="true"/>
+ <column name="IS_READ_ONLY" required="true" type="BOOLEANINT"/>
+ <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_PREF_1" onDelete="cascade">
+ <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
+@@ -416,7 +416,7 @@
+ <column name="PREF_VALUE_ID" primaryKey="true" required="true" type="INTEGER"/>
+ <column name="PREF_ID" type="INTEGER" required="true"/>
+ <column name="VALUE_ORDER" type="INTEGER" required="true"/>
+- <column name="VALUE" required="true" size="100" type="VARCHAR"/>
++ <column name="VALUE" required="true" type="LONGVARCHAR"/>
+ <foreign-key foreignTable="FRAGMENT_PREF" name="FK_FRAGMENT_PREF_VALUE_1" onDelete="cascade">
+ <reference foreign="PREF_ID" local="PREF_ID"/>
+ </foreign-key>
Property changes on: pal-portal/trunk/portal/patches/etc/schema/phase2-schema.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-portal/trunk/portal/patches/etc/sql/derby/schema/phase2-schema.sql
===================================================================
--- pal-portal/trunk/portal/patches/etc/sql/derby/schema/phase2-schema.sql (rev 0)
+++ pal-portal/trunk/portal/patches/etc/sql/derby/schema/phase2-schema.sql 2008-04-18 06:54:50 UTC (rev 882)
@@ -0,0 +1,22 @@
+Index: etc/sql/derby/schema/phase2-schema.sql
+===================================================================
+--- etc/sql/derby/schema/phase2-schema.sql (リビジョン 648465)
++++ etc/sql/derby/schema/phase2-schema.sql (作業コピー)
+@@ -395,7 +395,7 @@
+ (
+ PREF_ID INTEGER NOT NULL,
+ FRAGMENT_ID INTEGER NOT NULL,
+- NAME VARCHAR(40) NOT NULL,
++ NAME VARCHAR(80) NOT NULL,
+ IS_READ_ONLY INTEGER NOT NULL,
+ PRIMARY KEY(PREF_ID),
+ FOREIGN KEY (FRAGMENT_ID) REFERENCES FRAGMENT (FRAGMENT_ID)
+@@ -413,7 +413,7 @@
+ PREF_VALUE_ID INTEGER NOT NULL,
+ PREF_ID INTEGER NOT NULL,
+ VALUE_ORDER INTEGER NOT NULL,
+- VALUE VARCHAR(100) NOT NULL,
++ VALUE LONG VARCHAR NOT NULL,
+ PRIMARY KEY(PREF_VALUE_ID),
+ FOREIGN KEY (PREF_ID) REFERENCES FRAGMENT_PREF (PREF_ID)
+ ON DELETE CASCADE
Added: pal-portal/trunk/portal/patches/etc/sql/derby/schema/prefs-schema.sql
===================================================================
--- pal-portal/trunk/portal/patches/etc/sql/derby/schema/prefs-schema.sql (rev 0)
+++ pal-portal/trunk/portal/patches/etc/sql/derby/schema/prefs-schema.sql 2008-04-18 06:54:50 UTC (rev 882)
@@ -0,0 +1,20 @@
+Index: etc/sql/derby/schema/prefs-schema.sql
+===================================================================
+--- etc/sql/derby/schema/prefs-schema.sql (リビジョン 648465)
++++ etc/sql/derby/schema/prefs-schema.sql (作業コピー)
+@@ -43,7 +43,7 @@
+ PROPERTY_VALUE_ID INTEGER NOT NULL,
+ NODE_ID INTEGER,
+ PROPERTY_NAME VARCHAR(100),
+- PROPERTY_VALUE VARCHAR(254),
++ PROPERTY_VALUE LONG VARCHAR,
+ CREATION_DATE TIMESTAMP,
+ MODIFIED_DATE TIMESTAMP,
+ PRIMARY KEY(PROPERTY_VALUE_ID),
+@@ -53,4 +53,4 @@
+ );
+
+ CREATE INDEX IX_FKPPV_1 ON PREFS_PROPERTY_VALUE (NODE_ID);
+-
+\ ファイルの末尾に改行がありません
++