[jboss-svn-commits] JBL Code SVN: r19490 - in labs/jbosslabs/qa/portal-extensions: binaries/maven-repo-addons/informa/jars and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 8 17:27:14 EDT 2008
Author: adamw
Date: 2008-04-08 17:27:13 -0400 (Tue, 08 Apr 2008)
New Revision: 19490
Added:
labs/jbosslabs/qa/portal-extensions/binaries/mysql/mysql-connector-java-5.0.5-bin.jar
Removed:
labs/jbosslabs/qa/portal-extensions/binaries/mysql/mysql-connector-java-5.1.5-bin.jar
Modified:
labs/jbosslabs/qa/portal-extensions/binaries/maven-repo-addons/informa/jars/informa.jar
labs/jbosslabs/qa/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp
labs/jbosslabs/qa/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp
labs/jbosslabs/qa/portal-extensions/forge-portlets/project.xml
labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/Podcast.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/.project
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
labs/jbosslabs/qa/portal-extensions/maven.xml
Log:
MERGE 19455:19489 from trunk to qa
Modified: labs/jbosslabs/qa/portal-extensions/binaries/maven-repo-addons/informa/jars/informa.jar
===================================================================
(Binary files differ)
Copied: labs/jbosslabs/qa/portal-extensions/binaries/mysql/mysql-connector-java-5.0.5-bin.jar (from rev 19489, labs/jbosslabs/trunk/portal-extensions/binaries/mysql/mysql-connector-java-5.0.5-bin.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbosslabs/qa/portal-extensions/binaries/mysql/mysql-connector-java-5.1.5-bin.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/qa/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp
===================================================================
--- labs/jbosslabs/qa/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp 2008-04-08 21:23:34 UTC (rev 19489)
+++ labs/jbosslabs/qa/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp 2008-04-08 21:27:13 UTC (rev 19490)
@@ -2,6 +2,8 @@
<%@ page import="org.jboss.portal.identity.User" %>
<%
+ if (1+1 == 2) { return; }
+
User user = (User)request.getAttribute("org.jboss.portal.header.USER");
PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL");
@@ -52,4 +54,4 @@
%> <a href="<%= signOutURL %>">Logout</a>
<%
}
-%>
\ No newline at end of file
+%>
Modified: labs/jbosslabs/qa/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp
===================================================================
--- labs/jbosslabs/qa/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp 2008-04-08 21:23:34 UTC (rev 19489)
+++ labs/jbosslabs/qa/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp 2008-04-08 21:27:13 UTC (rev 19490)
@@ -5,6 +5,8 @@
<%@ page import="org.jboss.portal.api.PortalRuntimeContext" %>
<%
+ if (1+1 == 2) { return; }
+
PortalNode root = (PortalNode)request.getAttribute("org.jboss.portal.api.PORTAL_NODE");
PortalNode portal = root;
PortalNode mainPage = portal;
Modified: labs/jbosslabs/qa/portal-extensions/forge-portlets/project.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/project.xml 2008-04-08 21:23:34 UTC (rev 19489)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/project.xml 2008-04-08 21:27:13 UTC (rev 19490)
@@ -159,7 +159,6 @@
<dependency>
<groupId>informa</groupId>
<artifactId>informa</artifactId>
- <version>0.6.5</version>
<jar>informa.jar</jar>
</dependency>
<dependency>
Modified: labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/Podcast.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/Podcast.java 2008-04-08 21:23:34 UTC (rev 19489)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/Podcast.java 2008-04-08 21:27:13 UTC (rev 19490)
@@ -23,6 +23,7 @@
package org.jboss.forge.podcast;
import java.util.Collection;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.Map;
import java.util.HashMap;
@@ -43,6 +44,8 @@
import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
import org.jboss.logging.Logger;
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -50,7 +53,7 @@
import de.nava.informa.core.ChannelIF;
import de.nava.informa.impl.basic.ChannelBuilder;
-import de.nava.informa.parsers.FeedParser;
+import de.nava.informa.parsers.Atom_1_0_Parser;
import de.nava.informa.utils.ItemComparator;
import de.nava.informa.core.ItemIF;
import de.nava.informa.core.ItemEnclosureIF;
@@ -91,9 +94,12 @@
/**
* <code>allItemsArr</code> - Array if ItemIF objects, containing items from all feeds.
*/
- private Object[] allItemsArr;
+ private ItemIF[] allItemsArr;
@SuppressWarnings("unchecked") Podcast(String serverAdress, Node root) {
+
+ log.debug("Updating podcast");
+
this.serverAdress = serverAdress;
log = Logger.getLogger(this.getClass());
@@ -125,9 +131,15 @@
// Parse and sort the items
Map<String,String> urls = getURLs(nodes);
+
+ Set<ItemIF> itemsSet = getAllItems(urls);
+
+ allItemsArr = new ItemIF[itemsSet.size()];
+ allItemsArr = (ItemIF[]) itemsSet.toArray(allItemsArr);
- allItemsArr = getAllItems(urls).toArray();
- java.util.Arrays.sort((Object[]) allItemsArr, new ItemComparator(true));
+ Comparator<ItemIF> ic = new ItemComparator(true);
+
+ java.util.Arrays.sort(allItemsArr, ic);
}
/**
@@ -166,9 +178,6 @@
}
nodeContext.put("description", description);
- //System.out.println("getDescription " + description);
- //System.out.println("get('description') " + item.getElementValue("description"));
-
// item date
Date date = item.getDate();
if (date != null) {
@@ -444,7 +453,15 @@
conn.connect();
is = conn.getInputStream();
- ChannelIF channel = FeedParser.parse(new ChannelBuilder(), is);
+ SAXBuilder saxBuilder = new SAXBuilder(false);
+
+ org.jdom.Document doc = saxBuilder.build(is);
+ org.jdom.Element root = doc.getRootElement();
+
+ Atom_1_0_Parser a = Atom_1_0_Parser.getInstance();
+
+ ChannelIF channel = a.parse(new ChannelBuilder(), root);
+
if (channel != null) {
Collection items = channel.getItems();
if ((items != null) && (!items.isEmpty())) {
@@ -454,9 +471,10 @@
} catch (IOException e) {
log.warn(urlString + " could not be found.");
- //e.printStackTrace();
+ } catch (JDOMException e) {
+ log.warn("DOM error: " + urlString, e);
} catch (ParseException e) {
- log.warn("Parse error: " + urlString);
+ log.warn("Parse error: " + urlString, e);
} finally {
try {
if (is != null) {
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/.project
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/.project 2008-04-08 21:23:34 UTC (rev 19489)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/.project 2008-04-08 21:27:13 UTC (rev 19490)
@@ -1,44 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<projectDescription>
- <name>wiki-backend</name>
- <comment>
+ <name>wiki</name>
+ <comment>
</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.jboss.tools.jsf.jsfnature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- </natures>
- <linkedResources>
- <link>
- <name>WEB-ROOT</name>
- <type>2</type>
- <location>/Users/tomek/java/sandbox/portal-extensions/jbosswiki/forge-wiki/src/web</location>
- </link>
- </linkedResources>
-</projectDescription>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2008-04-08 21:23:34 UTC (rev 19489)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2008-04-08 21:27:13 UTC (rev 19490)
@@ -37,6 +37,8 @@
import org.jboss.wiki.WikiContext;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiPage;
+import org.jboss.wiki.WikiType;
+import org.jboss.wiki.WikiTypeLoader;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.configuration.ConfigurationParser;
import org.jboss.wiki.exceptions.EditSessionExpired;
@@ -73,26 +75,28 @@
private WikiEngine wikiEngine;
+ private boolean previewAvailable = false;
+
@Inject
public void setWikiEngine(WikiEngine wikiEngine) {
this.wikiEngine = wikiEngine;
-
+
if (attributesExtractor != null && editSessionId == null) {
init();
}
}
-
+
@Inject
public void setAttrExtractor(AttributesExtractor attrExtractor) {
this.attributesExtractor = attrExtractor;
-
+
WikiHelper.getWikiCommonSession().update(attrExtractor);
-
+
if (wikiEngine != null && editSessionId == null) {
init();
}
}
-
+
private void init() {
editSessionId = wikiEngine.getEditSessionId();
@@ -126,7 +130,11 @@
}
public String getPageContent() {
- return getWikiPage().getContent();
+ if (pageContent == null) {
+ pageContent = getWikiPage().getContent();
+ }
+
+ return pageContent;
}
public void setPageContent(String pageContent) {
@@ -200,7 +208,17 @@
}
public void setEditSessionId(String editSessionId) {
- this.editSessionId = Integer.valueOf(editSessionId);
+ if (this.editSessionId != null) {
+ getWikiPage(true).unlock(attributesExtractor.getCredentials(),
+ this.editSessionId);
+
+ getWikiPage(true).unlock(attributesExtractor.getCredentials(),
+ Integer.valueOf(editSessionId));
+
+ init();
+ } else {
+ this.editSessionId = Integer.valueOf(editSessionId);
+ }
}
public File getNewFile() {
@@ -249,7 +267,8 @@
public List<SelectItem> getFileNames() {
WikiPage page = getWikiPage();
- Set<String> attSet = wikiEngine.getAttachmentsSet(page, page.getLangCode());
+ Set<String> attSet = wikiEngine.getAttachmentsSet(page, page
+ .getLangCode());
List<SelectItem> attNames = new Vector<SelectItem>();
@@ -276,6 +295,8 @@
getWikiPage(true).unlock(attributesExtractor.getCredentials(),
editSessionId);
+ lockMsg = null;
+
return "goback";
}
@@ -287,4 +308,30 @@
return getWikiPage(false, "editShowHTML").getContent();
}
+ public String preview() {
+ previewAvailable = true;
+
+ return null;
+ }
+
+ public boolean isPreviewAvailable() {
+ return previewAvailable;
+ }
+
+ public String getPagePreviewContent() {
+ WikiPage previPage = null;
+
+ try {
+ previPage = (WikiPage) getWikiPage().clone();
+ } catch (CloneNotSupportedException e) {
+ // not going to happen
+ log.error(e);
+ return null;
+ }
+
+ previPage.setContent(pageContent);
+
+ return wikiEngine.getWikiType("html").process(previPage,
+ attributesExtractor.getWikiSession()).getContent();
+ }
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties 2008-04-08 21:23:34 UTC (rev 19489)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties 2008-04-08 21:27:13 UTC (rev 19490)
@@ -2,8 +2,12 @@
edit_cancel=Cancel
edit_save=Save
edit_spellcheck=Check Spelling
+edit_preview=Preview
permaLinkButton=permaLinkButton.png
+preview_text=This is preview of the edited page. Please note you still have to save it !
+preview_scroll=Scroll down to see your preview !
+
editButton=editButton.png
recentButton=recentChanges.gif
historyButton=historyButton.png
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2008-04-08 21:23:34 UTC (rev 19489)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2008-04-08 21:27:13 UTC (rev 19490)
@@ -1,33 +1,49 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core">
-<ui:composition template="wiki_template.xhtml">
-
- <ui:define name="content">
- <h:panelGrid styleClass="wikiGreybkgSection" rendered="#{wikiEdit.lockMsg ne ''}">
- <h:outputText value="#{wikiEdit.lockMsg}" />
- </h:panelGrid>
-
- <h:outputText value="#{wikiEdit.showEditHTML}" escape="false" />
- <h:form acceptCharset="UTF-8">
- <h:panelGrid styleClass="editPageArea">
- <h:inputTextarea rows="40" cols="80" value="#{wikiEdit.pageContent}" styleClass="editPageArea" />
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"><ui:composition
+ template="wiki_template.xhtml">
+
+ <ui:define name="content">
+ <h:panelGrid styleClass="wikiGreybkgSection"
+ rendered="#{wikiEdit.lockMsg ne ''}">
+ <h:outputText value="#{wikiEdit.lockMsg}" />
+ </h:panelGrid>
+
+ <h:panelGrid styleClass="wikiGreybkgSection" rendered="#{wikiEdit.previewAvailable}">
+ <h:outputText value="#{msg.preview_scroll}" />
+ </h:panelGrid>
+
+ <h:outputText value="#{wikiEdit.showEditHTML}" escape="false" />
+ <h:form acceptCharset="UTF-8">
+ <h:panelGrid styleClass="editPageArea">
+ <h:inputTextarea rows="40" cols="80" value="#{wikiEdit.pageContent}"
+ styleClass="editPageArea" />
<h:panelGroup styleClass="formbuttons">
- <h:commandButton styleClass="submit" value="#{msg.edit_save}" action="#{wikiEdit.save}" />
- <h:commandButton styleClass="submit" value="#{msg.edit_cancel}" action="#{wikiEdit.cancel}" />
- <h:commandButton styleClass="submit" value="#{msg.edit_spellcheck}" onclick="openSpellChecker(); return false;" />
+ <h:commandButton styleClass="submit" value="#{msg.edit_save}"
+ action="#{wikiEdit.save}" />
+ <h:commandButton styleClass="submit" value="#{msg.edit_preview}"
+ action="#{wikiEdit.preview}" />
+ <h:commandButton styleClass="submit" value="#{msg.edit_cancel}"
+ action="#{wikiEdit.cancel}" />
+ <h:commandButton styleClass="submit" value="#{msg.edit_spellcheck}"
+ onclick="openSpellChecker(); return false;" />
</h:panelGroup>
</h:panelGrid>
<h:inputHidden value="#{wikiEdit.editSessionId}" />
- </h:form>
-
- <pre>
+ </h:form>
+
+ <pre>
<h:outputText value="#{msg.edit_instruction}" />
</pre>
- </ui:define>
-</ui:composition>
+ <h:panelGroup rendered="#{wikiEdit.previewAvailable}">
+ <h:panelGrid styleClass="wikiGreybkgSection">
+ <h:outputText value="#{msg.preview_text}" />
+ </h:panelGrid>
+ <h:outputText value="#{wikiEdit.pagePreviewContent}" escape="false" />
+ </h:panelGroup>
+ </ui:define>
-</div>
+</ui:composition></div>
Modified: labs/jbosslabs/qa/portal-extensions/maven.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/maven.xml 2008-04-08 21:23:34 UTC (rev 19489)
+++ labs/jbosslabs/qa/portal-extensions/maven.xml 2008-04-08 21:27:13 UTC (rev 19490)
@@ -226,7 +226,7 @@
<goal name="install-mysql">
<ant:copy todir="${local.deploy.dir}/../lib" overwrite="true"
- file="binaries/mysql/mysql-connector-java-5.1.5-bin.jar" />
+ file="binaries/mysql/mysql-connector-java-5.0.5-bin.jar" />
</goal>
<goal name="install">
More information about the jboss-svn-commits
mailing list