Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1038 - in trunk/forge/portal-extensions: . forge-common/src/java/org/jboss/forge/common forge-common/src/java/org/jboss/forge/common/blog forge-common/src/java/org/jboss/forge/common/content forge-common/src/java/org/jboss/forge/common/projects forge-common/src/java/org/jboss/forge/common/taglib forge-common/src/web/WEB-INF/tld forge-contributor/src/etc forge-contributor/src/java/org/jboss/forge/contributor forge-contributor/src/web/WEB-INF/tld forge-ear/src/META-INF forge-file-access/src/web/WEB-INF/tld forge-freezone forge-freezone/src/java/org/jboss/forge/projects/freezone forge-prj-docs/src/java/org/jboss/forge/projects/docs forge-root-redirect/src/web/WEB-INF/tld forge-wiki/src/web/WEB-INF/tld portal-federation/src/web/WEB-INF/tld
Author: adamw
Date: 2005-09-02 11:03:56 -0400 (Fri, 02 Sep 2005)
New Revision: 1038
Added:
trunk/forge/portal-extensions/forge-freezone/
Removed:
trunk/forge/portal-extensions/forge-prj-freezone/
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogUpdater.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/FileBasedContentManager.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/AttrValueTag.java
trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld
trunk/forge/portal-extensions/forge-contributor/src/etc/Messages.properties
trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld
trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml
trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld
trunk/forge/portal-extensions/forge-freezone/project.xml
trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
trunk/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java
trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld
trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/forge.tld
trunk/forge/portal-extensions/maven.xml
trunk/forge/portal-extensions/portal-federation/src/web/WEB-INF/tld/forge.tld
Log:
- Global freezone w/ tag
- An email to con admin upon acceptation
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -65,6 +65,11 @@
* service (mbean).
*/
public final static String FORGE_SERVICE_NAME = "forge:service=cacheAndUpdate";
+ /**
+ * <code>FREEZONE_SEPARATOR</code> - separator used in requests insted of
+ * file-name components separator /.
+ */
+ public final static String FREEZONE_SEPARATOR = "+";
private ForgeProperties props;
@@ -109,7 +114,7 @@
* @return <code>str</code> with each occurence of <code>pattern</code>
* replaced with <code>replace</code>.
*/
- public String replace(String str, String pattern, String replace) {
+ public static String replace(String str, String pattern, String replace) {
int s = 0;
int e = 0;
StringBuffer result = new StringBuffer();
@@ -311,4 +316,18 @@
public ForgeProperties getForgeProperties() {
return props;
}
+
+ /**
+ * Creates a link to a global freezone page basing on the given parameters.
+ *
+ * @param portalName
+ * Name of the portal.
+ * @param page
+ * Page to link to.
+ * @return A link to the given page.
+ */
+ public static String createFreezonePageLink(String portalName, String page) {
+ return "/portal/index.html?ctrl:id=page." + portalName
+ + ".freezone&page=" + replace(page, "/", FREEZONE_SEPARATOR);
+ }
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -63,7 +63,7 @@
* ${name}) with the provided value.
*/
public String replaceProperty(String content, String name, String value) {
- return forgeHelper.replace(content, name, value);
+ return ForgeHelper.replace(content, name, value);
}
protected abstract String getJsp();
@@ -283,11 +283,11 @@
break;
}
- root.put("atomFeed", forgeHelper.replace(feedTypeFreeAddress,
+ root.put("atomFeed", ForgeHelper.replace(feedTypeFreeAddress,
"${feed.type}", "atom"));
- root.put("rssFeed", forgeHelper.replace(feedTypeFreeAddress,
+ root.put("rssFeed", ForgeHelper.replace(feedTypeFreeAddress,
"${feed.type}", "rss"));
- root.put("xmlFeed", forgeHelper.replace(feedTypeFreeAddress,
+ root.put("xmlFeed", ForgeHelper.replace(feedTypeFreeAddress,
"${feed.type}", "rdf"));
root.put("currentTime", DateFormat.getTimeInstance(DateFormat.SHORT,
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogUpdater.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogUpdater.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogUpdater.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -30,14 +30,11 @@
public class BlogUpdater {
private ContentManager cm;
private String blogPath;
- private ForgeHelper forgeHelper;
private String[] portals;
public BlogUpdater(ContentManager cm, String blogPath) {
this.cm = cm;
this.blogPath = blogPath;
-
- forgeHelper = new ForgeHelper();
portals = cm.getDirectories("");
}
@@ -127,7 +124,7 @@
+ File.separator
+ projectIds[i]
+ File.separator
- + forgeHelper.replace(repoEntries[j],
+ + ForgeHelper.replace(repoEntries[j],
".html", ".meta");
File blogMetaFile = new File(blogMetaFilename);
blogMetaFile.createNewFile();
@@ -178,7 +175,7 @@
+ File.separator + blogEntry;
String blogMetaFilename = blogPath + File.separator
+ projectIds[i] + File.separator
- + forgeHelper.replace(blogEntry, ".html", ".meta");
+ + ForgeHelper.replace(blogEntry, ".html", ".meta");
new File(blogFilename).delete();
new File(blogMetaFilename).delete();
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/FileBasedContentManager.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/FileBasedContentManager.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/FileBasedContentManager.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -28,17 +28,14 @@
*/
public abstract class FileBasedContentManager extends ContentManager {
private String basePath;
- private ForgeHelper forgeHelper;
public FileBasedContentManager(String basePath) {
super();
this.basePath = basePath;
-
- forgeHelper = new ForgeHelper();
}
private String replaceSeparators(String path) {
- return forgeHelper.replace(path, "/", File.separator);
+ return ForgeHelper.replace(path, "/", File.separator);
}
protected String getSystemFilePath(String name) {
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -292,7 +292,7 @@
else {
if ("true".equals(properties.get("freezone").getFirstValue()))
context.put("link",
- new ProjectsHelper().createFreezonePageLink(
+ ProjectsHelper.createFreezonePageLink(
portalName, projectId, id));
else
context.put("link", downloadPrefix + pathCategoryContext
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -39,8 +39,6 @@
private DownloadsDescriptor downloads;
private DownloadsDescriptor docs;
- private ProjectsHelper projectsHelper;
-
private String portalName;
private ElementDescriptor thisProject;
@@ -65,7 +63,6 @@
DomToXmlTransformer xht, OutsidePropertiesMap opm,
String portalName) throws SAXException, IOException,
XmlNotFoundException {
- projectsHelper = new ProjectsHelper();
this.portalName = portalName;
// Parsing the XML.
@@ -181,7 +178,7 @@
public void fillContextShallow(PropertiesMap properties,
DelegateContext context) {
- context.put("link", projectsHelper.createFreezonePageLink(
+ context.put("link", ProjectsHelper.createFreezonePageLink(
portalName, getId(), properties.get("id")
.getFirstValue()));
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -35,11 +35,12 @@
* depicting the selected project.
*/
public final static String PROJECT_URL_PARAM = "project";
+
/**
- * <code>FREEZONE_SEPARATOR</code> - separator used in requests insted of
- * file-name components separator /.
+ * <code>DEFAULT_PROJECT</code> - name of the project to return if there
+ * is no project selected.
*/
- public final static String FREEZONE_SEPARATOR = "+";
+ private final static String DEFAULT_PROJECT = "default";
/**
* <code>projectsObjects</code> - portalName -> Projects object
@@ -91,14 +92,40 @@
}
/**
+ * Equivalent to <code>getSelectedProjectId(request, false)</code>.
* @param request
* A request object from which the selected project name will be
* read.
- * @return Selected project's name, or null, if no project is selected.
+ * @return Selected project's id, or null, if no project is selected (never
+ * the default project, as it cannot be selected).
*/
public String getSelectedProjectId(JBossRenderRequest request) {
- return forgeHelper.getRequestParameter(request, PROJECT_URL_PARAM);
+ return getSelectedProjectId(request, false);
}
+
+ /**
+ * @param request
+ * A request object from which the selected project name will be
+ * read.
+ * @param withDefault
+ * True if default project name should be returned if no project
+ * is selected. False if null should be returned in such case.
+ * @return Selected project's id, or the default project's id/ null, depending
+ * on <code>withDefault</code>, if no project is selected.
+ */
+ public String getSelectedProjectId(JBossRenderRequest request,
+ boolean withDefault) {
+ String projectId = forgeHelper.getRequestParameter(request,
+ PROJECT_URL_PARAM);
+
+ if ((withDefault) && (projectId == null))
+ projectId = DEFAULT_PROJECT;
+
+ if ((!withDefault) && (DEFAULT_PROJECT.equals(projectId)))
+ projectId = null;
+
+ return projectId;
+ }
/**
* Prepares a request object for generating a JSP. PROJECT_NAME and
@@ -123,17 +150,17 @@
* Page to link to.
* @return A link to the given page.
*/
- public String createFreezonePageLink(String portalName, String projectId,
+ public static String createFreezonePageLink(String portalName, String projectId,
String page) {
return "/portal/index.html?ctrl:id=page." + portalName
+ ".freezone&project=" + projectId + "&page="
- + forgeHelper.replace(page, "/", FREEZONE_SEPARATOR);
+ + ForgeHelper.replace(page, "/", ForgeHelper.FREEZONE_SEPARATOR);
}
public String createDocsPageLink(String portalName, String projectId,
String page) {
return "/portal/index.html?ctrl:id=page." + portalName
+ ".docs&project=" + projectId + "&page="
- + forgeHelper.replace(page, "/", FREEZONE_SEPARATOR);
+ + ForgeHelper.replace(page, "/", ForgeHelper.FREEZONE_SEPARATOR);
}
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/AttrValueTag.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/AttrValueTag.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/AttrValueTag.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -22,7 +22,7 @@
if (attr != null)
pageContext.getOut().write(attr.toString());
} catch (IOException e) {
- throw new JspException();
+ throw new JspException(e);
}
return EVAL_BODY_BUFFERED;
Modified: trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld 2005-09-02 15:03:56 UTC (rev 1038)
@@ -53,6 +53,16 @@
</tag>
<tag>
+ <name>freezoneURL</name>
+ <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>projectURL</name>
<tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
<attribute>
Modified: trunk/forge/portal-extensions/forge-contributor/src/etc/Messages.properties
===================================================================
--- trunk/forge/portal-extensions/forge-contributor/src/etc/Messages.properties 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-contributor/src/etc/Messages.properties 2005-09-02 15:03:56 UTC (rev 1038)
@@ -31,6 +31,12 @@
now be visible on the contributor's list on labs.jboss.com. \n\
\n\
The JBoss Labs team.
+acceptedMailTextAdmin = \
+ A new contributor has been accepted. \n\
+ Name: {0} \n\
+ Email: {1} \n\
+ Type: {2} \n\
+ Login: {3}
confirmMailSubject = Application confirmation
confirmMailText = \
Modified: trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
===================================================================
--- trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -136,18 +136,29 @@
String xmlFilePath = getConfirmedFilePath();
String content = cm.read(xmlFilePath);
- String newContent = forgeHelper.replace(content,
+ String newContent = ForgeHelper.replace(content,
oldXml, newXml);
cm.write(xmlFilePath, newContent, false);
addToToCommit(getBaseFilePath());
+ // Posting a notification to the contributor
forgeHelper.postMail(dataBean.getEmail(),
messages.getString("acceptedMailSubject"),
getFormattedMessage("acceptedMailText",
new Object[] { dataBean.getName() }),
"for...@la...");
+ // Posting a notification to the con-admin
+ forgeHelper.postMail(
+ forgeHelper.getForgeProperties().getContribAdmin(),
+ messages.getString("acceptedMailSubject"),
+ getFormattedMessage("acceptedMailTextAdmin",
+ new Object[] { dataBean.getName(),
+ dataBean.getEmail(), dataBean.getType(),
+ dataBean.getLogin() }),
+ "for...@la...");
+
return true;
} catch (Exception e) {
return false;
@@ -167,7 +178,7 @@
String xmlFilePath = getConfirmedFilePath();
String content = cm.read(xmlFilePath);
- String newContent = forgeHelper.replace(content,
+ String newContent = ForgeHelper.replace(content,
oldXml, "");
cm.write(xmlFilePath, newContent, false);
@@ -237,12 +248,12 @@
String confirmedContent = cm.read(confirmedXmlFilePath);
String unconfirmedContent = cm.read(unconfirmedXmlFilePath);
- confirmedContent = forgeHelper.replace(confirmedContent,
+ confirmedContent = ForgeHelper.replace(confirmedContent,
"</"+ConDescriptor.AGREEMENTS_TAG+">",
newXml
+ "</"+ConDescriptor.AGREEMENTS_TAG+">"
);
- unconfirmedContent = forgeHelper.replace(unconfirmedContent,
+ unconfirmedContent = ForgeHelper.replace(unconfirmedContent,
oldXml, "");
cm.write(confirmedXmlFilePath, confirmedContent, false);
@@ -328,7 +339,7 @@
String xmlFilePath = getUnconfirmedFilePath();
String content = cm.read(xmlFilePath);
- String newContent = forgeHelper.replace(content,
+ String newContent = ForgeHelper.replace(content,
"</"+ConDescriptor.AGREEMENTS_TAG+">",
newAgreement
+ "</"+ConDescriptor.AGREEMENTS_TAG+">"
Modified: trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld
===================================================================
--- trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld 2005-09-02 15:03:56 UTC (rev 1038)
@@ -53,6 +53,16 @@
</tag>
<tag>
+ <name>freezoneURL</name>
+ <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>projectURL</name>
<tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
<attribute>
Modified: trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml
===================================================================
--- trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2005-09-02 15:03:56 UTC (rev 1038)
@@ -50,7 +50,7 @@
</module>
<module>
<web>
- <web-uri>forge-prj-freezone.war</web-uri>
+ <web-uri>forge-freezone.war</web-uri>
</web>
</module>
<module>
Modified: trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld
===================================================================
--- trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld 2005-09-02 15:03:56 UTC (rev 1038)
@@ -53,6 +53,16 @@
</tag>
<tag>
+ <name>freezoneURL</name>
+ <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>projectURL</name>
<tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
<attribute>
Copied: trunk/forge/portal-extensions/forge-freezone (from rev 1037, trunk/forge/portal-extensions/forge-prj-freezone)
Modified: trunk/forge/portal-extensions/forge-freezone/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-prj-freezone/project.xml 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-freezone/project.xml 2005-09-02 15:03:56 UTC (rev 1038)
@@ -7,8 +7,8 @@
<project>
<pomVersion>3</pomVersion>
<extend>../common.xml</extend>
- <id>forge-prj-freezone</id>
- <name>Forge projects freezone portlet</name>
+ <id>forge-freezone</id>
+ <name>Forge freezone portlet</name>
<currentVersion>1.0</currentVersion>
<organization>
<name>Adam Warski</name>
Modified: trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -50,7 +50,7 @@
* @return Text contained in the reference or null if no reference is found.
*/
private String findNextReference(String content, String refName) {
- int h, ch;
+ int h;
int start;
if (refName.equals("link")) {
h = content.indexOf(" href="); //search for one of the link types
@@ -156,17 +156,15 @@
String portalName = forgeHelper.getPortalName(request);
// Getting the selected project
- String projectId = projectsHelper.getSelectedProjectId(request);
- if (projectId == null)
- throw new Exception();
+ String projectId = projectsHelper.getSelectedProjectId(request, true);
// Getting the name of the requested page
String pagePath = forgeHelper.getRequestParameter(request, "page");
if (pagePath == null)
pagePath = DEFAULT_PAGE;
else
- pagePath = forgeHelper.replace(pagePath,
- ProjectsHelper.FREEZONE_SEPARATOR, "/");
+ pagePath = ForgeHelper.replace(pagePath,
+ ForgeHelper.FREEZONE_SEPARATOR, "/");
// If the tried to break into other files, denying access to him.
if (pagePath.indexOf("..") != -1)
@@ -185,12 +183,12 @@
+ ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/";
while(pageContent.indexOf("HREF=")!= -1)
{
- pageContent = forgeHelper.replace(pageContent,"HREF=", "href=");
+ pageContent = ForgeHelper.replace(pageContent,"HREF=", "href=");
}
while(pageContent.indexOf("<IMG SRC=")!= -1)
{
- pageContent = forgeHelper.replace(pageContent,"<IMG SRC=", "<img src=");
+ pageContent = ForgeHelper.replace(pageContent,"<IMG SRC=", "<img src=");
}
// Replacing links
@@ -202,17 +200,17 @@
if(nextRef2.endsWith(".png"))
{
nextRef2=imagePrepend+nextRef2+"\" target=\"_blank\"";
- pageContent = forgeHelper.replace(pageContent,"href="
+ pageContent = ForgeHelper.replace(pageContent,"href="
+ '"' + nextRef + '"', "*ref="+'"'+ nextRef2);
}
else
- pageContent = forgeHelper.replace(pageContent, "href="
+ pageContent = ForgeHelper.replace(pageContent, "href="
+ '"' + nextRef + '"',
- projectsHelper.createFreezonePageLink(portalName,
+ ProjectsHelper.createFreezonePageLink(portalName,
projectId, nextRef2+'"'));
}
else {
- pageContent = forgeHelper.replace(pageContent, "href="
+ pageContent = ForgeHelper.replace(pageContent, "href="
+ '"' + nextRef, "$"+nextRef+'"');
}
}
@@ -221,16 +219,16 @@
while ((nextRef = findNextReference(pageContent, "image")) != null)
{
nextRef2 = modifyPath(pagePath, nextRef);
- pageContent = forgeHelper.replace(pageContent, "<img src="+'"'
+ pageContent = ForgeHelper.replace(pageContent, "<img src="+'"'
+ nextRef+'"', "*img src="+'"'+imagePrepend + nextRef2+'"');}
//fix back internal links
while (pageContent.indexOf("*ref=") != -1)
- pageContent = forgeHelper.replace(pageContent,
+ pageContent = ForgeHelper.replace(pageContent,
"*ref=", " href=" );
while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1)
- pageContent = forgeHelper.replace(pageContent,
+ pageContent = ForgeHelper.replace(pageContent,
" /portal/index.html?ctrl:id", " href=" + '"'
+ "/portal/index.html?ctrl:id");
@@ -242,11 +240,11 @@
|| pageContent.indexOf("$file:") != -1
|| pageContent.indexOf("$mailto:") != -1
|| pageContent.indexOf("$news:") != -1)
- {pageContent = forgeHelper.replace(pageContent, "$",
+ {pageContent = ForgeHelper.replace(pageContent, "$",
" href=" + '"');}
//fix back image links
while (pageContent.indexOf("*img src=") != -1 )
- {pageContent = forgeHelper.replace(pageContent, "*img src=",
+ {pageContent = ForgeHelper.replace(pageContent, "*img src=",
"<img src=");}
response.getWriter().write(pageContent);
Modified: trunk/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java 2005-09-02 15:03:56 UTC (rev 1038)
@@ -110,8 +110,8 @@
if (pagePath == null)
pagePath = DEFAULT_PAGE;
else
- pagePath = forgeHelper.replace(pagePath,
- ProjectsHelper.FREEZONE_SEPARATOR, "/");
+ pagePath = ForgeHelper.replace(pagePath,
+ ForgeHelper.FREEZONE_SEPARATOR, "/");
// If the tried to break into other files, denying access to him.
if (pagePath.indexOf("..") != -1)
@@ -130,13 +130,13 @@
while ((nextRef = findNextReference(pageContent, "link")) != null) {
if(!isExternalLink(nextRef))
//if (nextRef.indexOf("http://") == -1)
- //it would be relative not outside link
- pageContent = forgeHelper.replace(pageContent, "href="
+ //it would be ForgeHelper not outside link
+ pageContent = ForgeHelper.replace(pageContent, "href="
+ '"' + nextRef + '"',
projectsHelper.createDocsPageLink(portalName,
projectId, nextRef) + '"');
else {
- pageContent = forgeHelper.replace(pageContent, "href="
+ pageContent = ForgeHelper.replace(pageContent, "href="
+ '"' + nextRef, "$"+nextRef+'"');
}
}
@@ -145,12 +145,12 @@
String imagePrepend = "/file-access/" + portalName + "/"
+ ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.DOCS_DIR+"/";
while ((nextRef = findNextReference(pageContent, "image")) != null)
- pageContent = forgeHelper.replace(pageContent, "<img src="+'"'
+ pageContent = ForgeHelper.replace(pageContent, "<img src="+'"'
+ nextRef+'"', "*img src="+'"'+imagePrepend + nextRef+'"');
//fix back internal links
while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1)
- pageContent = forgeHelper.replace(pageContent,
+ pageContent = ForgeHelper.replace(pageContent,
" /portal/index.html?ctrl:id", " href=" + '"'
+ "/portal/index.html?ctrl:id");
@@ -162,11 +162,11 @@
|| pageContent.indexOf("$file:") != -1
|| pageContent.indexOf("$mailto:") != -1
|| pageContent.indexOf("$news:") != -1)
- {pageContent = forgeHelper.replace(pageContent, "$",
+ {pageContent = ForgeHelper.replace(pageContent, "$",
" href=" + '"');}
//fix back image links
while (pageContent.indexOf("*img src=") != -1 )
- {pageContent = forgeHelper.replace(pageContent, "*img src=",
+ {pageContent = ForgeHelper.replace(pageContent, "*img src=",
"<img src=");}
response.getWriter().write(pageContent);
Modified: trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld
===================================================================
--- trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld 2005-09-02 15:03:56 UTC (rev 1038)
@@ -53,6 +53,16 @@
</tag>
<tag>
+ <name>freezoneURL</name>
+ <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>projectURL</name>
<tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
<attribute>
Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/forge.tld
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/forge.tld 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/forge.tld 2005-09-02 15:03:56 UTC (rev 1038)
@@ -53,6 +53,16 @@
</tag>
<tag>
+ <name>freezoneURL</name>
+ <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>projectURL</name>
<tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
<attribute>
Modified: trunk/forge/portal-extensions/maven.xml
===================================================================
--- trunk/forge/portal-extensions/maven.xml 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/maven.xml 2005-09-02 15:03:56 UTC (rev 1038)
@@ -52,6 +52,9 @@
<!-- A goal that deploys the ear into the appserver -->
<goal name="deploy-ear">
+ <!-- Deleting the old ear -->
+ <ant:delete dir="${local.deploy.dir}/${forge.ear.name}" />
+
<!-- Copying application.xml -->
<ant:copy
file="${forge.ear.dir}/src/META-INF/application.xml"
Modified: trunk/forge/portal-extensions/portal-federation/src/web/WEB-INF/tld/forge.tld
===================================================================
--- trunk/forge/portal-extensions/portal-federation/src/web/WEB-INF/tld/forge.tld 2005-09-02 09:23:53 UTC (rev 1037)
+++ trunk/forge/portal-extensions/portal-federation/src/web/WEB-INF/tld/forge.tld 2005-09-02 15:03:56 UTC (rev 1038)
@@ -53,6 +53,16 @@
</tag>
<tag>
+ <name>freezoneURL</name>
+ <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>projectURL</name>
<tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
<attribute>
|
