Author: shinsuke
Date: Wed Feb 21 15:48:18 2007
New Revision: 510315
URL: http://svn.apache.org/viewvc?view=rev&rev=510315
Log:
updated by PRP spec info though PRP is not fixed.
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/PortletApplication.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/simple/SimpleConfigHandler.java
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/PortletApplication.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/PortletApplication.java?view=diff&rev=510315&r1=510314&r2=510315
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/PortletApplication.java
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/PortletApplication.java
Wed Feb 21 15:48:18 2007
@@ -40,7 +40,7 @@
private String description = null;
- private List categories = new ArrayList();
+ private List tags = new ArrayList();
private String publisherName = null;
@@ -50,19 +50,16 @@
private String sourceUrl = null;
- private String thumbnailUrl = null;
+ private String imageUrl = null;
//TODO
// private Map dependencies;
- //TODO
- // private List licenses = new ArrayList();
-
- private String javaBuildVersion = null;
+ private String licenseName = null;
- private String javaRuntimeVersion = null;
+ private String licenseUrl = null;
- private Locale defaultLocale = Locale.ENGLISH;
+ private String compiledJDKVersion = null;
private List supportedLocales = new ArrayList();
@@ -71,14 +68,14 @@
}
- public void addCategory(String category)
+ public void addTag(String category)
{
- categories.add(category);
+ tags.add(category);
}
- public List getCategories()
+ public List getTags()
{
- return categories;
+ return tags;
}
public void addSupportedLocale(Locale locale)
@@ -140,22 +137,6 @@
}
/**
- * @return the defaultLocale
- */
- public Locale getDefaultLocale()
- {
- return defaultLocale;
- }
-
- /**
- * @param defaultLocale the defaultLocale to set
- */
- public void setDefaultLocale(Locale defaultLocale)
- {
- this.defaultLocale = defaultLocale;
- }
-
- /**
* @return the description
*/
public String getDescription()
@@ -190,33 +171,17 @@
/**
* @return the javaBuildVersion
*/
- public String getJavaBuildVersion()
+ public String getCompiledJDKVersion()
{
- return javaBuildVersion;
+ return compiledJDKVersion;
}
/**
* @param javaBuildVersion the javaBuildVersion to set
*/
- public void setJavaBuildVersion(String javaBuildVersion)
- {
- this.javaBuildVersion = javaBuildVersion;
- }
-
- /**
- * @return the javaRuntimeVersion
- */
- public String getJavaRuntimeVersion()
- {
- return javaRuntimeVersion;
- }
-
- /**
- * @param javaRuntimeVersion the javaRuntimeVersion to set
- */
- public void setJavaRuntimeVersion(String javaRuntimeVersion)
+ public void setCompiledJDKVersion(String javaBuildVersion)
{
- this.javaRuntimeVersion = javaRuntimeVersion;
+ this.compiledJDKVersion = javaBuildVersion;
}
/**
@@ -334,17 +299,17 @@
/**
* @return the thumbnailUrl
*/
- public String getThumbnailUrl()
+ public String getImageUrl()
{
- return thumbnailUrl;
+ return imageUrl;
}
/**
* @param thumbnailUrl the thumbnailUrl to set
*/
- public void setThumbnailUrl(String thumbnailUrl)
+ public void setImageUrl(String thumbnailUrl)
{
- this.thumbnailUrl = thumbnailUrl;
+ this.imageUrl = thumbnailUrl;
}
/**
@@ -361,6 +326,38 @@
public void setVersion(String version)
{
this.version = version;
+ }
+
+ /**
+ * @return the licenseName
+ */
+ public String getLicenseName()
+ {
+ return licenseName;
+ }
+
+ /**
+ * @param licenseName the licenseName to set
+ */
+ public void setLicenseName(String licenseName)
+ {
+ this.licenseName = licenseName;
+ }
+
+ /**
+ * @return the licenseUrl
+ */
+ public String getLicenseUrl()
+ {
+ return licenseUrl;
+ }
+
+ /**
+ * @param licenseUrl the licenseUrl to set
+ */
+ public void setLicenseUrl(String licenseUrl)
+ {
+ this.licenseUrl = licenseUrl;
}
}
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/simple/SimpleConfigHandler.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/simple/SimpleConfigHandler.java?view=diff&rev=510315&r1=510314&r2=510315
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/simple/SimpleConfigHandler.java
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/simple/SimpleConfigHandler.java
Wed Feb 21 15:48:18 2007
@@ -42,18 +42,31 @@
public void startElement(String uri, String localName, String qName,
Attributes attributes)
{
- if ("portlet".equals(qName))
+ if ("repository".equals(qName))
+ {
+ //TODO version
+ //TODO id
+ }
+ else if ("portlet".equals(qName))
{
portletApplication = new PortletApplication();
- String created = attributes.getValue("created");
- if (created != null)
+
+ String artifactId = attributes.getValue("id");
+ if (artifactId != null)
+ {
+ portletApplication.setArtifactId(artifactId);
+ }
+
+ String groupId = attributes.getValue("group");
+ if (groupId != null)
{
- //TODO
+ portletApplication.setGroupId(groupId);
}
- String lastModified = attributes.getValue("last-modified");
- if (lastModified != null)
+
+ String version = attributes.getValue("version");
+ if (version != null)
{
- //TODO
+ portletApplication.setVersion(version);
}
}
synchronized (qNameList)
@@ -80,26 +93,14 @@
{
parentQName = "";
}
- if ("portlet-spec-version".equals(qName))
+ if ("portletSpecVersion".equals(qName))
{
portletApplication.setPortletSpecVersion(value);
}
- else if ("group-id".equals(qName))
- {
- portletApplication.setGroupId(value);
- }
- else if ("artifact-id".equals(qName))
- {
- portletApplication.setArtifactId(value);
- }
else if ("packaging".equals(qName))
{
portletApplication.setPackaging(value);
}
- else if ("version".equals(qName))
- {
- portletApplication.setVersion(value);
- }
else if ("name".equals(qName))
{
if ("publisher".equals(parentQName))
@@ -108,7 +109,7 @@
}
else if ("license".equals(parentQName))
{
- portletApplication.setPublisherName(value);
+ portletApplication.setLicenseName(value);
}
else
{
@@ -119,9 +120,9 @@
{
portletApplication.setDescription(value);
}
- else if ("cateogry".equals(qName))
+ else if ("tag".equals(qName))
{
- portletApplication.addCategory(value);
+ portletApplication.addTag(value);
}
else if ("url".equals(qName))
{
@@ -129,38 +130,30 @@
{
portletApplication.setPublisherUrl(value);
}
+ else if ("license".equals(parentQName))
+ {
+ portletApplication.setLicenseUrl(value);
+ }
}
- else if ("binary".equals(qName))
+ else if ("binaryURL".equals(qName))
{
portletApplication.setBinaryUrl(value);
}
- else if ("source".equals(qName))
+ else if ("sourceURL".equals(qName))
{
portletApplication.setSourceUrl(value);
}
- else if ("thumbnail".equals(qName))
+ else if ("imageURL".equals(qName))
{
- portletApplication.setThumbnailUrl(value);
+ portletApplication.setImageUrl(value);
}
//TODO dependencies
//TODO license
- else if ("build".equals(qName))
+ else if ("compiledJDKVersion".equals(qName))
{
- portletApplication.setJavaBuildVersion(value);
- }
- else if ("runtime".equals(qName))
- {
- portletApplication.setJavaRuntimeVersion(value);
- }
- else if ("default-locale".equals(qName))
- {
- Locale l = getLocaleFromString(value);
- if (l != null)
- {
- portletApplication.setDefaultLocale(l);
- }
+ portletApplication.setCompiledJDKVersion(value);
}
- else if ("supported-locale".equals(qName))
+ else if ("locale".equals(qName))
{
Locale l = getLocaleFromString(value);
if (l != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
