taylor 2004/02/28 21:10:03
Modified: portal maven.xml project.xml
portal/src/java/org/apache/jetspeed/capability/impl
CapabilityMapImpl.java JetspeedCapabilities.java
portal/src/java/org/apache/jetspeed/profiler/containers
profiler-container.groovy
portal/src/java/org/apache/jetspeed/profiler/impl
JetspeedProfiler.java
portal/src/sql/hsql populate-db-default.sql
portal/src/test/org/apache/jetspeed/capability
TestCapability.java
portal/src/test/org/apache/jetspeed/profiler
TestProfiler.java
portal/src/test/org/apache/jetspeed/tools/pamanager
TestPortletDescriptor.java
portal/src/webapp/WEB-INF/assembly jetspeed.groovy
portal/src/webapp/WEB-INF/conf jetspeed.properties
Log:
Two more portal tests passing:
- Capability
- Profiler
These tests are still failing:
- Portlet Descriptor (relies on Registry being populated, should get that in next
commit)
- SimpleDeplyment (relies on Registry being populated, should get that in next
commit)
- JMX (needs conversion to component)
- Prefs (shouldn't this test be deleted?)
- PropManager (shouldn't this test be deleted?)
Revision Changes Path
1.52 +3 -1 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- maven.xml 27 Feb 2004 18:00:36 -0000 1.51
+++ maven.xml 29 Feb 2004 05:10:03 -0000 1.52
@@ -4,7 +4,9 @@
xmlns:reactor="reactor"
xmlns:maven="jelly:maven">
-
+ <!-- Target of maven test:single test -->
+<property name='testcase'
value='org.apache.jetspeed.tools.pamanager.TestPortletDescriptor'/>
+
<preGoal name="java:prepare-filesystem">
<echo message="====================================" />
<echo message=" Copying OJB Metadata " />
1.42 +0 -3 jakarta-jetspeed-2/portal/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- project.xml 27 Feb 2004 17:59:36 -0000 1.41
+++ project.xml 29 Feb 2004 05:10:03 -0000 1.42
@@ -400,9 +400,6 @@
<!-- Excluded due to persistence plugin issues -->
<exclude>org/apache/jetspeed/security/Test*.java</exclude>
<!-- End Excluded due to persistence plugin issues -->
-
- <!-- this is broken due to OJB not finding registry.xml file -->
- <exclude>org/apache/jetspeed/profiler/TestProfiler.java</exclude>
<exclude>org/apache/jetspeed/spi/services/prefs/TestUtils.java</exclude>
</excludes>
1.5 +3 -9
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/CapabilityMapImpl.java
Index: CapabilityMapImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/CapabilityMapImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CapabilityMapImpl.java 28 Feb 2004 20:05:50 -0000 1.4
+++ CapabilityMapImpl.java 29 Feb 2004 05:10:03 -0000 1.5
@@ -128,23 +128,17 @@
{
// Return the value that matches the preferredMimeType defined in the Client
int prefMimeTypeId = this.client.getPreferredMimeTypeId();
-System.out.println("+++ MIMETYPE ID is " + prefMimeTypeId);
-System.out.println("+++ CLIENT is " + client.getName());
- MimeType mt = null;
-
-System.out.println("+++ MIMETYPE MAP SIZE is " + mimeTypeMap.values().size());
-
+ MimeType mt = null;
Iterator e = this.mimeTypeMap.values().iterator();
while (e.hasNext())
{
mt = (MimeType) e.next();
-System.out.println("+++ MT ID is " + mt.getMimetypeId());
if (mt.getMimetypeId() == prefMimeTypeId)
return mt;
}
-System.out.println("+++ NEVER " + prefMimeTypeId);
+ System.out.println("+++ NEVER " + prefMimeTypeId);
// Should never reach this point. A preferred value needs to be set
return null; // TODO: NEVER RETURN NULL
1.3 +1 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/JetspeedCapabilities.java
Index: JetspeedCapabilities.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/JetspeedCapabilities.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedCapabilities.java 28 Feb 2004 20:05:50 -0000 1.2
+++ JetspeedCapabilities.java 29 Feb 2004 05:10:03 -0000 1.3
@@ -348,14 +348,11 @@
if (co.isEmpty())
{
- System.out.println("collection is empty");
MediaType mt = getMediaType("html");
Vector v = new Vector();
v.add(mt);
return v;
}
- System.out.println("collection is NOT empty");
-
return co;
}
1.3 +24 -19
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/containers/profiler-container.groovy
Index: profiler-container.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/containers/profiler-container.groovy,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- profiler-container.groovy 27 Feb 2004 18:59:02 -0000 1.2
+++ profiler-container.groovy 29 Feb 2004 05:10:03 -0000 1.3
@@ -7,30 +7,34 @@
import org.hsqldb.jdbcDriver
import org.apache.jetspeed.components.jndi.JNDIComponent
import org.apache.jetspeed.components.jndi.TyrexJNDIComponent
-import org.apache.jetspeed.components.datasource.DBCPDatasourceComponent
+import org.apache.jetspeed.components.datasource.BoundDBCPDatasourceComponent
import org.apache.jetspeed.components.datasource.DatasourceComponent
import org.apache.commons.pool.impl.GenericObjectPool
import org.apache.jetspeed.components.persistence.store.ojb.OJBTypeIntializer
import org.apache.jetspeed.components.persistence.store.ojb.otm.OTMStoreImpl
import
org.apache.jetspeed.components.persistence.store.impl.DefaultPersistenceStoreContainer
import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
-
+import org.apache.jetspeed.page.PageManager
+import org.apache.jetspeed.page.impl.CastorXmlPageManager
+import org.apache.jetspeed.cache.file.FileCache
import org.apache.jetspeed.profiler.Profiler
import org.apache.jetspeed.profiler.impl.JetspeedProfiler
+import org.apache.jetspeed.components.ComponentAssemblyTestCase
import java.io.File
import java.util.Properties
+applicationRoot = ComponentAssemblyTestCase.getApplicationRoot("portal", "test")
+
// create the root container
container = new DefaultPicoContainer()
-Class dsClass =
Class.forName("org.apache.jetspeed.components.datasource.DatasourceComponent")
-String url = System.getProperty("org.apache.jetspeed.database.url")
-String driver = System.getProperty("org.apache.jetspeed.database.driver")
-String user = System.getProperty("org.apache.jetspeed.database.user")
-String password = System.getProperty("org.apache.jetspeed.database.password")
+// This JNDI component helps us publish the datasource
+Class jndiClass = JNDIComponent
+JNDIComponent jndiImpl = new TyrexJNDIComponent()
+container.registerComponentInstance(jndiClass, jndiImpl)
-Class dsClass =
Class.forName("org.apache.jetspeed.components.datasource.DatasourceComponent")
+Class dsClass = DatasourceComponent
String url = System.getProperty("org.apache.jetspeed.database.url")
String driver = System.getProperty("org.apache.jetspeed.database.driver")
String user = System.getProperty("org.apache.jetspeed.database.user")
@@ -38,18 +42,9 @@
if(url != null)
{
- container.registerComponentInstance(dsClass, new DBCPDatasourceComponent(user,
password, driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
+ container.registerComponentInstance(dsClass, new
BoundDBCPDatasourceComponent(user, password, driver, url, 20, 5000,
GenericObjectPool.WHEN_EXHAUSTED_GROW, true, "jetspeed", jndiImpl))
}
-// This JNDI component helps us publish the datasource
-Class jndiClass = Class.forName("org.apache.jetspeed.components.jndi.JNDIComponent")
-Class tyrexJndiClass =
Class.forName("org.apache.jetspeed.components.jndi.TyrexJNDIComponent")
-container.registerComponentImplementation(jndiClass, tyrexJndiClass)
-
-// Create a datasource based on the HSQL server we just created
-Class dsClass =
Class.forName("org.apache.jetspeed.components.datasource.DatasourceComponent")
-container.registerComponentInstance(dsClass, new DBCPDatasourceComponent("sa","",
"org.hsqldb.jdbcDriver", "jdbc:hsqldb:hsql://127.0.0.1", 20, 5000,
GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
-
//
// Persistence
PersistenceContainer pContainer = new DefaultPersistenceStoreContainer(300000,
10000)
@@ -66,6 +61,16 @@
container.registerComponentInstance(pContainerClass, pContainer);
//
+// Page Manager
+//
+root = applicationRoot + "/testdata/pages"
+Long scanRate = 120
+cacheSize = 100
+fileCache = new FileCache(scanRate, cacheSize)
+pageManager = new CastorXmlPageManager(idgenerator, fileCache, root)
+container.registerComponentInstance(PageManager, pageManager)
+
+//
// Profiler
//
props = new Properties()
@@ -76,6 +81,6 @@
props.put("principalRule.impl",
"org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl")
props.put("profilingRule.impl",
"org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule")
-container.registerComponentInstance(Profiler, new JetspeedProfiler(pContainer,
props))
+container.registerComponentInstance(Profiler, new JetspeedProfiler(pContainer,
pageManager, props))
return container
1.2 +12 -11
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java
Index: JetspeedProfiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedProfiler.java 26 Feb 2004 05:38:03 -0000 1.1
+++ JetspeedProfiler.java 29 Feb 2004 05:10:03 -0000 1.2
@@ -27,7 +27,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.components.persistence.store.Filter;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer;
@@ -63,6 +62,8 @@
private PersistenceStoreContainer pContainer;
private String storeName = "jetspeed";
+ PageManager pageManager;
+
/** The default locator class implementation */
private Class locatorClass = JetspeedProfileLocator.class;
/** The default principalRule association class implementation */
@@ -75,12 +76,12 @@
private String anonymousUser = "anon";
- public JetspeedProfiler(PersistenceStoreContainer pContainer, String storeName)
+ public JetspeedProfiler(PersistenceStoreContainer pContainer, PageManager
pageManager, String storeName)
{
this.pContainer = pContainer;
+ this.pageManager = pageManager;
this.storeName = storeName;
}
-
/**
* Create a JetspeedProfiler with properties. Expected properties are:
@@ -95,17 +96,19 @@
* @param pContainer The persistence store container
* @param properties Properties for this component described above
*/
- public JetspeedProfiler(PersistenceStoreContainer pContainer, Properties
properties)
+ public JetspeedProfiler(PersistenceStoreContainer pContainer, PageManager
pageManager, Properties properties)
{
this.pContainer = pContainer;
+ this.pageManager = pageManager;
this.storeName = properties.getProperty("storeName", "jetspeed");
this.defaultRule = properties.getProperty("defaultRule", "j1");
this.anonymousUser = properties.getProperty("anonymousUser", "anon");
- initModelClasses(properties);
+ initModelClasses(properties); // TODO: move this to start()
}
- public JetspeedProfiler(PersistenceStoreContainer pContainer)
+ public JetspeedProfiler(PersistenceStoreContainer pContainer, PageManager
pageManager)
{
+ this.pageManager = pageManager;
this.pContainer = pContainer;
}
@@ -134,7 +137,7 @@
}
public void start()
- {
+ {
}
public void stop()
@@ -276,9 +279,7 @@
{
// TODO: under construction, for now use the name
- // TODO: NEXT load the page manager as a dependency when i make the
profiler a service
- PageManager pm =
(PageManager)Jetspeed.getComponentManager().getComponent("CastorXmlPageManager");
- return pm.getPage(locator);
+ return pageManager.getPage(locator);
/*
Page page = null;
1.12 +139 -139 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- populate-db-default.sql 19 Jan 2004 23:40:02 -0000 1.11
+++ populate-db-default.sql 29 Feb 2004 05:10:03 -0000 1.12
@@ -9,130 +9,130 @@
------------------------------------------
-- Add seed data for Capability
------------------------------------------
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(0,'HTML_3_2');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(1,'HTML_4_0');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(2,'HTML_TABLE');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(3,'HTML_NESTED_TABLE');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(4,'HTML_IMAGE');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(5, 'HTML_FORM');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(6, 'HTML_FRAME');
-
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(7,'HTML_JAVA');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(8,'HTML_JAVA1_0');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(9,'HTML_JAVA1_1');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(10,'HTML_JAVA1_2');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(11,'HTML_JAVA_JRE');
-
-
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(12,'HTML_JSCRIPT');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(13,'HTML_JSCRIPT1_0');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(14,'HTML_JSCRIPT1_1');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(15,'HTML_JSCRIPT1_2');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(16,'HTML_JAVASCRIPT');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(17,'HTML_JAVASCRIPT_1_0');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(18,'HTML_JAVASCRIPT_1_1');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(19,'HTML_JAVASCRIPT_1_2');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(1,'HTML_3_2');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(2,'HTML_4_0');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(3,'HTML_TABLE');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(4,'HTML_NESTED_TABLE');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(5,'HTML_IMAGE');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(6, 'HTML_FORM');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(7, 'HTML_FRAME');
+
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(8,'HTML_JAVA');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(9,'HTML_JAVA1_0');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(10,'HTML_JAVA1_1');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(11,'HTML_JAVA1_2');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(12,'HTML_JAVA_JRE');
+
+
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(13,'HTML_JSCRIPT');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(14,'HTML_JSCRIPT1_0');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(15,'HTML_JSCRIPT1_1');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(16,'HTML_JSCRIPT1_2');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(17,'HTML_JAVASCRIPT');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(18,'HTML_JAVASCRIPT_1_0');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(19,'HTML_JAVASCRIPT_1_1');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(20,'HTML_JAVASCRIPT_1_2');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(20,'HTML_PLUGIN');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(21,'HTML_PLUGIN');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(21,'HTML_ACTIVEX');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(22,'HTML_PLUGIN');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(22,'HTML_ACTIVEX');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(23,'HTML_PLUGIN');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(23,'HTML_CSS1');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(24,'HTML_CSS2');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(25,'HTML_CSSP');
-
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(26,'HTML_IFRAME');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(27,'HTML_LAYER');
-
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(28,'HTML_DOM_IE');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(29,'HTML_DOM_NS4');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(30,'HTML_DOM_1');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(31,'HTML_DOM_2');
-
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(32,'WML_1_0');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(33,'WML_1_1');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(34,'WML_TABLE');
-
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(35,'XML_XSLT');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(36,'XML_XPATH');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(37,'XML_XINCLUDE');
-
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(38,'HTTP_1_1');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(39,'HTTP_COOKIE');
-
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(40,'HTML_XML');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(41,'HTML_XSL');
-INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(42,'HTML_DOM');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(24,'HTML_CSS1');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(25,'HTML_CSS2');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(26,'HTML_CSSP');
+
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(27,'HTML_IFRAME');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(28,'HTML_LAYER');
+
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(29,'HTML_DOM_IE');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(30,'HTML_DOM_NS4');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(31,'HTML_DOM_1');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(32,'HTML_DOM_2');
+
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(33,'WML_1_0');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(34,'WML_1_1');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(35,'WML_TABLE');
+
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(36,'XML_XSLT');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(37,'XML_XPATH');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(38,'XML_XINCLUDE');
+
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(39,'HTTP_1_1');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(40,'HTTP_COOKIE');
+
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(41,'HTML_XML');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(42,'HTML_XSL');
+INSERT INTO CAPABILITY (CAPABILITY_ID, CAPABILITY) VALUES(43,'HTML_DOM');
---------------------------------------------------------------------------
-- MIME TYPES
---------------------------------------------------------------------------
-INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(0,'text/html');
-INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(1,'text/vnd.wap.wml');
-INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(2,'text/vxml');
-INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(3,'text/xml');
-INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(4,'text/xhtml');
+INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(1,'text/html');
+INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(2,'text/vnd.wap.wml');
+INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(3,'text/vxml');
+INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(4,'text/xml');
+INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(5,'text/xhtml');
----------------------------------------------------------------------------
-- Supported clients
----------------------------------------------------------------------------
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(1,'ie5','.*MSIE 5.*','Microsoft','None','5.5',0);
+VALUES(1,'ie5','.*MSIE 5.*','Microsoft','None','5.5',1);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(2,'ns4','.*Mozilla/4.*','Netscape','None','4.75',0);
+VALUES(2,'ns4','.*Mozilla/4.*','Netscape','None','4.75',1);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(3,'mozilla','.*Mozilla/5.*','Mozilla','Mozilla','1.x',0);
+VALUES(3,'mozilla','.*Mozilla/5.*','Mozilla','Mozilla','1.x',1);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(4,'lynx','Lynx.*','GNU','None','',0);
+VALUES(4,'lynx','Lynx.*','GNU','None','',1);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(5,'nokia_generic','Nokia.*','Nokia','Generic','',1);
+VALUES(5,'nokia_generic','Nokia.*','Nokia','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(6,'up','UP.*|.*UP\.Browser.*','United Planet','Generic','',1);
+VALUES(6,'up','UP.*|.*UP\.Browser.*','United Planet','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(7,'sonyericsson','Ercis.*|SonyE.*','SonyEricsson','Generic','',1);
+VALUES(7,'sonyericsson','Ercis.*|SonyE.*','SonyEricsson','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(8,'wapalizer','Wapalizer.*','Wapalizer','Generic','',1);
+VALUES(8,'wapalizer','Wapalizer.*','Wapalizer','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(9,'klondike','Klondike.*','Klondike','Generic','',1);
+VALUES(9,'klondike','Klondike.*','Klondike','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(10,'wml_generic','.*WML.*|.*WAP.*|.*Wap.*|.*wml.*','Generic','Generic','',1);
+VALUES(10,'wml_generic','.*WML.*|.*WAP.*|.*Wap.*|.*wml.*','Generic','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(11,'vxml_generic','.*VoiceXML.*','Generic','Generic','',2);
+VALUES(11,'vxml_generic','.*VoiceXML.*','Generic','Generic','',3);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(12,'nuance','Nuance.*','Nuance','Generic','',2);
+VALUES(12,'nuance','Nuance.*','Nuance','Generic','',3);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(13,'agentxml','agentxml/1.0.*','Unknown','Generic','',3);
+VALUES(13,'agentxml','agentxml/1.0.*','Unknown','Generic','',4);
INSERT INTO CLIENT (CLIENT_ID,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL
,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(14,'opera7','.*Opera/7.*','Opera','Opera7','7.x',0);
+VALUES(14,'opera7','.*Opera/7.*','Opera','Opera7','7.x',1);
----------------------------------------------------------------------------------------
-- Supported Media types
----------------------------------------------------------------------------------------
INSERT INTO MEDIA_TYPE (MEDIATYPE_ID,NAME, CHARACTER_SET, TITLE, DESCRIPTION)
-VALUES(0,'html','UTF-8','HTML','Rich HTML for HTML 4.0 compliants browsers');
+VALUES(1,'html','UTF-8','HTML','Rich HTML for HTML 4.0 compliants browsers');
INSERT INTO MEDIA_TYPE (MEDIATYPE_ID,NAME, CHARACTER_SET, TITLE, DESCRIPTION)
-VALUES(1,'wml','UTF-8','WML','Format for mobile phones and PDAs compatible with WML
1.1');
+VALUES(2,'wml','UTF-8','WML','Format for mobile phones and PDAs compatible with WML
1.1');
INSERT INTO MEDIA_TYPE (MEDIATYPE_ID,NAME, CHARACTER_SET, TITLE, DESCRIPTION)
-VALUES(2,'vxml','UTF-8','VoiceXML','Format suitable for use with an audio VoiceXML
server');
+VALUES(3,'vxml','UTF-8','VoiceXML','Format suitable for use with an audio VoiceXML
server');
INSERT INTO MEDIA_TYPE (MEDIATYPE_ID,NAME, CHARACTER_SET, TITLE, DESCRIPTION)
-VALUES(3,'xml','','XML','XML 1.0');
+VALUES(4,'xml','','XML','XML 1.0');
------------------------------------------------------
-- Client association
@@ -140,111 +140,111 @@
-- Client To Capability
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,0);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,7);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,16);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,2);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,1);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,8);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,17);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,3);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,5);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,6);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,4);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,21);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,23);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,6);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,7);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,5);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,22);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,24);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,25);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,26);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,28);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,39);
-
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,0);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,27);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,29);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(1,40);
+
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,1);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,8);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,17);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,3);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,6);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,7);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,16);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,2);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,5);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,6);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,4);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,23);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,27);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,20);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,29);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,39);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,24);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,28);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,21);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,30);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(2,40);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,0);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,1);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,7);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,11);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,16);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,2);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,8);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,12);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,17);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,3);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,5);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,6);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,26);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,4);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,23);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,6);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,7);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,27);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,5);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,24);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,25);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,30);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,22);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,39);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,26);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,31);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,23);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(3,40);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(4,2);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(4,3);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(4,5);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(4,4);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(4,6);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(4,39);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(4,7);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(4,40);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,0);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,1);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,2);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,7);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,11);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,16);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,3);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,5);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,6);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,8);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,12);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,17);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,4);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,26);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,23);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,6);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,7);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,5);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,27);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,24);
INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,25);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,30);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,39);
-INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,22);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,26);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,31);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,40);
+INSERT INTO CLIENT_TO_CAPABILITY(CLIENT_ID,CAPABILITY_ID )VALUES(14,23);
-- Client To Mimetype
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(1,0);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(1,3);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(1,1);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(1,4);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(2,0);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(2,1);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(3,0);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(3,1);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(3,5);
INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(3,4);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(3,3);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(4,0);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(4,1);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(5,1);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(5,2);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(6,1);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(6,2);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(7,1);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(7,2);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(8,1);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(8,2);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(9,1);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(9,2);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(10,1);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(10,2);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(11,2);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(11,3);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(12,2);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(12,3);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(13,3);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(13,4);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(14,0);
-INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(14,3);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(14,1);
INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(14,4);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(14,5);
----------------------------------------------------
-- Media Type association
@@ -254,10 +254,10 @@
-- Media Type To Mimetype
-INSERT INTO MEDIATYPE_TO_MIMETYPE(MEDIATYPE_ID ,MIMETYPE_ID)VALUES(0,0);
INSERT INTO MEDIATYPE_TO_MIMETYPE(MEDIATYPE_ID ,MIMETYPE_ID)VALUES(1,1);
INSERT INTO MEDIATYPE_TO_MIMETYPE(MEDIATYPE_ID ,MIMETYPE_ID)VALUES(2,2);
INSERT INTO MEDIATYPE_TO_MIMETYPE(MEDIATYPE_ID ,MIMETYPE_ID)VALUES(3,3);
+INSERT INTO MEDIATYPE_TO_MIMETYPE(MEDIATYPE_ID ,MIMETYPE_ID)VALUES(4,4);
-----------------------
-- Profiler
1.8 +5 -30
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestCapability.java 28 Feb 2004 19:45:50 -0000 1.7
+++ TestCapability.java 29 Feb 2004 05:10:03 -0000 1.8
@@ -54,17 +54,12 @@
package org.apache.jetspeed.capability;
-import java.io.FileInputStream;
import java.util.Iterator;
-import java.util.Properties;
import junit.framework.Test;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4jFactory;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
import org.apache.jetspeed.components.ComponentAwareTestSuite;
-import org.apache.log4j.PropertyConfigurator;
import org.picocontainer.MutablePicoContainer;
/**
@@ -96,10 +91,6 @@
super(name);
}
- public static final String LOG4J_CONFIG_FILE = "log4j.file";
-
- /** The default value for the Log4J File */
- public static final String LOG4J_CONFIG_FILE_DEFAULT =
"src/webapp/WEB-INF/conf/Log4j.properties";
/**
* Start the tests.
@@ -114,23 +105,7 @@
protected void setUp() throws Exception
{
- super.setUp();
-
- System.out.println("MAIN --------------");
- String log4jFile = LOG4J_CONFIG_FILE_DEFAULT;
- Properties p = new Properties();
- try
- {
- p.load(new FileInputStream(log4jFile));
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- PropertyConfigurator.configure(p);
-
- System.getProperties().setProperty(LogFactory.class.getName(),
Log4jFactory.class.getName());
-
+ super.setUp();
container = (MutablePicoContainer) getContainer();
capabilities = (Capabilities)
container.getComponentInstance(Capabilities.class);
}
@@ -159,16 +134,16 @@
// Find specific client -- testing pattern matching
String userAgent;
System.out.println("Testing all supported Clients...");
-/*
+
userAgent = "Opera/7.0";
System.out.println("Find pattern: " + userAgent);
CapabilityMap cm = capabilities.getCapabilityMap(userAgent);
assertNotNull("getCapabilityMap is null", cm);
capabilityMapReport(cm);
-*/
+
userAgent = "Mozilla/4.0";
System.out.println("Find pattern: " + userAgent);
- CapabilityMap cm = capabilities.getCapabilityMap(userAgent);
+ cm = capabilities.getCapabilityMap(userAgent);
assertNotNull("getCapabilityMap is null", cm);
capabilityMapReport(cm);
1.8 +6 -6
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/profiler/TestProfiler.java
Index: TestProfiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/profiler/TestProfiler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestProfiler.java 25 Feb 2004 22:22:04 -0000 1.7
+++ TestProfiler.java 29 Feb 2004 05:10:03 -0000 1.8
@@ -65,7 +65,7 @@
import junit.framework.Test;
-import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.JetspeedPortalContext;
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
import org.apache.jetspeed.components.ComponentAwareTestSuite;
@@ -281,7 +281,7 @@
{
assertNotNull("profiler service is null", profiler);
- PortalContext pc = Jetspeed.getContext();
+ PortalContext pc = new JetspeedPortalContext(null); //
Jetspeed.getContext();
RequestContext request = new MockRequestContext(pc, "default-other");
request.setSubject(createSubject("anon"));
@@ -374,7 +374,7 @@
{
assertNotNull("profiler service is null", profiler);
- PortalContext pc = Jetspeed.getContext();
+ PortalContext pc = new JetspeedPortalContext(null); //
Jetspeed.getContext();
RequestContext request = new MockRequestContext(pc);
request.setSubject(createSubject("anon"));
@@ -389,14 +389,14 @@
System.out.println("page = " + locator.getValue("page"));
Page page = profiler.getPage(locator);
- assertNotNull("page is null", page);
+ assertNotNull("page is null", page);
}
public void testPath() throws Exception
{
assertNotNull("profiler service is null", profiler);
- PortalContext pc = Jetspeed.getContext();
+ PortalContext pc = new JetspeedPortalContext(null); //
Jetspeed.getContext();
RequestContext request = new MockRequestContext(pc, "/football/nfl/chiefs");
ProfilingRule rule = profiler.getRule("path");
ProfileLocator locator = profiler.getProfile(request, rule);
1.13 +48 -27
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestPortletDescriptor.java 23 Feb 2004 13:15:56 -0000 1.12
+++ TestPortletDescriptor.java 29 Feb 2004 05:10:03 -0000 1.13
@@ -53,15 +53,20 @@
*/
package org.apache.jetspeed.tools.pamanager;
+import java.io.FileInputStream;
import java.util.Iterator;
import java.util.Locale;
+import java.util.Properties;
import javax.portlet.PortletMode;
import junit.framework.Test;
import junit.textui.TestRunner;
-import org.apache.jetspeed.Jetspeed;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.impl.Log4jFactory;
+import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
+import org.apache.jetspeed.components.ComponentAwareTestSuite;
import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.om.common.MutableLanguage;
@@ -72,8 +77,7 @@
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
import org.apache.jetspeed.persistence.PersistencePlugin;
import org.apache.jetspeed.persistence.PersistenceService;
-import org.apache.jetspeed.test.JetspeedTest;
-import org.apache.jetspeed.test.JetspeedTestSuite;
+import org.apache.log4j.PropertyConfigurator;
import org.apache.pluto.om.common.DisplayName;
import org.apache.pluto.om.common.LanguageSet;
import org.apache.pluto.om.common.ParameterSet;
@@ -82,6 +86,7 @@
import org.apache.pluto.om.portlet.ContentTypeSet;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletDefinitionList;
+import org.picocontainer.MutablePicoContainer;
/**
* TestPortletDescriptor - tests loading the portlet.xml deployment descriptor
@@ -91,9 +96,10 @@
*
* @version $Id$
*/
-public class TestPortletDescriptor extends JetspeedTest
+public class TestPortletDescriptor extends AbstractComponentAwareTestCase
{
private PortletRegistryComponent registry;
+ private MutablePicoContainer container;
/**
* Defines the testcase name for JUnit.
@@ -115,6 +121,37 @@
TestRunner.main(new String[] { TestPortletDescriptor.class.getName()});
}
+ public static final String LOG4J_CONFIG_FILE = "log4j.file";
+ // TODO: make this relative, move it into script
+ public static final String LOG4J_CONFIG_FILE_DEFAULT =
"src/webapp/WEB-INF/conf/Log4j.properties";
+
+ protected void setUp() throws Exception
+ {
+ // super.setUp();
+
+ // TODO: this is REALLY strange. If I don't setup LOG4J here Digester
crashes with a NPE
+ // if I setup Log4J in my super class, Digester crashes ... mysterious
+ // TODO: need a Logging Component
+
+ String log4jFile = LOG4J_CONFIG_FILE_DEFAULT;
+ Properties p = new Properties();
+ try
+ {
+ p.load(new FileInputStream(log4jFile));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ PropertyConfigurator.configure(p);
+
+ System.getProperties().setProperty(LogFactory.class.getName(),
Log4jFactory.class.getName());
+
+
+ container = (MutablePicoContainer) getContainer();
+ registry = (PortletRegistryComponent)
container.getComponentInstance(PortletRegistryComponent.class);
+ }
+
/**
* Creates the test suite.
*
@@ -123,8 +160,9 @@
*/
public static Test suite()
{
- // All methods starting with "test" will be executed in the test suite.
- return new JetspeedTestSuite(TestPortletDescriptor.class);
+ ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPortletDescriptor.class);
+
suite.setScript("org/apache/jetspeed/tools/pamanager/containers/pa-container.groovy");
+ return suite;
}
/*
@@ -304,15 +342,12 @@
}
- public void testWritingToDB() throws Exception
+ public void xtestWritingToDB() throws Exception
{
MutablePortletApplication app = registry.getPortletApplication("HW_App");
if (app != null)
- {
-
- registry.removeApplication(app);
-
-
+ {
+ registry.removeApplication(app);
}
app =
PortletDescriptorUtilities.loadPortletDescriptor("./test/testdata/deploy/portlet2.xml",
"HW_App");
@@ -348,20 +383,6 @@
- }
- /**
- * <p>
- * setUp
- * </p>
- *
- * @see junit.framework.TestCase#setUp()
- * @throws Exception
- */
- public void setUp() throws Exception
- {
- // TODO Auto-generated method stub
- super.setUp();
- registry = (PortletRegistryComponent)
Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
}
}
1.16 +4 -6
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy
Index: jetspeed.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jetspeed.groovy 27 Feb 2004 17:59:03 -0000 1.15
+++ jetspeed.groovy 29 Feb 2004 05:10:03 -0000 1.16
@@ -5,14 +5,12 @@
import org.picocontainer.Parameter
import org.picocontainer.defaults.ConstantParameter
import org.picocontainer.defaults.ComponentParameter
-import org.hsqldb.jdbcDriver
import org.apache.jetspeed.locator.JetspeedTemplateLocator
import org.apache.jetspeed.components.ComponentAssemblyTestCase
import org.apache.jetspeed.idgenerator.JetspeedIdGenerator
+import org.apache.jetspeed.page.PageManager
import org.apache.jetspeed.page.impl.CastorXmlPageManager
import org.apache.jetspeed.Jetspeed
-import org.apache.jetspeed.components.hsql.HSQLServerComponent
-import org.apache.jetspeed.components.hsql.HSQLServerComponent
import org.apache.jetspeed.components.jndi.JNDIComponent
import org.apache.jetspeed.components.jndi.TyrexJNDIComponent
import org.apache.jetspeed.components.datasource.DBCPDatasourceComponent
@@ -76,8 +74,8 @@
Long scanRate = 120
cacheSize = 100
fileCache = new FileCache(scanRate, cacheSize)
-container.registerComponentInstance("CastorXmlPageManager",
- new CastorXmlPageManager(idgenerator,
fileCache, root))
+pageManager = new CastorXmlPageManager(idgenerator, fileCache, root)
+container.registerComponentInstance(PageManager, pageManager)
// This JNDI component helps us publish the datasource
Class jndiClass = Class.forName("org.apache.jetspeed.components.jndi.JNDIComponent")
@@ -135,7 +133,7 @@
//
// Profiler
//
-container.registerComponentInstance(Profiler, new JetspeedProfiler(pContainer))
+container.registerComponentInstance(Profiler, new JetspeedProfiler(pContainer,
pageManager))
//
// Capabilities
1.41 +1 -11
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- jetspeed.properties 26 Feb 2004 22:50:42 -0000 1.40
+++ jetspeed.properties 29 Feb 2004 05:10:03 -0000 1.41
@@ -127,16 +127,6 @@
# services.JNDIService.classname=org.apache.jetspeed.cps.jndi.TyrexJNDIService
# services.JNDIService.earlyInit = true
-
-
-#--------------------------------------------------------------------
-# P E R S I S T E N C E S E R V I C E
-#--------------------------------------------------------------------
-services.PersistenceService.classname=org.apache.jetspeed.persistence.JetspeedPersistenceService
-services.PersistenceService.plugin.file=WEB-INF/conf/persistence-plugins.xml
-services.PersistenceService.path.resolver.class=org.apache.jetspeed.util.JetspeedPathResloverImpl
-services.PersistenceService.earlyInit = true
-
#--------------------------------------------------------------------
# P O R T L E T D E P L O Y M E N T D E S C R I P T O R
#--------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
