taylor 2004/01/06 11:31:31
Modified: portal maven.xml project.xml
portal/src/java/org/apache/jetspeed/tools/pamanager
PortletDescriptorUtilities.java
portal/src/sql/hsql populate-db-default.sql
portal/src/test/org/apache/jetspeed/capability
TestCapability.java
portal/src/test/org/apache/jetspeed/container
TestPortletURL.java
portal/src/webapp/WEB-INF/conf jetspeed.properties
portal/src/webapp/WEB-INF/conf/ojb repository_jetspeed.xml
portal/src/webapp/WEB-INF/db/hsql Registry.script
Log:
bug fixes:
- mapping was wrong for PortletEntities
- database conflict with pam.register and auto-population of database.
removed auto-population of database
- added some useful logging to PAM
- removed old PSML Manager stuff from jetspeed.properties
Revision Changes Path
1.23 +1 -1 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maven.xml 31 Dec 2003 09:46:35 -0000 1.22
+++ maven.xml 6 Jan 2004 19:31:31 -0000 1.23
@@ -4,7 +4,7 @@
xmlns:reactor="reactor">
<!-- Target of maven test:single test -->
-<property name='testcase' value='org.apache.jetspeed.capability.TestCapability'/>
+<property name='testcase'
value='org.apache.jetspeed.tools.pamanager.TestPortletDescriptor'/>
<!--
<goal name="jaxb:portlet"
1.19 +1 -1 jakarta-jetspeed-2/portal/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 31 Dec 2003 09:46:35 -0000 1.18
+++ project.xml 6 Jan 2004 19:31:31 -0000 1.19
@@ -282,7 +282,7 @@
<exclude>org/apache/jetspeed/aggregator/TestAggregator.java</exclude>
<!-- The follow are failing and should be fixed or removed -->
<exclude>org/apache/jetspeed/tools/TestWebXML.java</exclude>
-
<exclude>org/apache/jetspeed/services/profiler/TestProfilerService.java</exclude>
+ <exclude>org/apache/jetspeed/test/JetspeedTest</exclude>
<!-- Preferences SPI exclude -->
<exclude>org/apache/jetspeed/spi/services/prefs/TestUtils.java</exclude>
</excludes>
1.3 +2 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletDescriptorUtilities.java
Index: PortletDescriptorUtilities.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletDescriptorUtilities.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletDescriptorUtilities.java 17 Oct 2003 20:01:38 -0000 1.2
+++ PortletDescriptorUtilities.java 6 Jan 2004 19:31:31 -0000 1.3
@@ -135,7 +135,7 @@
}
catch (Throwable t)
{
- String msg = "Could not unmarshal: " + pathPortletXML;
+ String msg = "Could not unmarshal: " + pathPortletXML + ", " +
t.getLocalizedMessage();
log.error(msg, t);
throw new PortletApplicationException(msg, t);
}
1.9 +4 -4 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- populate-db-default.sql 29 Dec 2003 02:12:53 -0000 1.8
+++ populate-db-default.sql 6 Jan 2004 19:31:31 -0000 1.9
@@ -1,10 +1,10 @@
------------------------------------------
-- The Jetspeed Internal Portlet App
------------------------------------------
-INSERT INTO WEB_APPLICATION VALUES(1,'/jetspeed');
-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);
+-- INSERT INTO WEB_APPLICATION VALUES(1,'/jetspeed');
+-- 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);
------------------------------------------
-- Add seed data for Capability
1.4 +3 -2
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/capability/TestCapability.java
Index: TestCapability.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/capability/TestCapability.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestCapability.java 26 Dec 2003 16:24:27 -0000 1.3
+++ TestCapability.java 6 Jan 2004 19:31:31 -0000 1.4
@@ -100,9 +100,10 @@
new String[] { TestCapability.class.getName()});
}
- public void setup()
+ public void setUp()
{
System.out.println("Setup: Testing Capability Service");
+ super.setUp();
}
/**
* Creates the test suite.
1.2 +2 -2
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/container/TestPortletURL.java
Index: TestPortletURL.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/container/TestPortletURL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestPortletURL.java 28 Jul 2003 23:47:54 -0000 1.1
+++ TestPortletURL.java 6 Jan 2004 19:31:31 -0000 1.2
@@ -91,7 +91,7 @@
new String[] { TestPortletURL.class.getName()});
}
- public void setup()
+ public void setUp()
{
System.out.println("Setup: Testing Portlet URL impl");
}
1.18 +1 -52
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jetspeed.properties 31 Dec 2003 09:46:36 -0000 1.17
+++ jetspeed.properties 6 Jan 2004 19:31:31 -0000 1.18
@@ -146,57 +146,6 @@
services.capability.mediatype.impl =
org.apache.jetspeed.capability.impl.MediaTypeImpl
# -------------------------------------------------------------------
-# P S M L M A N A G E R
-# -------------------------------------------------------------------
-# Select your PSML Manager service by uncommenting it.
-# The default is 'CastorPsmlManagerService'
-# If you uncomment one service, you must comment-out the other service
- -------------------------------------------------------------------
-services.PsmlManager.classname=org.apache.jetspeed.services.psml.CastorPsmlManagerService
-#
services.PsmlManager.classname=org.apache.jetspeed.services.psml.db.DatabasePsmlManagerService
-
-#services.PsmlManager.default-resource=default.psml
-#services.PsmlManager.media-types=html:wml
-#services.PsmlManager.admin=admin
-
-# -------------------------------------------------------------------
-# File-based Castor PSML Service
-# -------------------------------------------------------------------
-services.PsmlManager.root=/WEB-INF/psml
-services.PsmlManager.ext=.psml
-services.PsmlManager.mapping=/WEB-INF/conf/psml-mapping.xml
-# scan rate in seconds (every 2 minutes)
-services.PsmlManager.scanRate=120
-# cache size - number of PSML pages to cache
-services.PsmlManager.cacheSize=100
-
-# -------------------------------------------------------------------
-# Database PSML Service
-# -------------------------------------------------------------------
-#The following property is used for DatabasePsmlManagerService only.
-# The default is false that is caching is not allowed with
DatabasePsmlManagerService,
-# as the current implementation of caching does not work on a
-# distributed environment. It works only in a single server environment.
-services.PsmlManager.caching-on=false
-
-
-# -------------------------------------------------------------------
-# PSMLImportManager Service
-# -------------------------------------------------------------------
-# Select your PSML Import Manager service by uncommenting it.
-# The default is 'CastorPsmlManagerService'
-# If you uncomment one importer service, you must comment-out the other service
-# You must run the importer manually. From the build directory, type 'ant import'
-# the PsmlImportManager is the service which will export the psml from its
datastore to the current
-# PsmlManager's datastore. The PsmlImportManager and PsmlManager should never be
the same.
-
-# Select this service to import from File System to the Database (make sure that
DatabasePsmlManagerService is selected above)
-#
services.PsmlImportManager.classname=org.apache.jetspeed.services.psml.CastorPsmlManagerService
-
-# Select this service to import from the Database to the File System (make sure
that CastorPsmlManagerService is selected above)
-###
services.PsmlImportManager.classname=org.apache.jetspeed.services.psml.db.DatabasePsmlManagerService
-
-# -------------------------------------------------------------------
# P R O F I L E R
# -------------------------------------------------------------------
services.profiler.classname=org.apache.jetspeed.profiler.impl.JetspeedProfilerService
1.17 +1 -1
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- repository_jetspeed.xml 29 Dec 2003 02:12:53 -0000 1.16
+++ repository_jetspeed.xml 6 Jan 2004 19:31:31 -0000 1.17
@@ -1023,7 +1023,7 @@
</reference-descriptor>
<collection-descriptor
- name="prefSet"
+ name="originalPreferences"
element-class-ref="org.apache.jetspeed.om.preference.impl.PreferenceImpl"
collection-class="org.apache.jetspeed.om.collection.ManageablePreferenceSetImpl"
auto-delete="true"
1.18 +0 -3
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Registry.script 29 Dec 2003 02:12:53 -0000 1.17
+++ Registry.script 6 Jan 2004 19:31:31 -0000 1.18
@@ -126,9 +126,6 @@
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',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')
INSERT INTO MEDIA_TYPE VALUES(1,'wml','UTF-8','WML','Format for mobile phones and
PDAs compatible with WML 1.1')
INSERT INTO MEDIA_TYPE VALUES(2,'vxml','UTF-8','VoiceXML','Format suitable for use
with an audio VoiceXML server')
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
