taylor 2003/12/28 18:12:53
Modified: portal/src/java/org/apache/jetspeed/om/portlet/impl
PortletApplicationDefinitionImpl.java
portal/src/sql/hsql create-db.sql populate-db-default.sql
portal/src/webapp/WEB-INF/conf/ojb repository_jetspeed.xml
portal/src/webapp/WEB-INF/db/hsql Registry.script
Removed: portal/src/java/org/apache/jetspeed/om/registry
CachedParameter.java Category.java
CategoryIterator.java ContentURL.java
Description.java InvalidEntryException.java
MetaInfo.java Parameter.java
PortletControlEntry.java
PortletControllerEntry.java PortletEntry.java
PortletInfoEntry.java PortletIterator.java
PortletRegistry.java Registry.java
RegistryEntry.java RegistryException.java
Security.java SecurityAccess.java
SecurityAllow.java SecurityEntry.java
SkinEntry.java ToolDescriptor.java
portal/src/java/org/apache/jetspeed/om/registry/base
BaseApplication.java BaseCachedParameter.java
BaseCategory.java BaseContentURL.java
BaseMediaType.java BaseMetaInfo.java
BaseParameter.java BasePortletControlEntry.java
BasePortletControllerEntry.java
BasePortletEntry.java BasePortletInfoEntry.java
BaseRegistry.java BaseRegistryEntry.java
BaseSecurity.java BaseSecurityAccess.java
BaseSecurityAllow.java BaseSecurityAllowOwner.java
BaseSecurityEntry.java BaseSkinEntry.java
BaseToolDescriptor.java LocalRegistry.java
portal/src/java/org/apache/jetspeed/services/registry
JetspeedRegistry.java RegistryService.java
portal/src/java/org/apache/jetspeed/services/registry/impl
CastorConfiguration.java CastorHelper.java
CastorRegistryService.java FileRegistry.java
RegistryFragment.java RegistryWatcher.java
StandardRegistryService.java
Log:
- Added application type to Portlet Application.
- Removed unused Registry from J1, which was becoming out of sync
I've labeled the code 'PRE-2003-CLEANUP' if you need the code
Revision Changes Path
1.2 +19 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java
Index: PortletApplicationDefinitionImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletApplicationDefinitionImpl.java 10 Oct 2003 05:12:10 -0000 1.1
+++ PortletApplicationDefinitionImpl.java 29 Dec 2003 02:12:52 -0000 1.2
@@ -99,6 +99,8 @@
private PortletDefinitionListImpl portlets;
+ private int applicationType = MutablePortletApplication.PORTLET_APP;
+
/** Creates a new instance of BaseApplication */
public PortletApplicationDefinitionImpl()
{
@@ -246,6 +248,22 @@
public String getApplicationIdentifier()
{
return this.applicationIdentifier;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setApplicationType(int)
+ */
+ public void setApplicationType(int type)
+ {
+ this.applicationType = type;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getApplicationType()
+ */
+ public int getApplicationType()
+ {
+ return applicationType;
}
}
1.11 +1 -0 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- create-db.sql 26 Dec 2003 16:24:27 -0000 1.10
+++ create-db.sql 29 Dec 2003 02:12:53 -0000 1.11
@@ -7,6 +7,7 @@
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
);
1.8 +1 -1 jakarta-jetspeed-2/portal/src/sql/hsql/populate-db-default.sql
Index: populate-db-default.sql
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/sql/hsql/populate-db-default.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- populate-db-default.sql 26 Dec 2003 16:24:27 -0000 1.7
+++ populate-db-default.sql 29 Dec 2003 02:12:53 -0000 1.8
@@ -2,7 +2,7 @@
-- The Jetspeed Internal Portlet App
------------------------------------------
INSERT INTO WEB_APPLICATION VALUES(1,'/jetspeed');
-INSERT INTO PORTLET_APPLICATION VALUES (1, 'jetspeed', 'jetspeed', '1.0', NULL, 1);
+INSERT INTO PORTLET_APPLICATION VALUES (1, 'jetspeed', 'jetspeed', '1.0', 0, NULL,
1);
INSERT INTO PORTLET_DEFINITION VALUES(1, 'Layout',
'org.apache.jetspeed.portlets.layout.GenericLayoutPortlet',1,'Layout','-1',NULL);
1.16 +7 -5
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- repository_jetspeed.xml 26 Dec 2003 16:24:27 -0000 1.15
+++ repository_jetspeed.xml 29 Dec 2003 02:12:53 -0000 1.16
@@ -50,24 +50,26 @@
<field-descriptor
name="webApplicationId"
column="WEB_APP_ID"
- jdbc-type="INTEGER"
+ 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"
-
+ auto-delete="true"
element-class-ref="org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite"
collection-class="org.apache.jetspeed.om.collection.ManageablePortletDefinitionListImpl"
>
1.17 +2 -2
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Registry.script 26 Dec 2003 16:24:27 -0000 1.16
+++ Registry.script 29 Dec 2003 02:12:53 -0000 1.17
@@ -7,7 +7,7 @@
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),DESCRIPTION VARCHAR(80),WEB_APP_ID INTEGER NOT NULL,CONSTRAINT
UK_APPLICATION UNIQUE(APP_NAME))
+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)
@@ -126,7 +126,7 @@
CREATE ALIAS LENGTH FOR "org.hsqldb.Library.length"
CREATE ALIAS ROUND FOR "org.hsqldb.Library.round"
CREATE ALIAS REPLACE FOR "org.hsqldb.Library.replace"
-INSERT INTO PORTLET_APPLICATION VALUES(1,'jetspeed','jetspeed','1.0',NULL,1)
+INSERT INTO PORTLET_APPLICATION VALUES(1,'jetspeed','jetspeed','1.0',0,NULL,1)
INSERT INTO WEB_APPLICATION VALUES(1,'/jetspeed')
INSERT INTO PORTLET_DEFINITION
VALUES(1,'Layout','org.apache.jetspeed.portlets.layout.GenericLayoutPortlet',1,'Layout','-1',NULL)
INSERT INTO MEDIA_TYPE VALUES(0,'html','UTF-8','HTML','Rich HTML for HTML 4.0
compliants browsers')
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
