You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2006/09/25 18:16:24 UTC
svn commit: r449719 - in /portals/jetspeed-2/trunk/components/serializer:
jetspeed-import.xml maven.xml project.xml
Author: taylor
Date: Mon Sep 25 09:16:23 2006
New Revision: 449719
URL: http://svn.apache.org/viewvc?view=rev&rev=449719
Log:
finally continuing work on this issue
checking in as a checkpoint
Modified:
portals/jetspeed-2/trunk/components/serializer/jetspeed-import.xml
portals/jetspeed-2/trunk/components/serializer/maven.xml
portals/jetspeed-2/trunk/components/serializer/project.xml
Modified: portals/jetspeed-2/trunk/components/serializer/jetspeed-import.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/jetspeed-import.xml?view=diff&rev=449719&r1=449718&r2=449719
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/jetspeed-import.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/jetspeed-import.xml Mon Sep 25 09:16:23 2006
@@ -102,6 +102,286 @@
</users>
<!-- Capability -->
-
-
+ <capabilities>
+ <capability><name>HTML_3_2</name></capability>
+ <capability><name>HTML_4_0</name></capability>
+ <capability><name>HTML_TABLE</name></capability>
+ <capability><name>HTML_NESTED_TABLE</name></capability>
+ <capability><name>HTML_IMAGE</name></capability>
+ <capability><name>HTML_FORM</name></capability>
+ <capability><name>HTML_FRAME</name></capability>
+ <capability><name>HTML_JAVA</name></capability>
+ <capability><name>HTML_JAVA1_0</name></capability>
+ <capability><name>HTML_JAVA1_1</name></capability>
+ <capability><name>HTML_JAVA1_2</name></capability>
+ <capability><name>HTML_JAVA_JRE</name></capability>
+ <capability><name>HTML_JSCRIPT</name></capability>
+ <capability><name>HTML_JSCRIPT1_0</name></capability>
+ <capability><name>HTML_JSCRIPT1_1</name></capability>
+ <capability><name>HTML_JSCRIPT1_2</name></capability>
+ <capability><name>HTML_JAVASCRIPT</name></capability>
+ <capability><name>HTML_JAVASCRIPT_1_0</name></capability>
+ <capability><name>HTML_JAVASCRIPT_1_1</name></capability>
+ <capability><name>HTML_JAVASCRIPT_1_2</name></capability>
+ <capability><name>HTML_PLUGIN</name></capability>
+ <capability><name>HTML_ACTIVEX</name></capability>
+ <capability><name>HTML_PLUGIN</name></capability>
+ <capability><name>HTML_CSS1</name></capability>
+ <capability><name>HTML_CSS2</name></capability>
+ <capability><name>HTML_CSSP</name></capability>
+ <capability><name>HTML_IFRAME</name></capability>
+ <capability><name>HTML_LAYER</name></capability>
+ <capability><name>HTML_DOM_IE</name></capability>
+ <capability><name>HTML_DOM_NS4</name></capability>
+ <capability><name>HTML_DOM_1</name></capability>
+ <capability><name>HTML_DOM_2</name></capability>
+ <capability><name>WML_1_0</name></capability>
+ <capability><name>WML_1_1</name></capability>
+ <capability><name>WML_TABLE</name></capability>
+ <capability><name>XML_XSLT</name></capability>
+ <capability><name>XML_XPATH</name></capability>
+ <capability><name>XML_XINCLUDE</name></capability>
+ <capability><name>HTTP_1_1</name></capability>
+ <capability><name>HTTP_COOKIE</name></capability>
+ <capability><name>HTML_XML</name></capability>
+ <capability><name>HTML_XSL</name></capability>
+ <capability><name>HTML_DOM</name></capability>
+ </capabilities>
+
+ <mimetypes>
+ <mimetype>
+ <name>text/html</name>
+ </mimetype>
+ <mimetype>
+ <name>text/vnd.wap.wml</name>
+ </mimetype>
+ <mimetype>
+ <name>text/vxml</name>
+ </mimetype>
+ <mimetype>
+ <name>text/xml</name>
+ </mimetype>
+ <mimetype>
+ <name>text/xhtml</name>
+ </mimetype>
+ <mimetype>
+ <name>application/xhtml+xml</name>
+ </mimetype>
+ </mimetypes>
+
+ <clients>
+ <client>
+ <evalOrder>4</evalOrder>
+ <name>ie5</name>
+ <userAgentPattern>.*MSIE 5.*</userAgentPattern>
+ <manufacturer>Microsoft</manufacturer>
+ <model>None</model>
+ <version>5.5</version>
+ <preferred-mimetype>text/html</preferred-mimetype>
+ <capabilities>
+ <capability>HTML_3_2</capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ <capability></capability>
+ </capabilities>
+ <mimetypes>
+ <mimetype></mimetype>
+ <mimetype></mimetype>
+ <mimetype></mimetype>
+ </mimetypes>
+ </client>
+ <client>
+ <evalOrder>5</evalOrder>
+ <name>ns4</name>
+ <userAgentPattern>.*Mozilla/4.*</userAgentPattern>
+ <manufacturer>Netscape</manufacturer>
+ <model>None</model>
+ <version>4.75</version>
+ <preferred-mimetype>text/html</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>6</evalOrder>
+ <name>mozilla</name>
+ <userAgentPattern>.*Mozilla/5.*</userAgentPattern>
+ <manufacturer>Mozilla</manufacturer>
+ <model>Mozilla</model>
+ <version>1.x</version>
+ <preferred-mimetype>text/html</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>7</evalOrder>
+ <name>lynx</name>
+ <userAgentPattern>Lynx.*</userAgentPattern>
+ <manufacturer>GNU</manufacturer>
+ <model>None</model>
+ <version></version>
+ <preferred-mimetype>text/html</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>8</evalOrder>
+ <name>nokia_generic</name>
+ <userAgentPattern>Nokia.*</userAgentPattern>
+ <manufacturer>Nokia</manufacturer>
+ <model>Nokia</model>
+ <version></version>
+ <preferred-mimetype>text/vnd.wap.wml</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>10</evalOrder>
+ <name>up</name>
+ <userAgentPattern>UP.*|.*UP\.Browser.*</userAgentPattern>
+ <manufacturer>United Planet</manufacturer>
+ <model>Generic</model>
+ <version></version>
+ <preferred-mimetype>text/vnd.wap.wml</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>11</evalOrder>
+ <name>sonyericsson</name>
+ <userAgentPattern>Ercis.*|SonyE.*</userAgentPattern>
+ <manufacturer>SonyEricsson</manufacturer>
+ <model>Generic</model>
+ <version></version>
+ <preferred-mimetype>text/vnd.wap.wml</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>12</evalOrder>
+ <name>wapalizer</name>
+ <userAgentPattern>Wapalizer.*</userAgentPattern>
+ <manufacturer>Wapalizer</manufacturer>
+ <model>Generic</model>
+ <version></version>
+ <preferred-mimetype>text/vnd.wap.wml</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>13</evalOrder>
+ <name>klondike</name>
+ <userAgentPattern>Klondike.*</userAgentPattern>
+ <manufacturer>Klondike</manufacturer>
+ <model>Generic</model>
+ <version></version>
+ <preferred-mimetype>text/vnd.wap.wml</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>14</evalOrder>
+ <name>wml_generic</name>
+ <userAgentPattern>.*WML.*|.*WAP.*|.*Wap.*|.*wml.*</userAgentPattern>
+ <manufacturer>Generic</manufacturer>
+ <model>Generic</model>
+ <version></version>
+ <preferred-mimetype>text/vnd.wap.wml</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>15</evalOrder>
+ <name>vxml_generic</name>
+ <userAgentPattern>.*VoiceXML.*</userAgentPattern>
+ <manufacturer>Generic</manufacturer>
+ <model>Generic</model>
+ <version></version>
+ <preferred-mimetype>text/vxml</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>16</evalOrder>
+ <name>nuance</name>
+ <userAgentPattern>Nuance.*</userAgentPattern>
+ <manufacturer>Nuance</manufacturer>
+ <model>Generic</model>
+ <version></version>
+ <preferred-mimetype>text/vxml</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>17</evalOrder>
+ <name>agentxml</name>
+ <userAgentPattern>agentxml/1.0.*</userAgentPattern>
+ <manufacturer>Unknown</manufacturer>
+ <model>Generic</model>
+ <version></version>
+ <preferred-mimetype>text/xml</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>18</evalOrder>
+ <name>opera7</name>
+ <userAgentPattern>.*Opera/7.*</userAgentPattern>
+ <manufacturer>Opera',</manufacturer>
+ <model>Opera7</model>
+ <version>7.x</version>
+ <preferred-mimetype>text/html</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>1</evalOrder>
+ <name>ie5mac</name>
+ <userAgentPattern>.*MSIE 5.*Mac.*</userAgentPattern>
+ <manufacturer>Microsoft</manufacturer>
+ <model>None</model>
+ <version>5.*</version>
+ <preferred-mimetype>text/html</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>3</evalOrder>
+ <name>ie6</name>
+ <userAgentPattern>.*MSIE 6.*</userAgentPattern>
+ <manufacturer>Microsoft</manufacturer>
+ <model>None</model>
+ <version>6.0</version>
+ <preferred-mimetype>text/html</preferred-mimetype>
+ </client>
+ <client>
+ <evalOrder>9</evalOrder>
+ <name>xhtml-basic</name>
+ <userAgentPattern>DoCoMo/2.0.*|KDDI-.*UP\.Browser.*|J-PHONE/5.0.*|Vodafone/1.0/.*</userAgentPattern>
+ <manufacturer>WAP</manufacturer>
+ <model>Generic</model>
+ <version>application/xhtml+xml</version>
+ <preferred-mimetype></preferred-mimetype>
+ </client>
+ </clients>
+
+ <media-types>
+ <media-type>
+ <name>html</name>
+ <characterSet>UTF-8</characterSet>
+ <title>HTML</title>
+ <description>Rich HTML for HTML 4.0 compliants browsers</description>
+ <mimetypes>
+ <mimetype></mimetype>
+ <mimetype></mimetype>
+ <mimetype></mimetype>
+ </mimetypes>
+
+ </media-type>
+ <media-type>
+ <name>wml</name>
+ <characterSet>UTF-8</characterSet>
+ <title>WML</title>
+ <description>Format for mobile phones and PDAs compatible with WML 1.1</description>
+ </media-type>
+ <media-type>
+ <name>vxml</name>
+ <characterSet>UTF-8</characterSet>
+ <title>VoiceXML</title>
+ <description>Format suitable for use with an audio VoiceXML server</description>
+ </media-type>
+ <media-type>
+ <name>xml</name>
+ <characterSet>UTF-8</characterSet>
+ <title>XML</title>
+ <description>XML 1.0</description>
+ </media-type>
+ <media-type>
+ <name>xhtml-basic</name>
+ <characterSet>UTF-8</characterSet>
+ <title>XHTML</title>
+ <description>XHTML Basic</description>
+ </media-type>
+ </media-types>
+
</import-data>
Modified: portals/jetspeed-2/trunk/components/serializer/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/maven.xml?view=diff&rev=449719&r1=449718&r2=449719
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/maven.xml Mon Sep 25 09:16:23 2006
@@ -20,6 +20,11 @@
<property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator' />
<goal name='importer'>
+ <copy todir='${maven.build.dir}/classes'
+ file="../../etc/log4j/log4j.properties"/>
+ <copy todir='${maven.build.dir}/classes'>
+ <fileset dir="../../etc/db-ojb/"/>
+ </copy>
<java classname="org.apache.jetspeed.serializer.JetspeedImporter" fork="yes">
<classpath>
<path refid="maven.dependency.classpath"/>
Modified: portals/jetspeed-2/trunk/components/serializer/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/project.xml?view=diff&rev=449719&r1=449718&r2=449719
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/project.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/project.xml Mon Sep 25 09:16:23 2006
@@ -40,15 +40,52 @@
<dependency>
<id>xstream</id>
<version>1.1.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>org.apache.portals.jetspeed-2:jetspeed-commons</id>
<version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
+ <dependency>
+ <id>org.apache.portals.jetspeed-2:jetspeed-portal</id>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>org.apache.portals.jetspeed-2:jetspeed-cm</id>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<id>org.apache.portals.jetspeed-2:jetspeed-api</id>
<version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
+ <dependency>
+ <id>org.apache.portals.jetspeed-2:jetspeed-rdbms</id>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>org.apache.portals.jetspeed-2:jetspeed-capability</id>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org