[jboss-svn-commits] JBL Code SVN: r23633 - in labs/jbosslabs/qa/portal-extensions: forge-kosmos-portlets and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 30 03:14:35 EDT 2008
Author: adamw
Date: 2008-10-30 03:14:34 -0400 (Thu, 30 Oct 2008)
New Revision: 23633
Added:
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bkgblur_right.gif
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_bkg.jpg
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_blur_bottom.gif
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/newlocation.jsp
labs/jbosslabs/qa/portal-extensions/kryten/
labs/jbosslabs/qa/portal-extensions/kryten/maven.xml
labs/jbosslabs/qa/portal-extensions/kryten/project.properties
labs/jbosslabs/qa/portal-extensions/kryten/project.xml
Removed:
labs/jbosslabs/qa/portal-extensions/forge-contributor/
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bkgblur_right.gif
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_bkg.jpg
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_blur_bottom.gif
labs/jbosslabs/qa/portal-extensions/kryten/maven.xml
labs/jbosslabs/qa/portal-extensions/kryten/project.properties
labs/jbosslabs/qa/portal-extensions/kryten/project.xml
Modified:
labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/maven.xml
labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/project.xml
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/WEB-INF/web.xml
labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/target/classes/org/jboss/wiki/redirect/WikiToClearspaceRedirect.class
labs/jbosslabs/qa/portal-extensions/jbosswiki/maven.xml
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java
Log:
svn merge -r 23390:23632 https://svn.jboss.org/repos/labs/labs/jbosslabs/trunk/portal-extensions .
Modified: labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/maven.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/maven.xml 2008-10-30 07:12:55 UTC (rev 23632)
+++ labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/maven.xml 2008-10-30 07:14:34 UTC (rev 23633)
@@ -7,7 +7,7 @@
<!-- Default war-project goals -->
<goal name="all">
- <attainGoal name="prj-all" />
+<!-- <attainGoal name="prj-all" /> -->
</goal>
<goal name="build">
Modified: labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/project.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/project.xml 2008-10-30 07:12:55 UTC (rev 23632)
+++ labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/project.xml 2008-10-30 07:14:34 UTC (rev 23633)
@@ -9,7 +9,7 @@
<extend>../common.xml</extend>
<id>forge-kosmos-portlets</id>
<name>Forge kosmos</name>
- <dependencies>
+<!-- <dependencies>
<dependency>
<groupId>jboss-forge</groupId>
@@ -119,7 +119,7 @@
<jar>jgroups.jar</jar>
</dependency>
- </dependencies>
+ </dependencies>-->
<build>
<sourceDirectory>src/java</sourceDirectory>
Modified: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java 2008-10-30 07:12:55 UTC (rev 23632)
+++ labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java 2008-10-30 07:14:34 UTC (rev 23633)
@@ -38,7 +38,7 @@
return;
}
- if (req.getRequestURI().equals(req.getContextPath())) {
+ if (req.getRequestURI().equals(req.getContextPath() + "/redirect")) {
resp.sendRedirect(redirectTo + "community/wiki");
return;
}
@@ -49,29 +49,21 @@
page = (String)req.getParameter("page");
} else {
page = req.getRequestURI().substring(
- req.getContextPath().length() + 1);
+ (req.getContextPath() + "/redirect").length() + 1);
}
- if (pagesMap.containsKey(page)) {
- String redirPage = redirectTo + "docs/"
+ if (pagesMap.containsKey(page)) {
+ String redirPage = redirectTo + "docs/"
+ pagesMap.getProperty(page);
- resp.setContentType("text/html");
- resp.getWriter().write("<html><head>");
- resp.getWriter()
- .write("<meta http-equiv='refresh' content='5;url=");
- resp.getWriter().write(redirPage);
- resp
- .getWriter()
- .write(
- "'/>\n</head><body>\n<h3>Please update bookmars</h3>\nNew address: <a href='");
- resp.getWriter().write(redirPage);
- resp.getWriter().write("'>");
- resp.getWriter().write(redirPage);
- resp.getWriter().write("</a>\n<br/><br/>Will redirect automaticaly in 5 seconds</body></html>");
- resp.getWriter().close();
- } else {
- resp.sendError(404);
+ req.setAttribute("pageRedirect", redirPage);
+
+ resp.setContentType("text/html");
+
+ req.getRequestDispatcher("/newlocation.jsp").include(req, resp);
+ return;
+ } else {
+ resp.sendRedirect(redirectTo + "docs/DOC-NotFound");
return;
}
}
Modified: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/WEB-INF/web.xml 2008-10-30 07:12:55 UTC (rev 23632)
+++ labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/WEB-INF/web.xml 2008-10-30 07:14:34 UTC (rev 23633)
@@ -17,6 +17,6 @@
</servlet>
<servlet-mapping>
<servlet-name>WikiRedirect</servlet-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>/redirect/*</url-pattern>
</servlet-mapping>
</web-app>
Copied: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images (from rev 23632, labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images)
Deleted: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bkgblur_right.gif
===================================================================
(Binary files differ)
Copied: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bkgblur_right.gif (from rev 23632, labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bkgblur_right.gif)
===================================================================
(Binary files differ)
Deleted: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_bkg.jpg
===================================================================
(Binary files differ)
Copied: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_bkg.jpg (from rev 23632, labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_bkg.jpg)
===================================================================
(Binary files differ)
Deleted: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_blur_bottom.gif
===================================================================
(Binary files differ)
Copied: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_blur_bottom.gif (from rev 23632, labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_blur_bottom.gif)
===================================================================
(Binary files differ)
Copied: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/newlocation.jsp (from rev 23632, labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/newlocation.jsp)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/newlocation.jsp (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/web/newlocation.jsp 2008-10-30 07:14:34 UTC (rev 23633)
@@ -0,0 +1,82 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+<meta http-equiv='refresh' content='5;url=<%=request.getAttribute("pageRedirect")%>'/>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JBoss.org: community driven</title>
+
+<style type="text/css">
+<!--
+
+body {
+ margin: 40px 0px 0px 0px;
+ text-align: center;
+ background-color:#e6e7e8;
+ font-family: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ font-size:11px;
+}
+
+#wrapper {
+ clear:both;
+ margin: 0px auto;
+ background-color:#FFFFFF;
+ background-image:url(/wiki-redirect/images/bkgblur_right.gif);
+ background-repeat:repeat-y;
+ background-position:right;
+ width: 666px;
+ text-align: left;
+}
+
+#content {
+ background-repeat: no-repeat;
+ background-image:url(/wiki-redirect/images/bookmark_bkg.jpg);
+ background-position: 10px 15px;
+ padding: 210px 20px 20px 270px;
+ display: block;
+}
+
+a {
+ color:#4a5d75;
+}
+
+#footer {
+ clear:both;
+ text-align:center;
+ color:#a1a1a1;
+ font-size:10px;
+ background-image:url(/wiki-redirect/images/bookmark_blur_bottom.gif);
+ background-repeat:no-repeat;
+ background-position:top center;
+ background-color:#e6e7e8;
+ padding:6px 0px;
+
+}
+#footer a {
+ color:#a1a1a1;
+}
+#footer p {
+ margin:0px;
+ padding:1px;
+ text-align: center;
+}
+-->
+</style>
+
+<body>
+<div id="container">
+ <div id="wrapper">
+ <div id="content">
+ <h2>Please update your bookmarks</h2>
+ <p>The requested page has changed locations.</p>
+ <p><a href="<%=request.getAttribute("pageRedirect")%>">Click here if your browser does not automatically redirect you.</a></p>
+ </div>
+ <div id="footer">
+ <p><a href="http://www.redhat.com/">Red Hat.com</a> | <a href="http://www.jboss.com/">JBoss.com</a> | <a href="http://www.jboss.com/company/contact">Contact Us</a> | <a href="http://www.redhat.com/about/careers">Careers</a></p>
+ <p>Hosted on <a href="http://www.jboss.org/jbosslabs">JBoss Labs</a>. Powered by <a href="http://www.jboss.org/jbossportal">JBoss Portal</a>, <a href="http://www.jboss.org/jbossas">JBoss AS</a> and <a href="http://www.jboss.org/shotoku">Shotoku</a>.</p>
+ <p>Experiencing a <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=210">problem</a> or have a <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=210">suggestion</a> to make jboss.org better?</p>
+ </div>
+ </div>
+</div>
+</body></html>
\ No newline at end of file
Modified: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/target/classes/org/jboss/wiki/redirect/WikiToClearspaceRedirect.class
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/maven.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/maven.xml 2008-10-30 07:12:55 UTC (rev 23632)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/maven.xml 2008-10-30 07:14:34 UTC (rev 23633)
@@ -9,14 +9,14 @@
-->
<goal name="build">
- <attainGoal name="wiki:build" />
+<!-- <attainGoal name="wiki:build" />-->
</goal>
<goal name="prj-install">
</goal>
<goal name="deploy">
- <attainGoal name="wiki:deploy" />
+<!-- <attainGoal name="wiki:deploy" />-->
</goal>
<goal name="clean">
@@ -59,7 +59,7 @@
</goal>
<goal name="prepare-ear">
- <ant:delete dir="target/ear" />
+<!-- <ant:delete dir="target/ear" />
<ant:copy tofile="target/ear/wiki-common.jar" file="wiki-common/target/wiki-common-1.0.jar" />
<ant:copy tofile="target/ear/wiki.war" file="forge-wiki/target/wiki.war" />
@@ -69,23 +69,23 @@
<ant:fileset dir="lib">
<ant:filename name="*.jar" />
</ant:fileset>
- </ant:copy>
+ </ant:copy>-->
</goal>
<goal name="wiki:deploy">
- <ant:copy
+<!-- <ant:copy
todir="${local.deploy.dir}"
- file="target/${maven.final.name}.ear" overwrite="true" />
+ file="target/${maven.final.name}.ear" overwrite="true" />-->
</goal>
<goal name="wiki:all">
- <attainGoal name="wiki:localbuild" />
+<!-- <attainGoal name="wiki:localbuild" />
- <attainGoal name="wiki:deploy" />
+ <attainGoal name="wiki:deploy" />-->
</goal>
<goal name="all">
- <attainGoal name="wiki:all" />
+ <!-- <attainGoal name="wiki:all" />-->
</goal>
<goal name="help">
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java 2008-10-30 07:12:55 UTC (rev 23632)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java-migration/org/jboss/labs/clearspace/CSMigration.java 2008-10-30 07:14:34 UTC (rev 23633)
@@ -163,6 +163,8 @@
.wikiToJiveDocument(content);
wsd.setBody(body);
+
+ wsd.setCreationDate(page.getEditDate());
wsd.setUser(getUser(page.getLastAuthor().getName()));
Copied: labs/jbosslabs/qa/portal-extensions/kryten (from rev 23632, labs/jbosslabs/trunk/portal-extensions/kryten)
Property changes on: labs/jbosslabs/qa/portal-extensions/kryten
___________________________________________________________________
Name: svn:externals
+ kryten-repo https://svn.devel.redhat.com/repos/Swivel/trunk
Deleted: labs/jbosslabs/qa/portal-extensions/kryten/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/kryten/maven.xml 2008-10-30 07:12:55 UTC (rev 23632)
+++ labs/jbosslabs/qa/portal-extensions/kryten/maven.xml 2008-10-30 07:14:34 UTC (rev 23633)
@@ -1,33 +0,0 @@
-<!--
- JBoss, the OpenSource J2EE webOS
- Distributable under LGPL license.
- See terms of license at gnu.org.
- -->
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
- <!-- Default war-project goals -->
-
- <goal name="all">
- <attainGoal name="prj-all" />
- </goal>
-
- <goal name="build">
-
- </goal>
-
- <goal name="deploy">
- <ant:exec dir="${ext.root.dir}/kryten/kryten-repo" executable="ant" failonerror="true">
- <ant:arg line="restart" />
- <ant:arg line="-Djboss.home=${local.server.dir}" />
- <ant:arg line="-Dprofile=prod" />
- </ant:exec>
- </goal>
-
- <goal name="clean">
- <ant:exec dir="${ext.root.dir}/kryten/kryten-repo" executable="ant" failonerror="true">
- <ant:arg line="clean" />
- <ant:arg line="-Djboss.home=${local.server.dir}" />
- <ant:arg line="-Dprofile=prod" />
- </ant:exec>
- <attainGoal name="prj-clean" />
- </goal>
-</project>
Copied: labs/jbosslabs/qa/portal-extensions/kryten/maven.xml (from rev 23632, labs/jbosslabs/trunk/portal-extensions/kryten/maven.xml)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/kryten/maven.xml (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/kryten/maven.xml 2008-10-30 07:14:34 UTC (rev 23633)
@@ -0,0 +1,33 @@
+<!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+ <!-- Default war-project goals -->
+
+ <goal name="all">
+ <attainGoal name="prj-all" />
+ </goal>
+
+ <goal name="build">
+
+ </goal>
+
+ <goal name="deploy">
+ <ant:exec dir="${ext.root.dir}/kryten/kryten-repo" executable="ant" failonerror="true">
+ <ant:arg line="restart" />
+ <ant:arg line="-Djboss.home=${local.server.dir}" />
+ <ant:arg line="-Dprofile=prod" />
+ </ant:exec>
+ </goal>
+
+ <goal name="clean">
+ <ant:exec dir="${ext.root.dir}/kryten/kryten-repo" executable="ant" failonerror="true">
+ <ant:arg line="clean" />
+ <ant:arg line="-Djboss.home=${local.server.dir}" />
+ <ant:arg line="-Dprofile=prod" />
+ </ant:exec>
+ <attainGoal name="prj-clean" />
+ </goal>
+</project>
Deleted: labs/jbosslabs/qa/portal-extensions/kryten/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/kryten/project.properties 2008-10-30 07:12:55 UTC (rev 23632)
+++ labs/jbosslabs/qa/portal-extensions/kryten/project.properties 2008-10-30 07:14:34 UTC (rev 23633)
@@ -1,4 +0,0 @@
-maven.repo.remote=http://repo1.maven.org/maven
-maven.junit.fork=yes
-
-maven.final.name=${pom.artifactId}
\ No newline at end of file
Copied: labs/jbosslabs/qa/portal-extensions/kryten/project.properties (from rev 23632, labs/jbosslabs/trunk/portal-extensions/kryten/project.properties)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/kryten/project.properties (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/kryten/project.properties 2008-10-30 07:14:34 UTC (rev 23633)
@@ -0,0 +1,4 @@
+maven.repo.remote=http://repo1.maven.org/maven
+maven.junit.fork=yes
+
+maven.final.name=${pom.artifactId}
\ No newline at end of file
Deleted: labs/jbosslabs/qa/portal-extensions/kryten/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/kryten/project.xml 2008-10-30 07:12:55 UTC (rev 23632)
+++ labs/jbosslabs/qa/portal-extensions/kryten/project.xml 2008-10-30 07:14:34 UTC (rev 23633)
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!--
- JBoss, the OpenSource J2EE webOS
- Distributable under LGPL license.
- See terms of license at gnu.org.
- -->
-<project>
- <pomVersion>3</pomVersion>
- <extend>../common.xml</extend>
- <id>kryten</id>
- <name>Kryten</name>
- <currentVersion>1.0</currentVersion>
- <organization>
- <name>Adam Warski</name>
- <url>http://www.warski.org</url>
- </organization>
- <description />
-
- <dependencies />
-</project>
Copied: labs/jbosslabs/qa/portal-extensions/kryten/project.xml (from rev 23632, labs/jbosslabs/trunk/portal-extensions/kryten/project.xml)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/kryten/project.xml (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/kryten/project.xml 2008-10-30 07:14:34 UTC (rev 23633)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../common.xml</extend>
+ <id>kryten</id>
+ <name>Kryten</name>
+ <currentVersion>1.0</currentVersion>
+ <organization>
+ <name>Adam Warski</name>
+ <url>http://www.warski.org</url>
+ </organization>
+ <description />
+
+ <dependencies />
+</project>
More information about the jboss-svn-commits
mailing list