taylor 2004/01/11 22:45:26
Modified: portal/src/java/org/apache/jetspeed/services/information
StaticInformationProviderImpl.java
portal/src/java/org/apache/jetspeed/tools/pamanager
FileSystemPAM.java
portal/src/sql/hsql create-db.sql drop-db.sql
portal/src/test/org/apache/jetspeed/tools/pamanager
TestPortletDescriptor.java
portal/src/webapp/WEB-INF/conf jetspeed.properties
portal/src/webapp/WEB-INF/conf/ojb repository.xml
repository_jetspeed.xml
portal/src/webapp/WEB-INF/db/hsql Registry.script
portal/src/webapp/WEB-INF/layout columns.jsp
Log:
changing package for registry
Revision Changes Path
1.5 +2 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java
Index: StaticInformationProviderImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StaticInformationProviderImpl.java 30 Dec 2003 06:37:40 -0000 1.4
+++ StaticInformationProviderImpl.java 12 Jan 2004 06:45:26 -0000 1.5
@@ -61,7 +61,7 @@
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.jetspeed.engine.core.PortalContextProviderImpl;
-import org.apache.jetspeed.services.registry.JetspeedPortletRegistry;
+import org.apache.jetspeed.registry.JetspeedPortletRegistry;
/**
* Provides static information to Pluto Container:
1.11 +2 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
Index: FileSystemPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FileSystemPAM.java 31 Dec 2003 09:46:36 -0000 1.10
+++ FileSystemPAM.java 12 Jan 2004 06:45:26 -0000 1.11
@@ -60,7 +60,7 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.services.registry.JetspeedPortletRegistry;
+import org.apache.jetspeed.registry.JetspeedPortletRegistry;
import org.apache.jetspeed.container.JetspeedPortletContext;
import org.apache.jetspeed.exception.RegistryException;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
1.12 +0 -148 jakarta-jetspeed-2/portal/src/sql/hsql/create-db.sql
Index: create-db.sql
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/sql/hsql/create-db.sql,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- create-db.sql 29 Dec 2003 02:12:53 -0000 1.11
+++ create-db.sql 12 Jan 2004 06:45:26 -0000 1.12
@@ -1,151 +1,3 @@
-----------------------------------------------------------------------------
--- Create Portlet Application Table
-----------------------------------------------------------------------------
-CREATE TABLE PORTLET_APPLICATION
-(
- APPLICATION_ID INTEGER NOT NULL PRIMARY KEY,
- APP_NAME VARCHAR(80) NOT NULL,
- APP_IDENTIFIER VARCHAR(80),
- VERSION VARCHAR(80),
- APP_TYPE INTEGER,
- DESCRIPTION VARCHAR(80),
- WEB_APP_ID INTEGER NOT NULL
-);
-
-ALTER TABLE PORTLET_APPLICATION ADD CONSTRAINT UK_APPLICATION UNIQUE (APP_NAME);
-
-----------------------------------------------------------------------------
--- Create Web Application Table
-----------------------------------------------------------------------------
-
-CREATE TABLE WEB_APPLICATION(
- ID INTEGER NOT NULL PRIMARY KEY,
- CONTEXT_ROOT VARCHAR(255) NOT NULL
-);
-
-
-----------------------------------------------------------------------------
--- Create Portlet Definition Table
-----------------------------------------------------------------------------
-
-CREATE TABLE PORTLET_DEFINITION(
- ID INTEGER NOT NULL PRIMARY KEY,
- NAME VARCHAR(80),
- CLASS_NAME VARCHAR(100),
- APPLICATION_ID INTEGER NOT NULL,
- PORTLET_IDENTIFIER VARCHAR(80),
- EXPIRATION_CACHE VARCHAR(30),
- PREFERENCE_VALIDATOR VARCHAR(255),
- UNIQUE(APPLICATION_ID, NAME)
-);
-
-----------------------------------------------------------------------------
--- Create Language Table
-----------------------------------------------------------------------------
-
-CREATE TABLE LANGUAGE(
- ID INTEGER NOT NULL PRIMARY KEY,
- PORTLET_ID INTEGER NOT NULL,
- TITLE VARCHAR(100),
- SHORT_TITLE VARCHAR(50),
- LOCALE_STRING VARCHAR(50) NOT NULL,
- KEYWORDS LONGVARCHAR
-);
-
-----------------------------------------------------------------------------
--- Create Content Type Table
-----------------------------------------------------------------------------
-
-CREATE TABLE PORTLET_CONTENT_TYPE(
- CONTENT_TYPE_ID INTEGER PRIMARY KEY,
- PORTLET_ID INTEGER NOT NULL,
- CONTENT_TYPE VARCHAR(30) NOT NULL,
- MODES LONGVARCHAR
-);
-
-----------------------------------------------------------------------------
--- Create Parameter Table
--- NOTE: This table supports both Servlet and Portlet parameters
--- Class name is required to decide if this is a portlet or servlet parameter
-----------------------------------------------------------------------------
-
-CREATE TABLE PARAMETER(
- PARAMETER_ID INTEGER PRIMARY KEY,
- PARENT_ID INTEGER NOT NULL,
- CLASS_NAME VARCHAR(30) NOT NULL,
- NAME VARCHAR(80) NOT NULL,
- VALUE LONGVARCHAR NOT NULL
-);
-
-
-
-------------------------------------------------------------------------------
--- Preference and Preference Values
-------------------------------------------------------------------------------
-CREATE TABLE PORTLET_PREFERENCE(
- ID INTEGER PRIMARY KEY,
- PARENT_ID INTEGER NOT NULL,
- NAME VARCHAR(80) NOT NULL,
- CLASS_NAME VARCHAR(50) NOT NULL,
- READ_ONLY CHAR(1) DEFAULT '1'
-
-);
-
-CREATE TABLE PREFERENCE_VALUE(
- ID INTEGER,
- PREFERENCE_ID INTEGER,
- VALUE LONGVARCHAR,
- CONSTRAINT PK
- PRIMARY KEY (ID)
-
-);
-
-
--------------------------------------------------------------------------------
--- Portlet Entity
--- Represents the managed state of individual portlet
--- intance within a "page"
--------------------------------------------------------------------------------
-CREATE TABLE PORTLET_ENTITY(
- ID INTEGER PRIMARY KEY,
- PORTLET_DEFINITION_ID INTEGER NOT NULL,
- GUID VARCHAR(255) NOT NULL
-);
-
-
-------------------------------------------------------------------------------
--- Security Role Reference
-------------------------------------------------------------------------------
-CREATE TABLE SECURITY_ROLE_REFERENCE(
- ID INTEGER PRIMARY KEY,
- PORTLET_DEFINITION_ID INTEGER NOT NULL,
- ROLE_NAME VARCHAR(150),
- ROLE_LINK VARCHAR(150)
-);
-
-
-------------------------------------------------------------------------------
--- Localized Descriptions
-------------------------------------------------------------------------------
-CREATE TABLE LOCALIZED_DESCRIPTION(
- ID INTEGER PRIMARY KEY,
- OBJECT_ID INTEGER NOT NULL,
- TYPE VARCHAR(25) NOT NULL,
- DESCRIPTION LONGVARCHAR NOT NULL,
- LOCALE_STRING VARCHAR(50) NOT NULL
-);
-
-------------------------------------------------------------------------------
--- Localized Display Names
-------------------------------------------------------------------------------
-CREATE TABLE LOCALIZED_DISPLAY_NAME(
- ID INTEGER PRIMARY KEY,
- OBJECT_ID INTEGER NOT NULL,
- TYPE VARCHAR(25) NOT NULL,
- DISPLAY_NAME LONGVARCHAR NOT NULL,
- LOCALE_STRING VARCHAR(50) NOT NULL
-);
-
------------------------------------------------------------------------------
-- Tables for Capability mapping
------------------------------------------------------------------------------
1.9 +0 -15 jakarta-jetspeed-2/portal/src/sql/hsql/drop-db.sql
Index: drop-db.sql
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/sql/hsql/drop-db.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- drop-db.sql 8 Dec 2003 18:28:06 -0000 1.8
+++ drop-db.sql 12 Jan 2004 06:45:26 -0000 1.9
@@ -5,21 +5,6 @@
DROP TABLE PSML_ENTRY IF EXISTS
DROP TABLE PSML IF EXISTS
-DROP TABLE PARAMETER IF EXISTS
-DROP TABLE PORTLET_CONTENT_TYPE IF EXISTS
-DROP TABLE LANGUAGE IF EXISTS
-DROP TABLE PORTLET_DEFINITION IF EXISTS
-DROP TABLE WEB_APPLICATION IF EXISTS
-DROP TABLE PORTLET_APPLICATION IF EXISTS
-DROP TABLE PORTLET_PREFERENCE IF EXISTS
-DROP TABLE PREFERENCE_VALUE IF EXISTS
-DROP TABLE USER_PORTLET_PREFERENCE IF EXISTS
-DROP TABLE USER_PREFERENCE_VALUE IF EXISTS
-DROP TABLE PORTLET_ENTITY IF EXISTS
-DROP TABLE LOCALIZED_DESCRIPTION IF EXISTS
-DROP TABLE LOCALIZED_DISPLAY_NAME IF EXISTS
-DROP TABLE SECURITY_ROLE_REFERENCE IF EXISTS
-
DROP TABLE OJB_HL_SEQ IF EXISTS
DROP TABLE OJB_LOCKENTRY IF EXISTS
DROP TABLE OJB_NRM IF EXISTS
1.10 +2 -2
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
Index: TestPortletDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestPortletDescriptor.java 26 Nov 2003 20:55:50 -0000 1.9
+++ TestPortletDescriptor.java 12 Jan 2004 06:45:26 -0000 1.10
@@ -72,7 +72,7 @@
import org.apache.jetspeed.persistence.PersistencePlugin;
import org.apache.jetspeed.persistence.PersistenceService;
import org.apache.jetspeed.persistence.TransactionStateException;
-import org.apache.jetspeed.services.registry.JetspeedPortletRegistry;
+import org.apache.jetspeed.registry.JetspeedPortletRegistry;
import org.apache.jetspeed.test.JetspeedTest;
import org.apache.pluto.om.common.DisplayName;
import org.apache.pluto.om.common.LanguageSet;
1.22 +3 -3
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties
Index: jetspeed.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jetspeed.properties 12 Jan 2004 06:42:43 -0000 1.21
+++ jetspeed.properties 12 Jan 2004 06:45:26 -0000 1.22
@@ -135,7 +135,7 @@
# -------------------------------------------------------------------
# R E G I S T R Y
# -------------------------------------------------------------------
-services.PortletRegistry.classname=org.apache.jetspeed.services.registry.impl.PersistentPortletRegistryService
+services.PortletRegistry.classname=org.apache.jetspeed.registry.impl.PersistentPortletRegistryService
services.PortletRegistry.earlyInit = true
# -------------------------------------------------------------------
@@ -184,7 +184,7 @@
#---------------------------------------------------------------------------
# E N T I T Y S E R V I C E
#---------------------------------------------------------------------------
-services.PortletEntityService.classname=org.apache.jetspeed.services.entity.PortletEntityServiceImpl
+services.PortletEntityService.classname=org.apache.jetspeed.entity.PortletEntityServiceImpl
services.PortletEntityService.entity.impl =
org.apache.jetspeed.om.entity.impl.PortletEntityImpl
# -------------------------------------------------------------------
1.4 +4 -0
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository.xml
Index: repository.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- repository.xml 8 Dec 2003 18:28:07 -0000 1.3
+++ repository.xml 12 Jan 2004 06:45:26 -0000 1.4
@@ -8,6 +8,7 @@
<!ENTITY internal SYSTEM "repository_internal.xml">
<!ENTITY jetspeed SYSTEM "repository_jetspeed.xml">
<!ENTITY page SYSTEM "repository_page.xml">
+<!ENTITY registry SYSTEM "repository_registry.xml">
<!ENTITY preferences SYSTEM "repository_prefs.xml">
]>
@@ -29,5 +30,8 @@
<!-- include jetspeed defined mappings here -->
&preferences;
+
+ <!-- include jetspeed registry mapping here -->
+ ®istry;
</descriptor-repository>
1.18 +1 -908
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository_jetspeed.xml
Index: repository_jetspeed.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository_jetspeed.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- repository_jetspeed.xml 6 Jan 2004 19:31:31 -0000 1.17
+++ repository_jetspeed.xml 12 Jan 2004 06:45:26 -0000 1.18
@@ -1,800 +1,4 @@
-<!--
- - P O R T L E T A P P L I C A T I O N
--->
-
-<!--
- <class-descriptor
-
class="org.apache.jetspeed.om.common.portlet.PortletApplicationDefinitionImpl"
- >
- <extent-class
class-ref="org.apache.jetspeed.tools.castor.om.common.portlet.PortletDefinitionDescriptor"
/>
- </class-descriptor>
--->
-
-
- <class-descriptor
- class="org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl"
- table="PORTLET_APPLICATION"
- >
-
- <field-descriptor
- name="id"
- column="APPLICATION_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
-
- />
- <!--conversion="org.apache.jetspeed.util.ojb.ObjectIDtoLongFieldConversion"
-->
- <field-descriptor
- name="name"
- column="APP_NAME"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="applicationIdentifier"
- column="APP_IDENTIFIER"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="version"
- column="VERSION"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="description"
- column="DESCRIPTION"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="webApplicationId"
- column="WEB_APP_ID"
- jdbc-type="INTEGER"
- />
-
- <field-descriptor
- name="applicationType"
- column="APP_TYPE"
- jdbc-type="INTEGER"
- />
-
- <reference-descriptor
- name="webApplication"
-
class-ref="org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl"
- auto-delete="true"
- >
- <foreignkey field-ref="webApplicationId"/>
- </reference-descriptor>
-
- <collection-descriptor
- name="portlets"
- auto-delete="true"
-
element-class-ref="org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite"
-
collection-class="org.apache.jetspeed.om.collection.ManageablePortletDefinitionListImpl"
- >
- <inverse-foreignkey field-ref="appId"/>
- </collection-descriptor>
-
- </class-descriptor>
-
-
-
-<!--
- - W E B A P P L I C A T I O N
--->
-
- <class-descriptor
- class="org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl"
- table="WEB_APPLICATION"
- >
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
-
- />
-
-
- <field-descriptor
- name="contextRoot"
- column="CONTEXT_ROOT"
- jdbc-type="VARCHAR"
- />
- <collection-descriptor
- name="descriptions"
- element-class-ref="org.apache.jetspeed.om.impl.DescriptionImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableDescriptionSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="objectId"/>
- <query-customizer
- class="org.apache.jetspeed.util.ojb.TypeFilterQueryCustomizerImpl">
- <attribute
- attribute-name="type"
- attribute-value="web application"
- />
- </query-customizer>
- </collection-descriptor>
-
- <collection-descriptor
- name="displayNames"
- element-class-ref="org.apache.jetspeed.om.impl.DisplayNameImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableDisplayNameSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="objectId"/>
- <query-customizer
- class="org.apache.jetspeed.util.ojb.TypeFilterQueryCustomizerImpl">
- <attribute
- attribute-name="type"
- attribute-value="web application"
- />
- </query-customizer>
- </collection-descriptor>
-
-
- </class-descriptor>
-
-<!--
- - P O R T L E T D E F I N I T I O N
- -->
- <class-descriptor
- class="org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite"
-
- >
- <extent-class
class-ref="org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl" />
- </class-descriptor>
-
-
-
- <class-descriptor
- class="org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl"
- table="PORTLET_DEFINITION"
-
- >
-
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
-
- />
-
- <field-descriptor
- name="portletIdentifier"
- column="PORTLET_IDENTIFIER"
- jdbc-type="VARCHAR"
- />
-
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="className"
- column="CLASS_NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="appId"
- column="APPLICATION_ID"
- jdbc-type="INTEGER"
-
- />
- <!-- conversion="org.apache.jetspeed.util.ojb.ObjectIDtoLongFieldConversion"
-->
-
- <field-descriptor
- name="expirationCache"
- column="EXPIRATION_CACHE"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="preferenceValidatorClassname"
- column="PREFERENCE_VALIDATOR"
- jdbc-type="VARCHAR"
- />
-
-
-
-
- <reference-descriptor
- name="app"
-
class-ref="org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl"
- >
- <foreignkey field-ref="appId"/>
- </reference-descriptor>
-
-
- <collection-descriptor
- name="languageSet"
- element-class-ref="org.apache.jetspeed.om.impl.LanguageImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableLanguageSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="portletId"/>
-
- </collection-descriptor>
-
- <collection-descriptor
- name="contentTypes"
-
element-class-ref="org.apache.jetspeed.om.common.portlet.ContentTypeComposite"
-
collection-class="org.apache.jetspeed.om.collection.ManageableContentTypeSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="portletId"/>
- </collection-descriptor>
-
-
- <collection-descriptor
- name="parameterSet"
- element-class-ref="org.apache.jetspeed.om.impl.PortletInitParameterImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageablePortletParameterSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="parentId"/>
- </collection-descriptor>
-
- <collection-descriptor
- name="prefSet"
-
element-class-ref="org.apache.jetspeed.om.preference.impl.DefaultPreferenceImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageablePreferenceSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="parentId"/>
- </collection-descriptor>
-
- <collection-descriptor
- name="securityRoleRefSet"
- element-class-ref="org.apache.jetspeed.om.impl.SecurityRoleRefImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableSecurityRoleRefSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="portletId"/>
- </collection-descriptor>
-
- <collection-descriptor
- name="descriptions"
- element-class-ref="org.apache.jetspeed.om.impl.DescriptionImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableDescriptionSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="objectId"/>
- <query-customizer
- class="org.apache.jetspeed.util.ojb.TypeFilterQueryCustomizerImpl">
- <attribute
- attribute-name="type"
- attribute-value="portlet"
- />
- </query-customizer>
- </collection-descriptor>
-
- <collection-descriptor
- name="displayNames"
- element-class-ref="org.apache.jetspeed.om.impl.DisplayNameImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableDisplayNameSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="objectId"/>
- <query-customizer
- class="org.apache.jetspeed.util.ojb.TypeFilterQueryCustomizerImpl">
- <attribute
- attribute-name="type"
- attribute-value="portlet"
- />
- </query-customizer>
- </collection-descriptor>
-
- </class-descriptor>
-
-
-
-<!--
- - L A N G U A G E
--->
- <class-descriptor
- class="org.apache.jetspeed.om.impl.LanguageImpl"
- table="LANGUAGE"
- >
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
- <field-descriptor
- name="portletId"
- column="PORTLET_ID"
- jdbc-type="INTEGER"
-
- />
-
-
- <field-descriptor
- name="title"
- column="TITLE"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="shortTitle"
- column="SHORT_TITLE"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="keywords"
- column="KEYWORDS"
- jdbc-type="VARCHAR"
- conversion="org.apache.jetspeed.util.ojb.CSVtoCollectionFieldConversion"
- />
-
- <field-descriptor
- name="locale"
- column="LOCALE_STRING"
- jdbc-type="VARCHAR"
- conversion="org.apache.jetspeed.util.ojb.LocaleFieldConversion"
- />
-
- </class-descriptor>
-
-<!--
- - C O N T E N T T Y P E
- -->
- <class-descriptor
- class="org.apache.jetspeed.om.common.portlet.ContentTypeComposite"
-
- >
- <extent-class class-ref="org.apache.jetspeed.om.portlet.impl.ContentTypeImpl"
/>
- </class-descriptor>
-
-
-
- <class-descriptor
- class="org.apache.jetspeed.om.portlet.impl.ContentTypeImpl"
- table="PORTLET_CONTENT_TYPE"
- >
- <field-descriptor
- name="contentTypeId"
- column="CONTENT_TYPE_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
- <field-descriptor
- name="portletId"
- column="PORTLET_ID"
- jdbc-type="INTEGER"
-
- />
- <field-descriptor
- name="contentType"
- column="CONTENT_TYPE"
- jdbc-type="VARCHAR"
- />
- <field-descriptor
- name="portletModes"
- column="MODES"
- jdbc-type="VARCHAR"
- conversion="org.apache.jetspeed.util.ojb.CSVtoPortletModeFieldConversion"
- />
- </class-descriptor>
-
-
-
-<!--
- - P A R A M E T E R
- -->
- <!--
- <class-descriptor
- class="org.apache.jetspeed.om.common.ParameterImpl"
- table="PARAMETER"
- >
- <extent-class
class-ref="org.apache.jetspeed.om.common.extended.PortletInitParameterImpl" />
- <extent-class
class-ref="org.apache.jetspeed.om.common.extended.ServletInitParameterImpl" />
-
-
-
- </class-descriptor>
- -->
-
- <class-descriptor
- class="org.apache.jetspeed.om.impl.ServletInitParameterImpl"
- table="PARAMETER"
- >
-
- <field-descriptor
- name="parentId"
- column="PARENT_ID"
- jdbc-type="INTEGER"
-
- />
-
- <field-descriptor
- name="parameterId"
- column="PARAMETER_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
- <field-descriptor
- name="parentId"
- column="PARENT_ID"
- jdbc-type="INTEGER"
-
- />
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="value"
- column="VALUE"
- jdbc-type="VARCHAR"
- />
-
-
-
- <field-descriptor
- name="ojbConcreteClass"
- column="CLASS_NAME"
- jdbc-type="VARCHAR"
- />
-
-
-
-
- </class-descriptor>
-
- <class-descriptor
- class="org.apache.jetspeed.om.impl.PortletInitParameterImpl"
- table="PARAMETER"
- >
- <field-descriptor
- name="parentId"
- column="PARENT_ID"
- jdbc-type="INTEGER"
-
- />
-
- <field-descriptor
- name="parameterId"
- column="PARAMETER_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
- <field-descriptor
- name="parentId"
- column="PARENT_ID"
- jdbc-type="INTEGER"
-
- />
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="value"
- column="VALUE"
- jdbc-type="VARCHAR"
- />
-
-
- <field-descriptor
- name="ojbConcreteClass"
- column="CLASS_NAME"
- jdbc-type="VARCHAR"
- />
-
- <collection-descriptor
- name="descriptions"
- element-class-ref="org.apache.jetspeed.om.impl.DescriptionImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableDescriptionSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="objectId"/>
- <query-customizer
- class="org.apache.jetspeed.util.ojb.TypeFilterQueryCustomizerImpl">
- <attribute
- attribute-name="type"
- attribute-value="parameter"
- />
- </query-customizer>
- </collection-descriptor>
-
- </class-descriptor>
-
-<!--
- - P R E F E R E N C E S
- -->
-
-
- <!-- These preferences are the defaults for a PortletDefinition -->
- <class-descriptor
- class="org.apache.jetspeed.om.preference.impl.DefaultPreferenceImpl"
- table="PORTLET_PREFERENCE"
- >
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
-
-
- />
- <field-descriptor
- name="ojbConcreteClass"
- column="CLASS_NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="parentId"
- column="PARENT_ID"
- jdbc-type="INTEGER"
- access="anonymous"
-
- />
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="readOnly"
- column="READ_ONLY"
- jdbc-type="BIT"
- />
-
- <collection-descriptor
- name="values"
-
element-class-ref="org.apache.jetspeed.om.preference.impl.PreferenceValueImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="preferenceId"/>
-
- </collection-descriptor>
-
- <collection-descriptor
- name="descriptions"
- element-class-ref="org.apache.jetspeed.om.impl.DescriptionImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableDescriptionSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="objectId"/>
- <query-customizer
- class="org.apache.jetspeed.util.ojb.TypeFilterQueryCustomizerImpl">
- <attribute
- attribute-name="type"
- attribute-value="preference"
- />
- </query-customizer>
- </collection-descriptor>
- </class-descriptor>
-
- <!-- These preference map directly to a Portlet Entity -->
- <class-descriptor
- class="org.apache.jetspeed.om.preference.impl.PreferenceImpl"
- table="PORTLET_PREFERENCE"
- >
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
-
- />
- <field-descriptor
- name="ojbConcreteClass"
- column="CLASS_NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="parentId"
- column="PARENT_ID"
- jdbc-type="INTEGER"
- access="anonymous"
-
- />
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="readOnly"
- column="READ_ONLY"
- jdbc-type="BIT"
- />
-
- <collection-descriptor
- name="values"
-
element-class-ref="org.apache.jetspeed.om.preference.impl.PreferenceValueImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="preferenceId"/>
-
- </collection-descriptor>
-
- <collection-descriptor
- name="descriptions"
- element-class-ref="org.apache.jetspeed.om.impl.DescriptionImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableDescriptionSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="objectId"/>
- <query-customizer
- class="org.apache.jetspeed.util.ojb.TypeFilterQueryCustomizerImpl">
- <attribute
- attribute-name="type"
- attribute-value="preference"
- />
- </query-customizer>
- </collection-descriptor>
- </class-descriptor>
-
-
-
- <class-descriptor
- class="org.apache.jetspeed.om.preference.impl.PreferenceValueImpl"
- table="PREFERENCE_VALUE"
- >
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- access="anonymous"
- />
-
- <field-descriptor
- name="preferenceId"
- column="PREFERENCE_ID"
- jdbc-type="INTEGER"
- access="anonymous"
- />
-
-
-
- <field-descriptor
- name="value"
- column="VALUE"
- jdbc-type="VARCHAR"
- />
-
- </class-descriptor>
-
-
-
-
-<!--
- - L O C A L I Z E D D E S C R I P I T I O N
- -->
- <class-descriptor
- class="org.apache.jetspeed.om.impl.DescriptionImpl"
- table="LOCALIZED_DESCRIPTION"
- >
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- access="anonymous"
-
- />
-
- <field-descriptor
- name="objectId"
- column="OBJECT_ID"
- jdbc-type="INTEGER"
- access="anonymous"
-
- />
-
-
- <field-descriptor
- name="type"
- column="TYPE"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="description"
- column="DESCRIPTION"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="locale"
- column="LOCALE_STRING"
- jdbc-type="VARCHAR"
- conversion="org.apache.jetspeed.util.ojb.LocaleFieldConversion"
- />
-
-
- </class-descriptor>
-
- <!--
- - L O C A L I Z E D D I S P L A Y N A M E
- -->
- <class-descriptor
- class="org.apache.jetspeed.om.impl.DisplayNameImpl"
- table="LOCALIZED_DISPLAY_NAME"
- >
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- access="anonymous"
- />
-
- <field-descriptor
- name="objectId"
- column="OBJECT_ID"
- jdbc-type="INTEGER"
- access="anonymous"
- />
-
- <field-descriptor
- name="type"
- column="TYPE"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="displayName"
- column="DISPLAY_NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="locale"
- column="LOCALE_STRING"
- jdbc-type="VARCHAR"
- conversion="org.apache.jetspeed.util.ojb.LocaleFieldConversion"
- />
-
-
- </class-descriptor>
-
<!--
- C A P A B I L I T Y M A P P I N G
@@ -982,115 +186,4 @@
</class-descriptor>
- <!--
- - P O R T L E T E N T I T Y
- -->
- <class-descriptor
- class="org.apache.jetspeed.om.entity.impl.PortletEntityImpl"
- table="PORTLET_ENTITY"
- >
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- access="anonymous"
-
- />
-
- <field-descriptor
- name="portletId"
- column="PORTLET_DEFINITION_ID"
- jdbc-type="INTEGER"
- access="anonymous"
-
- />
-
- <field-descriptor
- name="oid"
- column="GUID"
- jdbc-type="VARCHAR"
- conversion="org.apache.jetspeed.util.ojb.ObjectIDtoStringFieldConversion"
- />
-
- <reference-descriptor
- name="portletDefinition"
- class-ref="org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl"
- >
- <foreignkey field-ref="portletId"/>
- </reference-descriptor>
-
- <collection-descriptor
- name="originalPreferences"
- element-class-ref="org.apache.jetspeed.om.preference.impl.PreferenceImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageablePreferenceSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="parentId"/>
- </collection-descriptor>
-
-
- </class-descriptor>
-
- <!--
- - S E C U R T I T Y R O L E R E F
- -->
- <class-descriptor
- class="org.apache.jetspeed.om.impl.SecurityRoleRefImpl"
- table="SECURITY_ROLE_REFERENCE"
- >
-
- <field-descriptor
- name="id"
- column="ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- access="anonymous"
-
- />
-
- <field-descriptor
- name="portletId"
- column="PORTLET_DEFINITION_ID"
- jdbc-type="INTEGER"
- access="anonymous"
-
- />
-
- <field-descriptor
- name="name"
- column="ROLE_NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="link"
- column="ROLE_LINK"
- jdbc-type="VARCHAR"
- />
-
- <collection-descriptor
- name="descriptions"
- element-class-ref="org.apache.jetspeed.om.impl.DescriptionImpl"
-
collection-class="org.apache.jetspeed.om.collection.ManageableDescriptionSetImpl"
- auto-delete="true"
- >
- <inverse-foreignkey field-ref="objectId"/>
- <query-customizer
- class="org.apache.jetspeed.util.ojb.TypeFilterQueryCustomizerImpl">
- <attribute
- attribute-name="type"
- attribute-value="security role ref"
- />
- </query-customizer>
- </collection-descriptor>
-
-
-
-
- </class-descriptor>
-
-
\ No newline at end of file
+
\ No newline at end of file
1.20 +12 -12
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/db/hsql/Registry.script
Index: Registry.script
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/db/hsql/Registry.script,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Registry.script 8 Jan 2004 20:41:42 -0000 1.19
+++ Registry.script 12 Jan 2004 06:45:26 -0000 1.20
@@ -7,18 +7,6 @@
CREATE TABLE OJB_DSET_ENTRIES(ID INTEGER NOT NULL PRIMARY KEY,DLIST_ID
INTEGER,POSITION_ INTEGER,OID_ LONGVARBINARY)
CREATE TABLE OJB_DMAP(ID INTEGER NOT NULL PRIMARY KEY,SIZE_ INTEGER)
CREATE TABLE OJB_DMAP_ENTRIES(ID INTEGER NOT NULL PRIMARY KEY,DMAP_ID
INTEGER,KEY_OID LONGVARBINARY,VALUE_OID LONGVARBINARY)
-CREATE TABLE PORTLET_APPLICATION(APPLICATION_ID INTEGER NOT NULL PRIMARY
KEY,APP_NAME VARCHAR(80) NOT NULL,APP_IDENTIFIER VARCHAR(80),VERSION
VARCHAR(80),APP_TYPE INTEGER,DESCRIPTION VARCHAR(80),WEB_APP_ID INTEGER NOT
NULL,CONSTRAINT UK_APPLICATION UNIQUE(APP_NAME))
-CREATE TABLE WEB_APPLICATION(ID INTEGER NOT NULL PRIMARY KEY,CONTEXT_ROOT
VARCHAR(255) NOT NULL)
-CREATE TABLE PORTLET_DEFINITION(ID INTEGER NOT NULL PRIMARY KEY,NAME
VARCHAR(80),CLASS_NAME VARCHAR(100),APPLICATION_ID INTEGER NOT NULL,PORTLET_IDENTIFIER
VARCHAR(80),EXPIRATION_CACHE VARCHAR(30),PREFERENCE_VALIDATOR VARCHAR(255),CONSTRAINT
SYS_CT_2 UNIQUE(APPLICATION_ID,NAME))
-CREATE TABLE LANGUAGE(ID INTEGER NOT NULL PRIMARY KEY,PORTLET_ID INTEGER NOT
NULL,TITLE VARCHAR(100),SHORT_TITLE VARCHAR(50),LOCALE_STRING VARCHAR(50) NOT
NULL,KEYWORDS LONGVARCHAR)
-CREATE TABLE PORTLET_CONTENT_TYPE(CONTENT_TYPE_ID INTEGER NOT NULL PRIMARY
KEY,PORTLET_ID INTEGER NOT NULL,CONTENT_TYPE VARCHAR(30) NOT NULL,MODES LONGVARCHAR)
-CREATE TABLE PARAMETER(PARAMETER_ID INTEGER NOT NULL PRIMARY KEY,PARENT_ID INTEGER
NOT NULL,CLASS_NAME VARCHAR(30) NOT NULL,NAME VARCHAR(80) NOT NULL,VALUE LONGVARCHAR
NOT NULL)
-CREATE TABLE PORTLET_PREFERENCE(ID INTEGER NOT NULL PRIMARY KEY,PARENT_ID INTEGER
NOT NULL,NAME VARCHAR(80) NOT NULL,CLASS_NAME VARCHAR(50) NOT NULL,READ_ONLY CHAR(1)
DEFAULT '1')
-CREATE TABLE PREFERENCE_VALUE(ID INTEGER NOT NULL PRIMARY KEY,PREFERENCE_ID
INTEGER,VALUE LONGVARCHAR)
-CREATE TABLE PORTLET_ENTITY(ID INTEGER NOT NULL PRIMARY KEY,PORTLET_DEFINITION_ID
INTEGER NOT NULL,GUID VARCHAR(255) NOT NULL)
-CREATE TABLE SECURITY_ROLE_REFERENCE(ID INTEGER NOT NULL PRIMARY
KEY,PORTLET_DEFINITION_ID INTEGER NOT NULL,ROLE_NAME VARCHAR(150),ROLE_LINK
VARCHAR(150))
-CREATE TABLE LOCALIZED_DESCRIPTION(ID INTEGER NOT NULL PRIMARY KEY,OBJECT_ID
INTEGER NOT NULL,TYPE VARCHAR(25) NOT NULL,DESCRIPTION LONGVARCHAR NOT
NULL,LOCALE_STRING VARCHAR(50) NOT NULL)
-CREATE TABLE LOCALIZED_DISPLAY_NAME(ID INTEGER NOT NULL PRIMARY KEY,OBJECT_ID
INTEGER NOT NULL,TYPE VARCHAR(25) NOT NULL,DISPLAY_NAME LONGVARCHAR NOT
NULL,LOCALE_STRING VARCHAR(50) NOT NULL)
CREATE TABLE MEDIA_TYPE(MEDIATYPE_ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(80)
NOT NULL,CHARACTER_SET VARCHAR(40),TITLE VARCHAR(80),DESCRIPTION LONGVARCHAR)
CREATE TABLE CLIENT(CLIENT_ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(80) NOT
NULL,USER_AGENT_PATTERN VARCHAR(128),MANUFACTURER VARCHAR(80),MODEL
VARCHAR(80),VERSION VARCHAR(40),PREFERRED_MIMETYPE_ID INTEGER NOT NULL)
CREATE TABLE MIMETYPE(MIMETYPE_ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(80) NOT
NULL)
@@ -54,6 +42,18 @@
CREATE TABLE PREF_NODE(NODE_ID INTEGER NOT NULL PRIMARY KEY,PARENT_NODE_ID
INTEGER,PROPERTY_SET_DEF_ID INTEGER,NODE_NAME VARCHAR(100),NODE_TYPE
SMALLINT,FULL_PATH VARCHAR(254),CREATION_DATE TIMESTAMP,MODIFIED_DATE
TIMESTAMP,CONSTRAINT PREF_NODE_FK1 FOREIGN KEY(PARENT_NODE_ID) REFERENCES
PREF_NODE(NODE_ID),CONSTRAINT PREF_NODE_FK_2 FOREIGN KEY(PROPERTY_SET_DEF_ID)
REFERENCES PREF_PROPERTY_SET_DEF(PROPERTY_SET_DEF_ID))
CREATE TABLE PREF_PROPERTY_VALUE(PROPERTY_VALUE_ID INTEGER NOT NULL PRIMARY
KEY,PROPERTY_KEY_ID INTEGER,NODE_ID INTEGER,BOOLEAN_VALUE BIT,DATETIME_VALUE
TIMESTAMP,LONG_VALUE INTEGER,DOUBLE_VALUE DOUBLE,TEXT_VALUE VARCHAR(254),CREATION_DATE
TIMESTAMP,MODIFIED_DATE TIMESTAMP,CONSTRAINT PREF_PROPERTY_VALUE_FK_1 FOREIGN
KEY(NODE_ID) REFERENCES PREF_NODE(NODE_ID))
CREATE TABLE PREF_PROPERTY_KEY(PROPERTY_KEY_ID INTEGER NOT NULL PRIMARY
KEY,PROPERTY_SET_DEF_ID INTEGER,PROPERTY_NAME VARCHAR(100),PROPERTY_TYPE
SMALLINT,CREATION_DATE TIMESTAMP,MODIFIED_DATE TIMESTAMP,CONSTRAINT
PREF_PROPERTY_KEY_FK_1 FOREIGN KEY(PROPERTY_SET_DEF_ID) REFERENCES
PREF_PROPERTY_SET_DEF(PROPERTY_SET_DEF_ID))
+CREATE TABLE PORTLET_APPLICATION(APPLICATION_ID INTEGER NOT NULL PRIMARY
KEY,APP_NAME VARCHAR(80) NOT NULL,APP_IDENTIFIER VARCHAR(80),VERSION
VARCHAR(80),APP_TYPE INTEGER,DESCRIPTION VARCHAR(80),WEB_APP_ID INTEGER NOT
NULL,CONSTRAINT UK_APPLICATION UNIQUE(APP_NAME))
+CREATE TABLE WEB_APPLICATION(ID INTEGER NOT NULL PRIMARY KEY,CONTEXT_ROOT
VARCHAR(255) NOT NULL)
+CREATE TABLE PORTLET_DEFINITION(ID INTEGER NOT NULL PRIMARY KEY,NAME
VARCHAR(80),CLASS_NAME VARCHAR(100),APPLICATION_ID INTEGER NOT NULL,PORTLET_IDENTIFIER
VARCHAR(80),EXPIRATION_CACHE VARCHAR(30),PREFERENCE_VALIDATOR VARCHAR(255),CONSTRAINT
SYS_CT_2 UNIQUE(APPLICATION_ID,NAME))
+CREATE TABLE LANGUAGE(ID INTEGER NOT NULL PRIMARY KEY,PORTLET_ID INTEGER NOT
NULL,TITLE VARCHAR(100),SHORT_TITLE VARCHAR(50),LOCALE_STRING VARCHAR(50) NOT
NULL,KEYWORDS LONGVARCHAR)
+CREATE TABLE PORTLET_CONTENT_TYPE(CONTENT_TYPE_ID INTEGER NOT NULL PRIMARY
KEY,PORTLET_ID INTEGER NOT NULL,CONTENT_TYPE VARCHAR(30) NOT NULL,MODES LONGVARCHAR)
+CREATE TABLE PARAMETER(PARAMETER_ID INTEGER NOT NULL PRIMARY KEY,PARENT_ID INTEGER
NOT NULL,CLASS_NAME VARCHAR(30) NOT NULL,NAME VARCHAR(80) NOT NULL,VALUE LONGVARCHAR
NOT NULL)
+CREATE TABLE PORTLET_PREFERENCE(ID INTEGER NOT NULL PRIMARY KEY,PARENT_ID INTEGER
NOT NULL,NAME VARCHAR(80) NOT NULL,CLASS_NAME VARCHAR(50) NOT NULL,READ_ONLY CHAR(1)
DEFAULT '1')
+CREATE TABLE PREFERENCE_VALUE(ID INTEGER NOT NULL PRIMARY KEY,PREFERENCE_ID
INTEGER,VALUE LONGVARCHAR)
+CREATE TABLE PORTLET_ENTITY(ID INTEGER NOT NULL PRIMARY KEY,PORTLET_DEFINITION_ID
INTEGER NOT NULL,GUID VARCHAR(255) NOT NULL)
+CREATE TABLE SECURITY_ROLE_REFERENCE(ID INTEGER NOT NULL PRIMARY
KEY,PORTLET_DEFINITION_ID INTEGER NOT NULL,ROLE_NAME VARCHAR(150),ROLE_LINK
VARCHAR(150))
+CREATE TABLE LOCALIZED_DESCRIPTION(ID INTEGER NOT NULL PRIMARY KEY,OBJECT_ID
INTEGER NOT NULL,TYPE VARCHAR(25) NOT NULL,DESCRIPTION LONGVARCHAR NOT
NULL,LOCALE_STRING VARCHAR(50) NOT NULL)
+CREATE TABLE LOCALIZED_DISPLAY_NAME(ID INTEGER NOT NULL PRIMARY KEY,OBJECT_ID
INTEGER NOT NULL,TYPE VARCHAR(25) NOT NULL,DISPLAY_NAME LONGVARCHAR NOT
NULL,LOCALE_STRING VARCHAR(50) NOT NULL)
ALTER TABLE PREF_PROPERTY_VALUE ADD CONSTRAINT PREF_PROPERTY_VALUE_FK_2 FOREIGN
KEY(PROPERTY_KEY_ID) REFERENCES PREF_PROPERTY_KEY(PROPERTY_KEY_ID)
GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
GRANT ALL ON CLASS "org.hsqldb.Library" TO PUBLIC
1.4 +2 -2 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/columns.jsp
Index: columns.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/columns.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- columns.jsp 8 Jan 2004 04:09:20 -0000 1.3
+++ columns.jsp 12 Jan 2004 06:45:26 -0000 1.4
@@ -13,7 +13,7 @@
Fragment myFragment = (Fragment)renderRequest.getAttribute("fragment");
ContentDispatcher dispatcher =
(ContentDispatcher)renderRequest.getAttribute("dispatcher");
org.apache.pluto.om.entity.PortletEntity portletEntity =
- org.apache.jetspeed.services.entity.PortletEntityAccess.getEntity(
+ org.apache.jetspeed.entity.PortletEntityAccess.getEntity(
org.apache.jetspeed.util.JetspeedObjectID.createFromString(myFragment.getId()));
renderRequest.setAttribute("entity",portletEntity);
@@ -55,7 +55,7 @@
{
Fragment f = (Fragment)it.next();
org.apache.pluto.om.entity.PortletEntity fPE =
- org.apache.jetspeed.services.entity.PortletEntityAccess.getEntity(
+ org.apache.jetspeed.entity.PortletEntityAccess.getEntity(
org.apache.jetspeed.util.JetspeedObjectID.createFromString(f.getId()));
String fDeco = myPage.getDefaultDecorator(f.getType());
String fDecoTop = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
