Author: jford
Date: Sat Feb 3 12:49:28 2007
New Revision: 503305
URL: http://svn.apache.org/viewvc?view=rev&rev=503305
Log:
Updated seed xml to use new schema.
Update seed import export to use title instead of titel
Modified:
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMediaType.java
portals/jetspeed-2/trunk/etc/sql/j2-seed.xml
portals/jetspeed-2/trunk/etc/xsd/examples/j2-seed.xml
Modified:
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java?view=diff&rev=503305&r1=503304&r2=503305
==============================================================================
---
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
Sat Feb 3 12:49:28 2007
@@ -668,7 +668,7 @@
{
// set object fields
mediaType.setCharacterSet(_c.getCharacterSet());
- mediaType.setTitle(_c.getTitel());
+ mediaType.setTitle(_c.getTitle());
mediaType.setDescription(_c.getDescription());
try
Modified:
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMediaType.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMediaType.java?view=diff&rev=503305&r1=503304&r2=503305
==============================================================================
---
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMediaType.java
(original)
+++
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMediaType.java
Sat Feb 3 12:49:28 2007
@@ -35,7 +35,7 @@
private String characterSet;
- private String titel;
+ private String title;
private String description;
@@ -59,7 +59,7 @@
this.name = c.getName();
this.characterSet = c.getCharacterSet();
- this.titel = c.getTitle();
+ this.title = c.getTitle();
this.description = c.getDescription();
capabilities = new ArrayList();
mimeTypes = new ArrayList();
@@ -85,7 +85,7 @@
/** named fields HERE */
xml.add( g.characterSet, "charcterSet",String.class);
- xml.add(g.titel,"titel", String.class);
+ xml.add(g.title,"title", String.class);
xml.add(g.description, "description",
String.class);
/** implicitly named (through binding) fields here */
@@ -114,7 +114,7 @@
Object o1 = xml.get("charcterSet",String.class); //characterSet
if ((o1 != null) && (o1 instanceof String))
g.characterSet =
StringEscapeUtils.unescapeHtml((String)o1);
- g.titel =
StringEscapeUtils.unescapeHtml((String)xml.get("titel", String.class)); //titel;
+ g.title =
StringEscapeUtils.unescapeHtml((String)xml.get("title", String.class)); //title;
g.description =
StringEscapeUtils.unescapeHtml((String)xml.get("description", String.class));
//description;
while (xml.hasNext())
@@ -200,19 +200,19 @@
}
/**
- * @return Returns the titel.
+ * @return Returns the title.
*/
- public String getTitel()
+ public String getTitle()
{
- return titel;
+ return title;
}
/**
- * @param titel The titel to set.
+ * @param title The title to set.
*/
- public void setTitel(String titel)
+ public void setTitle(String titel)
{
- this.titel = titel;
+ this.title = titel;
}
private String append(JSCapability capability)
{
Modified: portals/jetspeed-2/trunk/etc/sql/j2-seed.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/sql/j2-seed.xml?view=diff&rev=503305&r1=503304&r2=503305
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/j2-seed.xml (original)
+++ portals/jetspeed-2/trunk/etc/sql/j2-seed.xml Sat Feb 3 12:49:28 2007
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Snapshot name="standard-jetspeed2.xml">
+<Snapshot name="standard-jetspeed2.xml"
+ xmlns="http://portals.apache.org/jetspeed";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/j2-seed.xsd";>
<softwareVersion value="1"/>
<softwareSubVersion value="0"/>
<default_rule value="j2"/>
@@ -15,35 +18,35 @@
<MediaTypes>
<MediaType name="html">
<charcterSet value="UTF-8"/>
- <titel value="HTML"/>
+ <title value="HTML"/>
<description value="Rich HTML for HTML 4.0 compliants
browsers"/>
<capabilities></capabilities>
<mimeTypes>text/html</mimeTypes>
</MediaType>
<MediaType name="vxml">
<charcterSet value="UTF-8"/>
- <titel value="VoiceXML"/>
+ <title value="VoiceXML"/>
<description value="Format suitable for use with an
audio VoiceXML server"/>
<capabilities></capabilities>
<mimeTypes>text/vxml</mimeTypes>
</MediaType>
<MediaType name="wml">
<charcterSet value="UTF-8"/>
- <titel value="WML"/>
+ <title value="WML"/>
<description value="Format for mobile phones and PDAs
compatible with WML 1.1"/>
<capabilities></capabilities>
<mimeTypes>text/vnd.wap.wml</mimeTypes>
</MediaType>
<MediaType name="xhtml-basic">
<charcterSet value="UTF-8"/>
- <titel value="XHTML"/>
+ <title value="XHTML"/>
<description value="XHTML Basic"/>
<capabilities></capabilities>
<mimeTypes>application/xhtml+xml</mimeTypes>
</MediaType>
<MediaType name="xml">
<charcterSet value=""/>
- <titel value="XML"/>
+ <title value="XML"/>
<description value="XML 1.0"/>
<capabilities></capabilities>
<mimeTypes>text/xml</mimeTypes>
Modified: portals/jetspeed-2/trunk/etc/xsd/examples/j2-seed.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/xsd/examples/j2-seed.xml?view=diff&rev=503305&r1=503304&r2=503305
==============================================================================
--- portals/jetspeed-2/trunk/etc/xsd/examples/j2-seed.xml (original)
+++ portals/jetspeed-2/trunk/etc/xsd/examples/j2-seed.xml Sat Feb 3 12:49:28
2007
@@ -16,8 +16,8 @@
-->
<Snapshot name="standard-jetspeed2.xml"
xmlns="http://portals.apache.org/jetspeed";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://portals.apache.org/jetspeed j2-seed.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/j2-seed.xsd";>
<softwareVersion value="1"/>
<softwareSubVersion value="0"/>
<default_rule value="j2"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
