Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r930 - 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/taglib forge-common/src/web/WEB-INF/tld forge-contributor/src/web/WEB-INF/tld forge-file-access forge-file-access/src forge-file-access/src/etc forge-file-access/src/java/org/jboss/forge/fileaccess forge-file-access/src/web/WEB-INF/tld forge-portal-attr forge-portal-attr/src forge-portal-attr/src/java forge-portal-attr/src/java/org forge-portal-attr/src/java/org/jboss forge-portal-attr/src/java/org/jboss/forge forge-portal-attr/src/java/org/jboss/forge/portal forge-portal-attr/to-copy forge-portal-attr/to-copy/jboss-portal.sar forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF 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-08-23 14:41:55 -0400 (Tue, 23 Aug 2005)
New Revision: 930
Added:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java
trunk/forge/portal-extensions/forge-file-access/src/etc/
trunk/forge/portal-extensions/forge-file-access/src/etc/mime-types.txt
trunk/forge/portal-extensions/forge-portal-attr/
trunk/forge/portal-extensions/forge-portal-attr/maven.xml
trunk/forge/portal-extensions/forge-portal-attr/project.xml
trunk/forge/portal-extensions/forge-portal-attr/src/
trunk/forge/portal-extensions/forge-portal-attr/src/java/
trunk/forge/portal-extensions/forge-portal-attr/src/java/org/
trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/
trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/
trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/
trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java
trunk/forge/portal-extensions/forge-portal-attr/to-copy/
trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/
trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/
trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/
trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
Removed:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiParam.java
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/taglib/PageURLTag.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/URLTag.java
trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld
trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld
trunk/forge/portal-extensions/forge-file-access/project.xml
trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java
trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld
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/portal-federation/src/web/WEB-INF/tld/forge.tld
Log:
Wiki tag, portal attributes - setting the "project" to be in session, corrected mime types for file downloading
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-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2005-08-23 18:41:55 UTC (rev 930)
@@ -195,29 +195,36 @@
// First trying to read it from the URL (this works, if it is not a
// render/ action request).
String URL = request.getURL();
+ String paramValue;
if (URL != null) {
- int paramStart = request.getURL().indexOf(paramName + "=");
+ int paramStart = request.getURL().indexOf("&" + paramName + "=");
+ if (paramStart == -1)
+ paramStart = request.getURL().indexOf("?" + paramName + "=");
+
if (paramStart != -1) {
- String prjName;
-
// Skipping the <paramName>=
- paramStart += paramName.length() + 1;
+ paramStart += paramName.length() + 2;
int paramEnd = request.getURL().substring(paramStart).indexOf('&');
if (paramEnd == -1)
- prjName = URL.substring(paramStart);
+ paramValue = URL.substring(paramStart);
else
- prjName = URL.substring(paramStart, paramStart + paramEnd);
+ paramValue = URL.substring(paramStart, paramStart + paramEnd);
- return prjName;
+ return paramValue;
}
return null;
}
// If the paramter wasn't in the URL, trying to read it from the
- // parameters - the paramter will be there, if it is a render/
- // action request.
- return request.getParameters().get(paramName, null);
+ // parameters and attributes - the paramter will be there, if
+ // it is a render/action request or if this has been set by an
+ // external filter.
+ paramValue = request.getParameters().get(paramName, null);
+ if (paramValue == null)
+ paramValue = (String) request.getAttribute(paramName);
+
+ return paramValue;
}
/**
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-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-08-23 18:41:55 UTC (rev 930)
@@ -126,6 +126,7 @@
// A string denoting the number of the first displayed entry
String fromEntryString = forgeHelper.getRequestParameter(request,
"from");
+
if (fromEntryString == null)
fromEntryString = "1";
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/PageURLTag.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/PageURLTag.java 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/PageURLTag.java 2005-08-23 18:41:55 UTC (rev 930)
@@ -25,6 +25,7 @@
public int doStartTag() throws JspException {
return writeURL("/portal/index.html", "ctrl:id", "page."+
- pageContext.getRequest().getAttribute(ForgeHelper.PORTAL_NAME)+"."+page);
+ pageContext.getRequest().getAttribute(ForgeHelper.PORTAL_NAME)+
+ "."+page+"&noproject=true");
}
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java 2005-08-23 18:41:55 UTC (rev 930)
@@ -14,8 +14,6 @@
import org.jboss.forge.common.projects.ProjectsHelper;
public class ProjectURLTag extends URLTag {
- protected final static String SELECTED_PROJECT = "_selected";
-
private String project;
private String page;
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/URLTag.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/URLTag.java 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/URLTag.java 2005-08-23 18:41:55 UTC (rev 930)
@@ -16,6 +16,8 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
public abstract class URLTag extends BodyTagSupport {
+ protected final static String SELECTED_PROJECT = "_selected";
+
protected String form;
public String getForm() {
Deleted: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiParam.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiParam.java 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiParam.java 2005-08-23 18:41:55 UTC (rev 930)
@@ -1,50 +0,0 @@
-/*****************************************
- * *
- * JBoss Portal: The OpenSource Portal *
- * *
- * Distributable under LGPL license. *
- * See terms of license at gnu.org. *
- * *
- *****************************************/
-package org.jboss.forge.common.taglib;
-
-import java.io.IOException;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-public class WikiParam extends TagSupport {
- private String name;
- private String value;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public int doStartTag() {
- return SKIP_BODY;
- }
-
- public int doEndTag() throws JspException {
- try {
- if (value.length() > 1)
- pageContext.getOut().write("&"+name+"="+value.substring(0,1).toUpperCase()+ value.substring(1,value.length()));
- } catch (IOException e) {
- throw new JspException();
- }
-
- return EVAL_PAGE;
- }
-}
Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java 2005-08-23 18:41:55 UTC (rev 930)
@@ -0,0 +1,41 @@
+/*****************************************
+ * *
+ * JBoss Portal: The OpenSource Portal *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *****************************************/
+package org.jboss.forge.common.taglib;
+
+import javax.servlet.jsp.JspException;
+
+import org.jboss.forge.common.projects.ProjectsHelper;
+
+public class WikiURLTag extends URLTag {
+ private final static String WIKI_URL = "window.default.WikiPortletWindow&ctrl:type=action";
+
+ private String project;
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ private String capitilizeFirstLetter(String value) {
+ return value.substring(0,1).toUpperCase()+ value.substring(1,value.length());
+ }
+
+ public int doStartTag() throws JspException {
+ String projectName = project.equals(SELECTED_PROJECT) ?
+ pageContext.getRequest().getAttribute(
+ ProjectsHelper.PROJECT_ID).toString() : project;
+
+ return writeURL("/portal/index.html", "ctrl:id",
+ WIKI_URL+"&page="+capitilizeFirstLetter(projectName)+"&project="+
+ projectName);
+ }
+}
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-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld 2005-08-23 18:41:55 UTC (rev 930)
@@ -43,18 +43,13 @@
</tag>
<tag>
- <name>wikiparam</name>
- <tagclass>org.jboss.forge.common.taglib.WikiParam</tagclass>
+ <name>wikiURL</name>
+ <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
<attribute>
- <name>name</name>
+ <name>project</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
</tag>
<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-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld 2005-08-23 18:41:55 UTC (rev 930)
@@ -43,18 +43,13 @@
</tag>
<tag>
- <name>wikiparam</name>
- <tagclass>org.jboss.forge.common.taglib.WikiParam</tagclass>
+ <name>wikiURL</name>
+ <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
<attribute>
- <name>name</name>
+ <name>project</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
</tag>
<tag>
Modified: trunk/forge/portal-extensions/forge-file-access/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-file-access/project.xml 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-file-access/project.xml 2005-08-23 18:41:55 UTC (rev 930)
@@ -51,4 +51,13 @@
<jar>activation.jar</jar>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*</include>
+ </resource>
+ </resources>
+ </build>
</project>
Added: trunk/forge/portal-extensions/forge-file-access/src/etc/mime-types.txt
===================================================================
--- trunk/forge/portal-extensions/forge-file-access/src/etc/mime-types.txt 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-file-access/src/etc/mime-types.txt 2005-08-23 18:41:55 UTC (rev 930)
@@ -0,0 +1,714 @@
+###############################################################################
+#
+# MIME-TYPES and the extensions that represent them
+#
+# This file is part of the "mime-support" package. Please send email (not a
+# bug report) to mim...@pa... if you would like new types
+# and/or extensions to be added.
+#
+# Users can add their own types if they wish by creating a ".mime.types"
+# file in their home directory. Definitions included there will take
+# precedence over those listed here.
+#
+# Note: Compression schemes like "gzip", "bzip", and "compress" are not
+# actually "mime-types". They are "encodings" and hence must _not_ have
+# entries in this file to map their extensions. The "mime-type" of an
+# encoded file refers to the type of data that has been encoded, not the
+# type of the encoding.
+#
+###############################################################################
+
+
+application/activemessage
+application/andrew-inset ez
+application/applefile
+application/atomicmail
+application/batch-SMTP
+application/beep+xml
+application/cals-1840
+application/commonground
+application/cu-seeme cu
+application/cybercash
+application/dca-rft
+application/dec-dx
+application/docbook+xml
+application/dsptype tsp
+application/dvcs
+application/edi-consent
+application/edi-x12
+application/edifact
+application/eshop
+application/font-tdpfr
+application/futuresplash spl
+application/ghostview
+application/hta hta
+application/http
+application/hyperstudio
+application/iges
+application/index
+application/index.cmd
+application/index.obj
+application/index.response
+application/index.vnd
+application/iotp
+application/ipp
+application/isup
+application/mac-binhex40 hqx
+application/mac-compactpro cpt
+application/macwriteii
+application/marc
+application/mathematica nb
+application/mathematica-old
+application/msaccess mdb
+application/msword doc dot
+application/news-message-id
+application/news-transmission
+application/ocsp-request
+application/ocsp-response
+application/octet-stream bin
+application/oda oda
+application/ogg ogg
+application/parityfec
+application/pdf pdf
+application/pgp-encrypted
+application/pgp-keys key
+application/pgp-signature pgp
+application/pics-rules prf
+application/pkcs10
+application/pkcs7-mime
+application/pkcs7-signature
+application/pkix-cert
+application/pkix-crl
+application/pkixcmp
+application/postscript ps ai eps
+application/prs.alvestrand.titrax-sheet
+application/prs.cww
+application/prs.nprend
+application/qsig
+application/rar rar
+application/rdf+xml rdf
+application/remote-printing
+application/riscos
+application/rss+xml rss
+application/rtf
+application/sdp
+application/set-payment
+application/set-payment-initiation
+application/set-registration
+application/set-registration-initiation
+application/sgml
+application/sgml-open-catalog
+application/sieve
+application/slate
+application/smil smi smil
+application/timestamp-query
+application/timestamp-reply
+application/vemmi
+application/whoispp-query
+application/whoispp-response
+application/wita
+application/wordperfect5.1 wp5
+application/x400-bp
+application/xhtml+xml xhtml xht
+application/xml xml xsl
+application/xml-dtd
+application/xml-external-parsed-entity
+application/zip zip
+application/vnd.3M.Post-it-Notes
+application/vnd.accpac.simply.aso
+application/vnd.accpac.simply.imp
+application/vnd.acucobol
+application/vnd.aether.imp
+application/vnd.anser-web-certificate-issue-initiation
+application/vnd.anser-web-funds-transfer-initiation
+application/vnd.audiograph
+application/vnd.bmi
+application/vnd.businessobjects
+application/vnd.canon-cpdl
+application/vnd.canon-lips
+application/vnd.cinderella cdy
+application/vnd.claymore
+application/vnd.commerce-battelle
+application/vnd.commonspace
+application/vnd.comsocaller
+application/vnd.contact.cmsg
+application/vnd.cosmocaller
+application/vnd.ctc-posml
+application/vnd.cups-postscript
+application/vnd.cups-raster
+application/vnd.cups-raw
+application/vnd.cybank
+application/vnd.dna
+application/vnd.dpgraph
+application/vnd.dxr
+application/vnd.ecdis-update
+application/vnd.ecowin.chart
+application/vnd.ecowin.filerequest
+application/vnd.ecowin.fileupdate
+application/vnd.ecowin.series
+application/vnd.ecowin.seriesrequest
+application/vnd.ecowin.seriesupdate
+application/vnd.enliven
+application/vnd.epson.esf
+application/vnd.epson.msf
+application/vnd.epson.quickanime
+application/vnd.epson.salt
+application/vnd.epson.ssf
+application/vnd.ericsson.quickcall
+application/vnd.eudora.data
+application/vnd.fdf
+application/vnd.ffsns
+application/vnd.flographit
+application/vnd.framemaker
+application/vnd.fsc.weblaunch
+application/vnd.fujitsu.oasys
+application/vnd.fujitsu.oasys2
+application/vnd.fujitsu.oasys3
+application/vnd.fujitsu.oasysgp
+application/vnd.fujitsu.oasysprs
+application/vnd.fujixerox.ddd
+application/vnd.fujixerox.docuworks
+application/vnd.fujixerox.docuworks.binder
+application/vnd.fut-misnet
+application/vnd.grafeq
+application/vnd.groove-account
+application/vnd.groove-identity-message
+application/vnd.groove-injector
+application/vnd.groove-tool-message
+application/vnd.groove-tool-template
+application/vnd.groove-vcard
+application/vnd.hhe.lesson-player
+application/vnd.hp-HPGL
+application/vnd.hp-PCL
+application/vnd.hp-PCLXL
+application/vnd.hp-hpid
+application/vnd.hp-hps
+application/vnd.httphone
+application/vnd.hzn-3d-crossword
+application/vnd.ibm.MiniPay
+application/vnd.ibm.afplinedata
+application/vnd.ibm.modcap
+application/vnd.informix-visionary
+application/vnd.intercon.formnet
+application/vnd.intertrust.digibox
+application/vnd.intertrust.nncp
+application/vnd.intu.qbo
+application/vnd.intu.qfx
+application/vnd.irepository.package+xml
+application/vnd.is-xpr
+application/vnd.japannet-directory-service
+application/vnd.japannet-jpnstore-wakeup
+application/vnd.japannet-payment-wakeup
+application/vnd.japannet-registration
+application/vnd.japannet-registration-wakeup
+application/vnd.japannet-setstore-wakeup
+application/vnd.japannet-verification
+application/vnd.japannet-verification-wakeup
+application/vnd.koan
+application/vnd.lotus-1-2-3
+application/vnd.lotus-approach
+application/vnd.lotus-freelance
+application/vnd.lotus-notes
+application/vnd.lotus-organizer
+application/vnd.lotus-screencam
+application/vnd.lotus-wordpro
+application/vnd.mcd
+application/vnd.mediastation.cdkey
+application/vnd.meridian-slingshot
+application/vnd.mif
+application/vnd.minisoft-hp3000-save
+application/vnd.mitsubishi.misty-guard.trustweb
+application/vnd.mobius.daf
+application/vnd.mobius.dis
+application/vnd.mobius.msl
+application/vnd.mobius.plc
+application/vnd.mobius.txf
+application/vnd.motorola.flexsuite
+application/vnd.motorola.flexsuite.adsi
+application/vnd.motorola.flexsuite.fis
+application/vnd.motorola.flexsuite.gotap
+application/vnd.motorola.flexsuite.kmr
+application/vnd.motorola.flexsuite.ttc
+application/vnd.motorola.flexsuite.wem
+application/vnd.mozilla.xul+xml xul
+application/vnd.ms-artgalry
+application/vnd.ms-asf
+application/vnd.ms-excel xls xlb xlt
+application/vnd.ms-lrm
+application/vnd.ms-pki.seccat cat
+application/vnd.ms-pki.stl stl
+application/vnd.ms-powerpoint ppt pps
+application/vnd.ms-project
+application/vnd.ms-tnef
+application/vnd.ms-works
+application/vnd.mseq
+application/vnd.msign
+application/vnd.music-niff
+application/vnd.musician
+application/vnd.netfpx
+application/vnd.noblenet-directory
+application/vnd.noblenet-sealer
+application/vnd.noblenet-web
+application/vnd.novadigm.EDM
+application/vnd.novadigm.EDX
+application/vnd.novadigm.EXT
+application/vnd.oasis.opendocument.chart odc
+application/vnd.oasis.opendocument.database odb
+application/vnd.oasis.opendocument.formula odf
+application/vnd.oasis.opendocument.graphics odg
+application/vnd.oasis.opendocument.graphics-template otg
+application/vnd.oasis.opendocument.image odi
+application/vnd.oasis.opendocument.presentation odp
+application/vnd.oasis.opendocument.presentation-template otp
+application/vnd.oasis.opendocument.spreadsheet ods
+application/vnd.oasis.opendocument.spreadsheet-template ots
+application/vnd.oasis.opendocument.text odt
+application/vnd.oasis.opendocument.text-master odm
+application/vnd.oasis.opendocument.text-template ott
+application/vnd.oasis.opendocument.text-web oth
+application/vnd.osa.netdeploy
+application/vnd.palm
+application/vnd.pg.format
+application/vnd.pg.osasli
+application/vnd.powerbuilder6
+application/vnd.powerbuilder6-s
+application/vnd.powerbuilder7
+application/vnd.powerbuilder7-s
+application/vnd.powerbuilder75
+application/vnd.powerbuilder75-s
+application/vnd.previewsystems.box
+application/vnd.publishare-delta-tree
+application/vnd.pvi.ptid1
+application/vnd.pwg-xhtml-print+xml
+application/vnd.rapid
+application/vnd.rim.cod cod
+application/vnd.s3sms
+application/vnd.seemail
+application/vnd.shana.informed.formdata
+application/vnd.shana.informed.formtemplate
+application/vnd.shana.informed.interchange
+application/vnd.shana.informed.package
+application/vnd.smaf mmf
+application/vnd.sss-cod
+application/vnd.sss-dtf
+application/vnd.sss-ntf
+application/vnd.stardivision.calc sdc
+application/vnd.stardivision.draw sda
+application/vnd.stardivision.impress sdd sdp
+application/vnd.stardivision.math smf
+application/vnd.stardivision.writer sdw vor
+application/vnd.stardivision.writer-global sgl
+application/vnd.street-stream
+application/vnd.sun.xml.calc sxc
+application/vnd.sun.xml.calc.template stc
+application/vnd.sun.xml.draw sxd
+application/vnd.sun.xml.draw.template std
+application/vnd.sun.xml.impress sxi
+application/vnd.sun.xml.impress.template sti
+application/vnd.sun.xml.math sxm
+application/vnd.sun.xml.writer sxw
+application/vnd.sun.xml.writer.global sxg
+application/vnd.sun.xml.writer.template stw
+application/vnd.svd
+application/vnd.swiftview-ics
+application/vnd.symbian.install sis
+application/vnd.triscape.mxs
+application/vnd.trueapp
+application/vnd.truedoc
+application/vnd.tve-trigger
+application/vnd.ufdl
+application/vnd.uplanet.alert
+application/vnd.uplanet.alert-wbxml
+application/vnd.uplanet.bearer-choice
+application/vnd.uplanet.bearer-choice-wbxml
+application/vnd.uplanet.cacheop
+application/vnd.uplanet.cacheop-wbxml
+application/vnd.uplanet.channel
+application/vnd.uplanet.channel-wbxml
+application/vnd.uplanet.list
+application/vnd.uplanet.list-wbxml
+application/vnd.uplanet.listcmd
+application/vnd.uplanet.listcmd-wbxml
+application/vnd.uplanet.signal
+application/vnd.vcx
+application/vnd.vectorworks
+application/vnd.vidsoft.vidconference
+application/vnd.visio vsd
+application/vnd.vividence.scriptfile
+application/vnd.wap.sic
+application/vnd.wap.slc
+application/vnd.wap.wbxml wbxml
+application/vnd.wap.wmlc wmlc
+application/vnd.wap.wmlscriptc wmlsc
+application/vnd.webturbo
+application/vnd.wrq-hp3000-labelled
+application/vnd.wt.stf
+application/vnd.xara
+application/vnd.xfdl
+application/vnd.yellowriver-custom-menu
+application/x-123 wk
+application/x-apple-diskimage dmg
+application/x-bcpio bcpio
+application/x-bittorrent torrent
+application/x-cdf cdf
+application/x-cdlink vcd
+application/x-chess-pgn pgn
+application/x-core
+application/x-cpio cpio
+application/x-csh csh
+application/x-debian-package deb
+application/x-director dcr dir dxr
+application/x-dms dms
+application/x-doom wad
+application/x-dvi dvi
+application/x-executable
+application/x-flac flac
+application/x-font pfa pfb gsf pcf pcf.Z
+application/x-futuresplash spl
+application/x-gnumeric gnumeric
+application/x-go-sgf sgf
+application/x-graphing-calculator gcf
+application/x-gtar gtar tgz taz
+application/x-hdf hdf
+application/x-httpd-php phtml pht php
+application/x-httpd-php-source phps
+application/x-httpd-php3 php3
+application/x-httpd-php3-preprocessed php3p
+application/x-httpd-php4 php4
+application/x-ica ica
+application/x-internet-signup ins isp
+application/x-iphone iii
+application/x-iso9660-image iso
+application/x-java-applet
+application/x-java-archive jar
+application/x-java-bean
+application/x-java-jnlp-file jnlp
+application/x-java-serialized-object ser
+application/x-java-vm class
+application/x-javascript js
+application/x-jmol jmz
+application/x-kchart chrt
+application/x-kdelnk
+application/x-killustrator kil
+application/x-koan skp skd skt skm
+application/x-kpresenter kpr kpt
+application/x-kspread ksp
+application/x-kword kwd kwt
+application/x-latex latex
+application/x-lha lha
+application/x-lzh lzh
+application/x-lzx lzx
+application/x-maker frm maker frame fm fb book fbdoc
+application/x-mif mif
+application/x-ms-wmd wmd
+application/x-ms-wmz wmz
+application/x-msdos-program com exe bat dll
+application/x-msi msi
+application/x-netcdf nc
+application/x-ns-proxy-autoconfig pac
+application/x-nwc nwc
+application/x-object o
+application/x-oz-application oza
+application/x-pkcs7-certreqresp p7r
+application/x-pkcs7-crl crl
+application/x-python-code pyc pyo
+application/x-quicktimeplayer qtl
+application/x-redhat-package-manager rpm
+application/x-rx
+application/x-sh sh
+application/x-shar shar
+application/x-shellscript
+application/x-shockwave-flash swf swfl
+application/x-stuffit sit
+application/x-sv4cpio sv4cpio
+application/x-sv4crc sv4crc
+application/x-tar tar
+application/x-tcl tcl
+application/x-tex-gf gf
+application/x-tex-pk pk
+application/x-texinfo texinfo texi
+application/x-trash ~ % bak old sik
+application/x-troff t tr roff
+application/x-troff-man man
+application/x-troff-me me
+application/x-troff-ms ms
+application/x-ustar ustar
+application/x-videolan
+application/x-wais-source src
+application/x-wingz wz
+application/x-x509-ca-cert crt
+application/x-xcf xcf
+application/x-xfig fig
+
+audio/32kadpcm
+audio/basic au snd
+audio/g.722.1
+audio/l16
+audio/midi mid midi kar
+audio/mp4a-latm
+audio/mpa-robust
+audio/mpeg mpga mpega mp2 mp3 m4a
+audio/mpegurl m3u
+audio/parityfec
+audio/prs.sid sid
+audio/telephone-event
+audio/tone
+audio/vnd.cisco.nse
+audio/vnd.cns.anp1
+audio/vnd.cns.inf1
+audio/vnd.digital-winds
+audio/vnd.everad.plj
+audio/vnd.lucent.voice
+audio/vnd.nortel.vbk
+audio/vnd.nuera.ecelp4800
+audio/vnd.nuera.ecelp7470
+audio/vnd.nuera.ecelp9600
+audio/vnd.octel.sbc
+audio/vnd.qcelp
+audio/vnd.rhetorex.32kadpcm
+audio/vnd.vmx.cvsd
+audio/x-aiff aif aiff aifc
+audio/x-gsm gsm
+audio/x-mpegurl m3u
+audio/x-ms-wma wma
+audio/x-ms-wax wax
+audio/x-pn-realaudio-plugin
+audio/x-pn-realaudio ra rm ram
+audio/x-realaudio ra
+audio/x-scpls pls
+audio/x-sd2 sd2
+audio/x-wav wav
+
+chemical/x-alchemy alc
+chemical/x-cache cac cache
+chemical/x-cache-csf csf
+chemical/x-cactvs-binary cbin cascii ctab
+chemical/x-cdx cdx
+chemical/x-cerius cer
+chemical/x-chem3d c3d
+chemical/x-chemdraw chm
+chemical/x-cif cif
+chemical/x-cmdf cmdf
+chemical/x-cml cml
+chemical/x-compass cpa
+chemical/x-crossfire bsd
+chemical/x-csml csml csm
+chemical/x-ctx ctx
+chemical/x-cxf cxf cef
+#chemical/x-daylight-smiles smi
+chemical/x-embl-dl-nucleotide emb embl
+chemical/x-galactic-spc spc
+chemical/x-gamess-input inp gam gamin
+chemical/x-gaussian-checkpoint fch fchk
+chemical/x-gaussian-cube cub
+chemical/x-gaussian-input gau gjc gjf
+chemical/x-gaussian-log gal
+chemical/x-gcg8-sequence gcg
+chemical/x-genbank gen
+chemical/x-hin hin
+chemical/x-isostar istr ist
+chemical/x-jcamp-dx jdx dx
+chemical/x-kinemage kin
+chemical/x-macmolecule mcm
+chemical/x-macromodel-input mmd mmod
+chemical/x-mdl-molfile mol
+chemical/x-mdl-rdfile rd
+chemical/x-mdl-rxnfile rxn
+chemical/x-mdl-sdfile sd sdf
+chemical/x-mdl-tgf tgf
+#chemical/x-mif mif
+chemical/x-mmcif mcif
+chemical/x-mol2 mol2
+chemical/x-molconn-Z b
+chemical/x-mopac-graph gpt
+chemical/x-mopac-input mop mopcrt mpc dat zmt
+chemical/x-mopac-out moo
+chemical/x-mopac-vib mvb
+chemical/x-ncbi-asn1 asn
+chemical/x-ncbi-asn1-ascii prt ent
+chemical/x-ncbi-asn1-binary val aso
+chemical/x-ncbi-asn1-spec asn
+chemical/x-pdb pdb ent
+chemical/x-rosdal ros
+chemical/x-swissprot sw
+chemical/x-vamas-iso14976 vms
+chemical/x-vmd vmd
+chemical/x-xtel xtel
+chemical/x-xyz xyz
+
+image/cgm
+image/g3fax
+image/gif gif
+image/ief ief
+image/jpeg jpeg jpg jpe
+image/naplps
+image/pcx pcx
+image/png png
+image/prs.btif
+image/prs.pti
+image/svg+xml svg svgz
+image/tiff tiff tif
+image/vnd.cns.inf2
+image/vnd.djvu djvu djv
+image/vnd.dwg
+image/vnd.dxf
+image/vnd.fastbidsheet
+image/vnd.fpx
+image/vnd.fst
+image/vnd.fujixerox.edmics-mmr
+image/vnd.fujixerox.edmics-rlc
+image/vnd.mix
+image/vnd.net-fpx
+image/vnd.svf
+image/vnd.wap.wbmp wbmp
+image/vnd.xiff
+image/x-cmu-raster ras
+image/x-coreldraw cdr
+image/x-coreldrawpattern pat
+image/x-coreldrawtemplate cdt
+image/x-corelphotopaint cpt
+image/x-icon ico
+image/x-jg art
+image/x-jng jng
+image/x-ms-bmp bmp
+image/x-photoshop psd
+image/x-portable-anymap pnm
+image/x-portable-bitmap pbm
+image/x-portable-graymap pgm
+image/x-portable-pixmap ppm
+image/x-rgb rgb
+image/x-xbitmap xbm
+image/x-xpixmap xpm
+image/x-xwindowdump xwd
+
+inode/chardevice
+inode/blockdevice
+inode/directory-locked
+inode/directory
+inode/fifo
+inode/socket
+
+message/delivery-status
+message/disposition-notification
+message/external-body
+message/http
+message/s-http
+message/news
+message/partial
+message/rfc822
+
+model/iges igs iges
+model/mesh msh mesh silo
+model/vnd.dwf
+model/vnd.flatland.3dml
+model/vnd.gdl
+model/vnd.gs-gdl
+model/vnd.gtw
+model/vnd.mts
+model/vnd.vtu
+model/vrml wrl vrml
+
+multipart/alternative
+multipart/appledouble
+multipart/byteranges
+multipart/digest
+multipart/encrypted
+multipart/form-data
+multipart/header-set
+multipart/mixed
+multipart/parallel
+multipart/related
+multipart/report
+multipart/signed
+multipart/voice-message
+
+text/calendar ics icz
+text/comma-separated-values csv
+text/css css
+text/directory
+text/english
+text/enriched
+text/h323 323
+text/html html htm shtml
+text/iuls uls
+text/mathml mml
+text/parityfec
+text/plain asc txt text diff pot
+text/prs.lines.tag
+text/rfc822-headers
+text/richtext rtx
+text/rtf rtf
+text/scriptlet sct wsc
+text/t140
+text/texmacs tm ts
+text/tab-separated-values tsv
+text/uri-list
+text/vnd.abc
+text/vnd.curl
+text/vnd.DMClientScript
+text/vnd.flatland.3dml
+text/vnd.fly
+text/vnd.fmi.flexstor
+text/vnd.in3d.3dml
+text/vnd.in3d.spot
+text/vnd.IPTC.NewsML
+text/vnd.IPTC.NITF
+text/vnd.latex-z
+text/vnd.motorola.reflex
+text/vnd.ms-mediapackage
+text/vnd.sun.j2me.app-descriptor jad
+text/vnd.wap.si
+text/vnd.wap.sl
+text/vnd.wap.wml wml
+text/vnd.wap.wmlscript wmls
+text/x-c++hdr h++ hpp hxx hh
+text/x-c++src c++ cpp cxx cc
+text/x-chdr h
+text/x-crontab
+text/x-csh csh
+text/x-csrc c
+text/x-java java
+text/x-makefile
+text/x-moc moc
+text/x-pascal p pas
+text/x-pcs-gcd gcd
+text/x-perl pl pm
+text/x-python py
+text/x-server-parsed-html
+text/x-setext etx
+text/x-sh sh
+text/x-tcl tcl tk
+text/x-tex tex ltx sty cls
+text/x-vcalendar vcs
+text/x-vcard vcf
+
+video/dl dl
+video/fli fli
+video/gl gl
+video/mpeg mpeg mpg mpe
+video/mp4 mp4
+video/quicktime qt mov
+video/mp4v-es
+video/parityfec
+video/pointer
+video/vnd.fvt
+video/vnd.motorola.video
+video/vnd.motorola.videop
+video/vnd.mpegurl mxu
+video/vnd.mts
+video/vnd.nokia.interleaved-multimedia
+video/vnd.vivo
+video/x-dv dif dv
+video/x-la-asf lsf lsx
+video/x-mng mng
+video/x-ms-asf asf asx
+video/x-ms-wm wm
+video/x-ms-wmv wmv
+video/x-ms-wmx wmx
+video/x-ms-wvx wvx
+video/x-msvideo avi
+video/x-sgi-movie movie
+
+x-conference/x-cooltalk ice
+
+x-world/x-vrml vrm vrml wrl
Modified: trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-08-23 18:41:55 UTC (rev 930)
@@ -64,7 +64,8 @@
forgeHelper = new ForgeHelper();
contentManager = forgeHelper.getContentManager("");
- mimeTypes = new MimetypesFileTypeMap();
+ mimeTypes = new MimetypesFileTypeMap(
+ FileAccessFilter.class.getResourceAsStream("/mime-types.txt"));
}
private void checkResource(String resource) throws Exception {
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-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld 2005-08-23 18:41:55 UTC (rev 930)
@@ -43,18 +43,13 @@
</tag>
<tag>
- <name>wikiparam</name>
- <tagclass>org.jboss.forge.common.taglib.WikiParam</tagclass>
+ <name>wikiURL</name>
+ <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
<attribute>
- <name>name</name>
+ <name>project</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
</tag>
<tag>
Property changes on: trunk/forge/portal-extensions/forge-portal-attr
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.settings
.project
Added: trunk/forge/portal-extensions/forge-portal-attr/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-23 18:41:55 UTC (rev 930)
@@ -0,0 +1,22 @@
+<!--
+ 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">
+ <goal name="all">
+ </goal>
+
+ <goal name="build">
+ <attainGoal name="jar" />
+ </goal>
+
+ <goal name="deploy">
+ <ant:copy todir="${local.deploy.dir}">
+ <ant:fileset dir="to-copy" />
+ </ant:copy>
+ <ant:copy
+ todir="${local.deploy.dir}/jboss-portal.sar/lib"
+ file="target/portal-attr-1.0.jar" />
+ </goal>
+</project>
Added: trunk/forge/portal-extensions/forge-portal-attr/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-portal-attr/project.xml 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-portal-attr/project.xml 2005-08-23 18:41:55 UTC (rev 930)
@@ -0,0 +1,37 @@
+<?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>
+ <id>portal-attr</id>
+ <name>Portal attributes</name>
+ <currentVersion>1.0</currentVersion>
+ <organization>
+ <name>Adam Warski</name>
+ <url>http://mamut.net.pl</url>
+ </organization>
+ <description></description>
+
+ <dependencies>
+ <dependency>
+ <groupId>aslibs</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>1.0</version>
+ <jar>javax.servlet.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.0</version>
+ <jar>activation.jar</jar>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java 2005-08-23 18:41:55 UTC (rev 930)
@@ -0,0 +1,53 @@
+package org.jboss.forge.portal;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+public class AttributesFilter implements Filter {
+ public void init(FilterConfig config) throws ServletException {
+
+ }
+
+ public void doFilter(ServletRequest request,
+ ServletResponse response, FilterChain chain)
+ throws IOException, ServletException {
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+
+ // Getting the request parameters.
+ String project = request.getParameter("project");
+ String noproject = request.getParameter("noproject");
+
+ if ("true".equals(noproject)) {
+ // Removing project from session info.
+ httpRequest.getSession().removeAttribute("project");
+ httpRequest.removeAttribute("project");
+ } else {
+ // If there is no project selected in the url, trying to
+ // read it from the session.
+ if (project == null)
+ project =
+ (String) httpRequest.getSession().getAttribute("project");
+
+ if (project != null) {
+ // Setting request and session attributes.
+ httpRequest.getSession().setAttribute("project", project);
+ httpRequest.setAttribute("project", project);
+ }
+ }
+ }
+
+ chain.doFilter(request, response);
+ }
+
+ public void destroy() {
+
+ }
+}
Added: trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2005-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2005-08-23 18:41:55 UTC (rev 930)
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <description>JBoss Portal</description>
+
+
+ <!-- The server manager located by the main servlet. -->
+ <context-param>
+ <param-name>org.jboss.portal.server#SERVER_MANAGER</param-name>
+ <param-value>portal:service=ServerManager</param-value>
+ </context-param>
+
+ <!-- Forge filter -->
+ <filter>
+ <filter-name>AttributesFilter</filter-name>
+ <filter-class>org.jboss.forge.portal.AttributesFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>AttributesFilter</filter-name>
+ <servlet-name>PortalServlet</servlet-name>
+ </filter-mapping>
+
+ <!-- The transaction filter start and stop a JTA transaction around the request. -->
+ <filter>
+ <filter-name>TransactionFilter</filter-name>
+ <filter-class>org.jboss.portal.core.servlet.TransactionFilter</filter-class>
+ </filter>
+
+ <!-- We wrap the portal request with a transaction -->
+ <filter-mapping>
+ <filter-name>TransactionFilter</filter-name>
+ <servlet-name>PortalServlet</servlet-name>
+ </filter-mapping>
+
+ <!-- The portal servlet is the main entrance point -->
+ <servlet>
+ <servlet-name>PortalServlet</servlet-name>
+ <servlet-class>org.jboss.portal.core.servlet.CoreServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ <security-role-ref>
+ <role-name>Authenticated</role-name>
+ <role-link>Authenticated</role-link>
+ </security-role-ref>
+ </servlet>
+
+ <!-- Provide access to unauthenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Provide secure access to unauthenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/sec/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Provide access to authenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/auth/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Provide secure access to authenticated users -->
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/authsec/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Force the mapping of the index.jsp -->
+ <servlet-mapping>
+ <servlet-name>jsp</servlet-name>
+ <url-pattern>/login.jsp</url-pattern>
+ </servlet-mapping>
+
+ <session-config>
+ <session-timeout>15</session-timeout>
+ </session-config>
+
+ <!--
+ | JDBC usage must be done with
+ | DataSource ds = (DataSource)ctx.lookup("java:comp/env/jdbc/PortalDS";
+ -->
+ <resource-ref>
+ <res-ref-name>jdbc/PortalDS</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Authenticated</web-resource-name>
+ <description></description>
+ <url-pattern>/auth/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Authenticated</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secure</web-resource-name>
+ <url-pattern>/sec/*</url-pattern>
+ </web-resource-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secure+Authenticated</web-resource-name>
+ <url-pattern>/authsec/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Authenticated</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
+ <!--
+ | Uncomment to use BASIC authentication scheme. Don't forget to comment other
+ | form authentication.
+ -->
+ <!--
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBoss Portal</realm-name>
+ </login-config>
+ -->
+
+ <!--
+ | Uncomment to use FORM authentication scheme. Don't forget to comment other
+ | form authentication.
+ -->
+ <!--
+ -->
+ <login-config>
+ <auth-method>FORM</auth-method>
+ <realm-name>JBoss Portal</realm-name>
+ <form-login-config>
+ <form-login-page>/login.jsp</form-login-page>
+ <form-error-page>/errorpages/wronglogin.html</form-error-page>
+ </form-login-config>
+ </login-config>
+
+ <security-role>
+ <role-name>Authenticated</role-name>
+ </security-role>
+</web-app>
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-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/tld/forge.tld 2005-08-23 18:41:55 UTC (rev 930)
@@ -43,18 +43,13 @@
</tag>
<tag>
- <name>wikiparam</name>
- <tagclass>org.jboss.forge.common.taglib.WikiParam</tagclass>
+ <name>wikiURL</name>
+ <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
<attribute>
- <name>name</name>
+ <name>project</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
</tag>
<tag>
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-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/forge.tld 2005-08-23 18:41:55 UTC (rev 930)
@@ -43,18 +43,13 @@
</tag>
<tag>
- <name>wikiparam</name>
- <tagclass>org.jboss.forge.common.taglib.WikiParam</tagclass>
+ <name>wikiURL</name>
+ <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
<attribute>
- <name>name</name>
+ <name>project</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
</tag>
<tag>
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-08-23 18:37:21 UTC (rev 929)
+++ trunk/forge/portal-extensions/portal-federation/src/web/WEB-INF/tld/forge.tld 2005-08-23 18:41:55 UTC (rev 930)
@@ -43,18 +43,13 @@
</tag>
<tag>
- <name>wikiparam</name>
- <tagclass>org.jboss.forge.common.taglib.WikiParam</tagclass>
+ <name>wikiURL</name>
+ <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
<attribute>
- <name>name</name>
+ <name>project</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
</tag>
<tag>
|
