Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jbo...@li...> - 2005-09-09 09:14:03
|
Author: mla...@jb...
Date: 2005-09-09 05:13:32 -0400 (Fri, 09 Sep 2005)
New Revision: 1059
Added:
trunk/labs/jbossweb/xdocs/reference/
trunk/labs/jbossweb/xdocs/reference/ch01.xml
trunk/labs/jbossweb/xdocs/reference/project.xml
trunk/labs/jbossweb/xdocs/sources/
trunk/labs/jbossweb/xdocs/sources/acceptflowchart.vsd
trunk/labs/jbossweb/xdocs/sources/jbosswebblockda.vsd
trunk/labs/jbossweb/xdocs/sources/tcnativeblockda.vsd
Modified:
trunk/labs/jbossweb/xdocs/build.xml
trunk/labs/jbossweb/xdocs/index.xml
trunk/labs/jbossweb/xdocs/project.xml
Log:
Add more stuff.
Modified: trunk/labs/jbossweb/xdocs/build.xml
===================================================================
--- trunk/labs/jbossweb/xdocs/build.xml 2005-09-08 21:07:16 UTC (rev 1058)
+++ trunk/labs/jbossweb/xdocs/build.xml 2005-09-09 09:13:32 UTC (rev 1059)
@@ -60,6 +60,25 @@
<param name="relative-path" expression="./.."/>
<param name="project-menu" expression="nomenu"/>
</style>
+ <style basedir="reference"
+ destdir="${build.dir}/${dist.name}/reference"
+ extension=".html"
+ style="style.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression=".."/>
+ </style>
+ <mkdir dir="${build.dir}/${dist.name}/reference/printer"/>
+ <style basedir="reference"
+ destdir="${build.dir}/${dist.name}/reference/printer"
+ extension=".html"
+ style="style.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression="../.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+
<!--
<style basedir="news"
destdir="${build.dir}/${dist.name}/news"
Modified: trunk/labs/jbossweb/xdocs/index.xml
===================================================================
--- trunk/labs/jbossweb/xdocs/index.xml 2005-09-08 21:07:16 UTC (rev 1058)
+++ trunk/labs/jbossweb/xdocs/index.xml 2005-09-09 09:13:32 UTC (rev 1059)
@@ -21,7 +21,25 @@
<p>Select one of the links from the navigation menu <code>(to the left)</code> to drill
down to the more detailed documentation that is available. Each available
manual is described in more detail below.</p>
+<br/>
+<p>
+JBoss Web Server is an enterprise ready web server designed for medium
+and large applications, based on the
+<a href="http://tomcat.apache.org">Apache Tomcat</a>. It is meant to
+be used as a replacement for the standard Web servers on all major
+platforms. JBoss Web Server provides organizations with a single
+deployment platform for Java Server Pages (JSP) and Java Servlet
+technologies, Microsoft .NET, PHP, and CGI. It uses a genuine high
+performance hybrid technology that incorporates the best of the most
+recent OS technologies for processing high volume data, while keeping
+all the reference Java specifications. It supports both in and out of
+the process execution of CGI and PHP scripts, and together with new
+AJP 1.4 protocol offers a scalable loadbalancing solutions for high
+availability applications. The hybrid technology model offers the best
+from threading and event processing models, and that makes the JBoss
+Web Server one of the fastest and most scalable web servers
+in the market.
+</p>
</section>
-
</body>
</document>
Modified: trunk/labs/jbossweb/xdocs/project.xml
===================================================================
--- trunk/labs/jbossweb/xdocs/project.xml 2005-09-08 21:07:16 UTC (rev 1058)
+++ trunk/labs/jbossweb/xdocs/project.xml 2005-09-09 09:13:32 UTC (rev 1059)
@@ -8,5 +8,8 @@
<menu name="JBossWeb">
<item name="Overview" href="index.html"/>
</menu>
+ <menu name="Reference">
+ <item name="Architecture" href="reference/ch01.html"/>
+ </menu>
</body>
</project>
Added: trunk/labs/jbossweb/xdocs/reference/ch01.xml
===================================================================
--- trunk/labs/jbossweb/xdocs/reference/ch01.xml 2005-09-08 21:07:16 UTC (rev 1058)
+++ trunk/labs/jbossweb/xdocs/reference/ch01.xml 2005-09-09 09:13:32 UTC (rev 1059)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE document [
+ <!ENTITY project SYSTEM "project.xml">
+]>
+<document url="ch01.html">
+
+ &project;
+
+ <properties>
+ <author email="mla...@jb...">Mladen Turk</author>
+ <title>Architecture</title>
+ </properties>
+
+<body>
+
+<section name="Design">
+ <p>JBoss Web Server is based on the
+ <a href="http://tomcat.apache.org">Apache Tomcat</a>.
+ </p>
+ <figure src="/images/design/jbosswebblockda.png" name="Figure 1" text="JBossWeb architecture"/>
+</section>
+</body>
+</document>
Added: trunk/labs/jbossweb/xdocs/reference/project.xml
===================================================================
--- trunk/labs/jbossweb/xdocs/reference/project.xml 2005-09-08 21:07:16 UTC (rev 1058)
+++ trunk/labs/jbossweb/xdocs/reference/project.xml 2005-09-09 09:13:32 UTC (rev 1059)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="JBossWeb Documentation - Top Level Directory"
+ href="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.freezone&project=jbossweb&page=index.html">
+ <title>JBossWeb</title>
+ <logo href="/images/jbossweblogo.gif">JBossWeb @ JBoss labs</logo>
+<body>
+
+ <menu name="JBossWeb">
+ <item name="Overview" href="../index.html"/>
+ </menu>
+ <menu name="Architecture">
+ <item name="Overview" href="ch01.html"/>
+ </menu>
+</body>
+</project>
Added: trunk/labs/jbossweb/xdocs/sources/acceptflowchart.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/labs/jbossweb/xdocs/sources/acceptflowchart.vsd
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/labs/jbossweb/xdocs/sources/jbosswebblockda.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/labs/jbossweb/xdocs/sources/jbosswebblockda.vsd
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/labs/jbossweb/xdocs/sources/tcnativeblockda.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/labs/jbossweb/xdocs/sources/tcnativeblockda.vsd
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
|
From: <jbo...@li...> - 2005-09-08 11:19:19
|
Author: mla...@jb... Date: 2005-09-08 07:19:10 -0400 (Thu, 08 Sep 2005) New Revision: 1057 Added: trunk/labs/jbossweb/native/ trunk/labs/jbossweb/native/NMAKEmakefile trunk/labs/jbossweb/native/build/ trunk/labs/jbossweb/native/build/NMAKEcommon.inc trunk/labs/jbossweb/native/srclib/ trunk/labs/jbossweb/native/srclib/VERSIONS trunk/labs/jbossweb/native/srclib/apr/ trunk/labs/jbossweb/native/srclib/apr/NMAKEmakefile Log: Added native build scripts Added: trunk/labs/jbossweb/native/NMAKEmakefile =================================================================== --- trunk/labs/jbossweb/native/NMAKEmakefile 2005-09-08 08:34:58 UTC (rev 1056) +++ trunk/labs/jbossweb/native/NMAKEmakefile 2005-09-08 11:19:10 UTC (rev 1057) @@ -0,0 +1,122 @@ +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master Tomcat Native makefile. +# Usage: +# STATIC=1 Use static version of the APR +# DEBUG=1 Build DEBUG version of TCN +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +TARGET = DLL +!IFDEF STATIC +BUILDIR_EXT = LIB +CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS) +PROJECT = tcnative-1 +APR_LIB = apr-1.lib +!ELSE +BUILDIR_EXT = DLL +PROJECT = libtcnative-1 +APR_LIB = libapr-1.lib +!ENDIF +!include <build/NMAKEcommon.inc> + +CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2 -DOPENSSL_NO_IDEA \ + -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DHAVE_OPENSSL -DHAVE_SSL_SET_STATE=1 + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES) + +!IFNDEF WITH_APR +WITH_APR = ../apr +!ENDIF +!IFNDEF WITH_OPENSSL +WITH_OPENSSL = ../openssl +!ENDIF +!IFNDEF WITH_ZLIB +WITH_ZLIB = ../srclib/zlib +!ENDIF + +INCLUDES = $(INCLUDES) -I$(WITH_APR)/include -I$(WITH_APR)/include/arch/win32 -I$(WITH_OPENSSL)/inc32 -I$(WITH_ZLIB) +LDIRS = /libpath:"$(WITH_APR)/$(BUILDIR)" /libpath:"$(WITH_ZLIB)/$(BUILDIR)" + +LFLAGS = $(LFLAGS) $(APR_LIB) $(ZLIB_LIB) libeay32.lib ssleay32.lib +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib + +!IFDEF STATIC +LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)/out32" /libpath:"$(WITH_OPENSSL)/out32dll" +!ELSE +LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)/out32dll" +!ENDIF + +PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src +OBJECTS = \ + $(BUILDIR)\dir.obj \ + $(BUILDIR)\error.obj \ + $(BUILDIR)\file.obj \ + $(BUILDIR)\info.obj \ + $(BUILDIR)\jnilib.obj \ + $(BUILDIR)\lock.obj \ + $(BUILDIR)\misc.obj \ + $(BUILDIR)\mmap.obj \ + $(BUILDIR)\network.obj \ + $(BUILDIR)\os.obj \ + $(BUILDIR)\poll.obj \ + $(BUILDIR)\pool.obj \ + $(BUILDIR)\proc.obj \ + $(BUILDIR)\shm.obj \ + $(BUILDIR)\ssl.obj \ + $(BUILDIR)\sslcontext.obj \ + $(BUILDIR)\sslinfo.obj \ + $(BUILDIR)\sslnetwork.obj \ + $(BUILDIR)\sslutils.obj \ + $(BUILDIR)\stdlib.obj \ + $(BUILDIR)\user.obj \ + $(BUILDIR)\ntpipe.obj \ + $(BUILDIR)\system.obj + +BUILDLIB = $(BUILDIR)\$(PROJECT).dll +BUILDPDB = $(BUILDIR)\$(PROJECT).pdb +BUILDRES = $(BUILDIR)\$(PROJECT).res + +all : $(BUILDIR) $(BUILDLIB) + +$(BUILDIR) : + @$(MAKETARGET) + +{$(SRCDIR)/src}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/os/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)/include/*.h + +$(BUILDRES): $(SRCDIR)/os/win32/libtcnative.rc $(SRCDIR)/include/*.h + $(RC) $(RCFLAGS) /i "$(SRCDIR)/include" /fo $(BUILDRES) $(SRCDIR)/os/win32/libtcnative.rc + +$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDLIB) + +clean: + @$(CLEANTARGET) Added: trunk/labs/jbossweb/native/build/NMAKEcommon.inc =================================================================== --- trunk/labs/jbossweb/native/build/NMAKEcommon.inc 2005-09-08 08:34:58 UTC (rev 1056) +++ trunk/labs/jbossweb/native/build/NMAKEcommon.inc 2005-09-08 11:19:10 UTC (rev 1057) @@ -0,0 +1,264 @@ +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEcommon.inc Master makefile definitions. +# This file defines CPU architecture and basic compiler +# and linker parameters. +# Common params: +# CPU Compile for specified CPU. Supported CPU's are: +# i386 +# AMD64 +# IA64 +# If not specified it will default to the +# PROCESSOR_ARCHITECTURE environment variable +# or to the i386 if not specified. +# WINVER Compile for specified Windows version +# WINNT for Windows 2000 and up(default) +# WINXP for Windows XP and up +# WIN2003 for Windows 2003 and up +# Deprecated targets (may not even compile): +# NT4 for Windows NT4 and up +# WIN9X for Windows 95, 98 and Me +# BUILD Build version +# RETAIL or RELEASE (default) +# DEBUG +# TARGET Build application target +# EXE Console executable (default) +# GUI Windows GUI executable +# DLL Dynamic Link Library +# LIB Static library +# Environment variables used: +# CFLAGS Added to the common CFLAGS +# CPPFLAGS Added to the common CPPFLAGS +# LIBS Added to the common LIBS +# INCLUDES Added to the common INCLUDES +# LFLAGS Added to the common LFLAGS +# RCFLAGS Added to the common RCFLAGS +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +!IF !DEFINED(CC) || "$(CC)" == "" +CC = cl.exe +!ENDIF + +!IF !DEFINED(LINK) || "$(LINK)" == "" +LINK = link.exe +!ENDIF + +!IF !DEFINED(RC) || "$(RC)" == "" +RC = rc.exe +!ENDIF + +# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type + +!IF !DEFINED(CPU) || "$(CPU)" == "" +!IF "$(PROCESSOR_ARCHITECTURE)" == "" +CPU=I386 +!ELSE +CPU = $(PROCESSOR_ARCHITECTURE) +!ENDIF +!ENDIF + +!IF "$(CPU)" == "i386" || "$(CPU)" == "x86" +CPU=I386 +!ENDIF + +!IF "$(CPU)" != "I386" +!IF "$(CPU)" != "AMD64" +!IF "$(CPU)" != "IA64" +!ERROR Must specify CPU environment variable (I386, AMD64, IA64) +!ENDIF +!ENDIF +!ENDIF + +!IF !DEFINED(TARGET) || "$(TARGET)" == "" +TARGET=EXE +!ENDIF + +!IF "$(TARGET)" != "EXE" +!IF "$(TARGET)" != "GUI" +!IF "$(TARGET)" != "DLL" +!IF "$(TARGET)" != "LIB" +!ERROR Must specify TARGET environment variable (EXE, GUI, DLL, LIB) +!ENDIF +!ENDIF +!ENDIF +!ENDIF + +!IF !DEFINED(WINVER) || "$(WINVER)" == "" +WINVER=WINNT +!ENDIF + + +!IF "$(WINVER)" != "WINNT" +!IF "$(WINVER)" != "WINXP" +!IF "$(WINVER)" != "WIN2003" +!IF "$(WINVER)" != "NT4" +!IF "$(WINVER)" != "WIN9X" +!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, NT4, WIN9X) +!ENDIF +!ENDIF +!ENDIF +!ENDIF +!ENDIF + +!IF "$(WINVER)" == "WINNT" +NMAKE_WINVER = 0x0500 +!ELSEIF "$(WINVER)" == "WINXP" +NMAKE_WINVER = 0x0501 +!ELSEIF "$(WINVER)" == "WIN2003" +NMAKE_WINVER = 0x0502 +!ELSEIF "$(WINVER)" == "NT4" +NMAKE_WINVER = 0x0400 +!ENDIF + +!IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == "" +NMAKE_WINVER = 0x0400 +NMAKE_WINNT = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) +!ELSE +NMAKE_WINNT = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) +!ENDIF + +!IF !DEFINED(BUILD) || "$(BUILD)" == "" +BUILD=RELEASE +!ENDIF + +!IFDEF RELEASE +BUILD=RELEASE +!ENDIF + +!IFDEF DEBUG +BUILD=DEBUG +!ENDIF + +!IFDEF NODEBUG +BUILD=RELEASE +!ENDIF + +!IF "$(BUILD)" != "RELEASE" +!IF "$(BUILD)" != "DEBUG" +!ERROR Must specify BUILD environment variable (RELEASE, DEBUG) +!ENDIF +!ENDIF + +# Common flags for all platforms +CMN_CFLAGS = -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT) + +!IF "$(CPU)" == "I386" +CPU_CFLAGS = -D_X86_=1 -W3 +!ELSEIF "$(CPU)" == "AMD64" +CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 /FIPRE64PRA.H +!ELSEIF "$(CPU)" == "IA64" +CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 -Ap64 /FIPRE64PRA.H +!ENDIF + +!IF "$(BUILD)" == "RELEASE" +OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG +!ELSE +OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG +!ENDIF + +!IF DEFINED(STATIC_CRT) +CRT_CFLAGS = -D_MT -MT +!ELSE +CRT_CFLAGS = -D_MT -MD +!ENDIF + +!IF "$(BUILD)" == "DEBUG" +CRT_CFLAGS = $(CRT_CFLAGS)d +!ENDIF + +CFLAGS = $(CMN_CFLAGS) $(CPU_CFLAGS) $(OPT_CFLAGS) $(CRT_CFLAGS) $(CFLAGS) + +!IF DEFINED(EXTRA_CFLAGS) +CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) +!ENDIF + + +# Linker section +LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib $(LIBS) +!IF "$(CPU)" == "AMD64" || "$(CPU)" == "IA64" +LIBS = $(LIBS) bufferoverflowu.lib +!ENDIF + +!IF DEFINED(EXTRA_LIBS) +LIBS = $(LIBS) $(EXTRA_LIBS) +!ENDIF + +COMMON_LFLAGS = /NOLOGO + +# Always add debugging to the linker +OPT_LFLAGS = /INCREMENTAL:NO /DEBUG +!IF "$(BUILD)" == "RELEASE" +OPT_LFLAGS = /OPT:REF +!ENDIF + +!IF "$(TARGET)" == "EXE" +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "GUI" +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "DLL" +LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "LIB" +LFLAGS = -lib $(COMMON_LFLAGS) +!ENDIF + +!IF DEFINED(EXTRA_LFLAGS) +LFLAGS = $(LFLAGS) $(EXTRA_LFLAGS) +!ENDIF + +!IF "$(TARGET)" != "LIB" +LFLAGS = $(LFLAGS) $(OPT_LFLAGS) +!ENDIF + +# Resource compiler flags + +BASE_RCFLAGS=/l 0x409 +!IF "$(BUILD)" == "RELEASE" +BASE_RCFLAGS = $(BASE_RCFLAGS) /d "NDEBUG" +!ELSE +BASE_RCFLAGS = $(BASE_RCFLAGS) /d "_DEBUG" /d "DEBUG" +!ENDIF +RCFLAGS = $(BASE_RCFLAGS) $(RCFLAGS) + +# Build Target dir e.g. WINNT_I386_RELEASE_DLL +!IF !DEFINED(BUILDIR) || "$(BUILDIR)" == "" +!IF !DEFINED(BUILDIR_EXT) || "$(BUILDIR_EXT)" == "" +BUILDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD) +!ELSE +BUILDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD) +!ENDIF +!ENDIF + +!IF "$(OS)" == "Windows_NT" +CLEANTARGET=if exist "$(BUILDIR)/$(NULL)" rd /s /q $(BUILDIR) +!ELSE +CLEANTARGET=deltree /y $(BUILDIR) +!ENDIF + +MAKETARGET=if not exist "$(BUILDIR)/$(NULL)" mkdir $(BUILDIR) + +!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != "" +JAVA_INCLUDES=-I "$(JAVA_HOME)/include" +!IF "$(CPU)" != "I386" +JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win64" +!ENDIF +JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win32" +!ENDIF Added: trunk/labs/jbossweb/native/srclib/VERSIONS =================================================================== --- trunk/labs/jbossweb/native/srclib/VERSIONS 2005-09-08 08:34:58 UTC (rev 1056) +++ trunk/labs/jbossweb/native/srclib/VERSIONS 2005-09-08 11:19:10 UTC (rev 1057) @@ -0,0 +1,8 @@ +$Id: VERSIONS,v 1.0 2004/01/05 08:49:37 mturk Exp $ + +Use the following version of the libraries + +- APR 1.2.0, http://apr.apache.org +- OpenSSL 0.9.8, http://www.openssl.org +- Zlib 1.2.3, http://www.zlib.net +- Bzip2 1.0.3, http://www.bzip.org Added: trunk/labs/jbossweb/native/srclib/apr/NMAKEmakefile =================================================================== --- trunk/labs/jbossweb/native/srclib/apr/NMAKEmakefile 2005-09-08 08:34:58 UTC (rev 1056) +++ trunk/labs/jbossweb/native/srclib/apr/NMAKEmakefile 2005-09-08 11:19:10 UTC (rev 1057) @@ -0,0 +1,210 @@ +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master APR makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of APR +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +!IFDEF DLL +CFLAGS = -DAPR_DECLARE_EXPORT $(CFLAGS) +TARGET = DLL +PROJECT = libapr-1 +!ELSE +CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS) +TARGET = LIB +PROJECT = apr-1 +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <../build/NMAKEcommon.inc> + +INCLUDES = -I$(SRCDIR)/include -I$(SRCDIR)/include/arch -I$(SRCDIR)/include/arch/win32 -I$(SRCDIR)/include/arch/unix +PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src +OBJECTS = \ + $(BUILDIR)\apr_atomic.obj \ + $(BUILDIR)\dso.obj \ + $(BUILDIR)\copy.obj \ + $(BUILDIR)\dir.obj \ + $(BUILDIR)\fileacc.obj \ + $(BUILDIR)\filedup.obj \ + $(BUILDIR)\filepath.obj \ + $(BUILDIR)\filepath_util.obj \ + $(BUILDIR)\filestat.obj \ + $(BUILDIR)\filesys.obj \ + $(BUILDIR)\flock.obj \ + $(BUILDIR)\fullrw.obj \ + $(BUILDIR)\mktemp.obj \ + $(BUILDIR)\open.obj \ + $(BUILDIR)\pipe.obj \ + $(BUILDIR)\readwrite.obj \ + $(BUILDIR)\seek.obj \ + $(BUILDIR)\tempdir.obj \ + $(BUILDIR)\proc_mutex.obj \ + $(BUILDIR)\thread_cond.obj \ + $(BUILDIR)\thread_mutex.obj \ + $(BUILDIR)\thread_rwlock.obj \ + $(BUILDIR)\apr_pools.obj \ + $(BUILDIR)\charset.obj \ + $(BUILDIR)\env.obj \ + $(BUILDIR)\errorcodes.obj \ + $(BUILDIR)\getopt.obj \ + $(BUILDIR)\internal.obj \ + $(BUILDIR)\misc.obj \ + $(BUILDIR)\otherchild.obj \ + $(BUILDIR)\rand.obj \ + $(BUILDIR)\start.obj \ + $(BUILDIR)\utf8.obj \ + $(BUILDIR)\version.obj \ + $(BUILDIR)\common.obj \ + $(BUILDIR)\mmap.obj \ + $(BUILDIR)\inet_ntop.obj \ + $(BUILDIR)\inet_pton.obj \ + $(BUILDIR)\select.obj \ + $(BUILDIR)\multicast.obj \ + $(BUILDIR)\sendrecv.obj \ + $(BUILDIR)\sockaddr.obj \ + $(BUILDIR)\sockets.obj \ + $(BUILDIR)\sockopt.obj \ + $(BUILDIR)\apr_getpass.obj \ + $(BUILDIR)\apr_random.obj \ + $(BUILDIR)\sha2.obj \ + $(BUILDIR)\sha2_glue.obj \ + $(BUILDIR)\shm.obj \ + $(BUILDIR)\apr_cpystrn.obj \ + $(BUILDIR)\apr_fnmatch.obj \ + $(BUILDIR)\apr_snprintf.obj \ + $(BUILDIR)\apr_strings.obj \ + $(BUILDIR)\apr_strnatcmp.obj \ + $(BUILDIR)\apr_strtok.obj \ + $(BUILDIR)\apr_hash.obj \ + $(BUILDIR)\apr_tables.obj \ + $(BUILDIR)\proc.obj \ + $(BUILDIR)\signals.obj \ + $(BUILDIR)\thread.obj \ + $(BUILDIR)\threadpriv.obj \ + $(BUILDIR)\access.obj \ + $(BUILDIR)\time.obj \ + $(BUILDIR)\timestr.obj \ + $(BUILDIR)\groupinfo.obj \ + $(BUILDIR)\userinfo.obj + + +!IFDEF DLL +BUILDLIB = $(BUILDIR)\$(PROJECT).dll +BUILDPDB = $(BUILDIR)\$(PROJECT).pdb +BUILDRES = $(BUILDIR)\$(PROJECT).res +!ELSE +BUILDLIB = $(BUILDIR)\$(PROJECT).lib +!ENDIF + +all : $(BUILDIR) $(BUILDLIB) + +$(BUILDIR) : + @$(MAKETARGET) + +$(SRCDIR)/include/apr.h: $(SRCDIR)/include/apr.hw + <<nmaketmp.bat + @echo off + @type $(SRCDIR)\include\apr.hw > $(SRCDIR)\include\apr.h +<< + +{$(SRCDIR)/atomic/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/dso/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/file_io/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/file_io/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/locks/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/memory/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/misc/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/misc/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/mmap/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/mmap/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/network_io/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/network_io/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/passwd}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/poll/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/random/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/shmem/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/strings}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/tables}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/threadproc/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/time/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/user/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)/include/*.h $(SRCDIR)/include/arch/*.h $(SRCDIR)/include/arch/win32/*.h $(SRCDIR)/include/arch/unix/*.h + +!IFDEF DLL +$(BUILDRES): libapr.rc $(SRCDIR)/include/*.h + $(RC) $(RCFLAGS) /i "$(SRCDIR)/include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc +$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDLIB) +!ELSE +$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDLIB) +!ENDIF + +clean: + @$(CLEANTARGET) |
|
From: <jbo...@li...> - 2005-09-08 08:35:14
|
Author: mla...@jb...
Date: 2005-09-08 04:34:58 -0400 (Thu, 08 Sep 2005)
New Revision: 1056
Modified:
trunk/labs/jbossweb/xdocs/style.css
trunk/labs/jbossweb/xdocs/style.xsl
Log:
Add figure element for embedded documentation images
Modified: trunk/labs/jbossweb/xdocs/style.css
===================================================================
--- trunk/labs/jbossweb/xdocs/style.css 2005-09-08 03:58:49 UTC (rev 1055)
+++ trunk/labs/jbossweb/xdocs/style.css 2005-09-08 08:34:58 UTC (rev 1056)
@@ -199,3 +199,13 @@
background-color: #000000;
text-align: left;
}
+
+td.figure {
+ background-color: #ffffff;
+ color: #000000;
+ font-family: Andale Mono, Courier New, Courier, monospace;
+ font-weight: normal;
+ font-style: italic;
+ font-size: 0.8em;
+ text-align: justify;
+}
Modified: trunk/labs/jbossweb/xdocs/style.xsl
===================================================================
--- trunk/labs/jbossweb/xdocs/style.xsl 2005-09-08 03:58:49 UTC (rev 1055)
+++ trunk/labs/jbossweb/xdocs/style.xsl 2005-09-08 08:34:58 UTC (rev 1056)
@@ -170,6 +170,19 @@
<li><a href="{$href}"><xsl:value-of select="@name"/></a></li>
</xsl:template>
+ <!-- Process a figure -->
+ <xsl:template match="figure">
+ <xsl:variable name="src">
+ <xsl:value-of select="$relative-path"/><xsl:value-of select="@src"/>
+ </xsl:variable>
+ <xsl:variable name="name">
+ <xsl:value-of select="@name"/>
+ </xsl:variable>
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr><td><img src="{$src}" alt="{$name}" border="0"/></td></tr>
+ <tr><td class="figure"><xsl:value-of select="@name"/>. <xsl:value-of select="@text"/></td></tr>
+ </table>
+ </xsl:template>
<!-- Process a documentation section -->
<xsl:template match="section">
|
Author: adamw
Date: 2005-09-07 08:15:47 -0400 (Wed, 07 Sep 2005)
New Revision: 1052
Added:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/AbstractRequestPermissionChecker.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/NullPermissionsChecker.java
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/FilesFromRepoFilter.java
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/BlogUpdaterNodeWatcher.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.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/Projects.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.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/projects/elements/BindingsHandler.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerEmpty.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerIterSingleKey.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerStack.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/OutsidePropertiesMap.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesElementValue.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandler.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerDefault.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerMultiValue.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerStack.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/ActionRequestPermissionsChecker.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/PermissionsChecker.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/RenderRequestPermissionsChecker.java
trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDescriptor.java
trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java
trunk/forge/portal-extensions/forge-forums/scripts/conv.sql
trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
trunk/forge/portal-extensions/forge-map/src/java/org/jboss/forge/softwaremap/SoftwareMap.java
trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java
trunk/forge/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java
trunk/forge/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java
Log:
JBLAB-379 and JBLAB-380: cleanup & permissions checking
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/FilesFromRepoFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/FilesFromRepoFilter.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/FilesFromRepoFilter.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -52,13 +52,10 @@
private ContentManager contentReader;
- private ForgeHelper forgeHelper;
-
public void init(FilterConfig conf) {
- forgeHelper = new ForgeHelper();
separator = '/';
repoAccessDirLength = ForgeHelper.REPO_ACCESS_DIR.length();
- contentReader = forgeHelper.getContentManager("");
+ contentReader = ForgeHelper.getContentManager("");
// Constructing the base path.
basePath = conf.getServletContext().getRealPath("") + separator
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-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -71,9 +71,9 @@
*/
public final static String FREEZONE_SEPARATOR = "+";
- private ForgeProperties props;
+ private static ForgeProperties props;
- public ForgeHelper() {
+ static {
// Reading forge properties.
props = new ForgeProperties();
forgeManagement = null;
@@ -84,14 +84,14 @@
* instance. This variable is filled with the correct value on first
* call.
*/
- private ForgeManagement forgeManagement;
+ private static ForgeManagement forgeManagement;
/**
* Gets an instance of the ForgeManagement class. It is looked up as a
* mbean, if this is the first invocation of this function.
* @return An instance of the ForgeManagement class.
*/
- public ForgeManagement getForgeManagement() {
+ public static ForgeManagement getForgeManagement() {
try {
if (forgeManagement == null)
forgeManagement = (ForgeManagement) MBeanProxyExt.create(
@@ -137,7 +137,7 @@
* <code>prefix</code>-relative.
* @return An instance of a ready-to-use content manager.
*/
- public ContentManager getContentManager(String prefix) {
+ public static ContentManager getContentManager(String prefix) {
return new SvnContentManager(props.getSvnPath() + prefix,
props.getLocalPath() + prefix,
props.getSvnUsername(), props.getSvnPassword());
@@ -148,7 +148,7 @@
* resources. It is root-relative.
* @return An instance of a ready-to-use content manager.
*/
- public ContentManager getContentManager() {
+ public static ContentManager getContentManager() {
return getContentManager("");
}
@@ -162,7 +162,7 @@
* Resource we want to access.
* @return A repository-access path.
*/
- public String createRepoAccessPath(String portalName, String resource) {
+ public static String createRepoAccessPath(String portalName, String resource) {
return "/" + ForgeHelper.REPO_ACCESS_DIR + "/" + portalName + "/"
+ resource;
}
@@ -177,7 +177,7 @@
* Resource we want to access.
* @return A repository-access path.
*/
- public String createRepoAccessPath(JBossRenderRequest request,
+ public static String createRepoAccessPath(JBossRenderRequest request,
String resource) {
PortalContext portalCtx = request.getPortalContext();
String portalName = portalCtx
@@ -265,7 +265,7 @@
* Content reader to use.
* @return An initialized instance of the BlogUpdater class.
*/
- public BlogUpdater getBlogUpdater(ContentManager cm) {
+ public static BlogUpdater getBlogUpdater(ContentManager cm) {
return new BlogUpdater(cm, props.getBlogPath());
}
@@ -282,11 +282,11 @@
* Address of this message's author.
* @throws MessagingException
*/
- public void postMail(String recipient, String subject, String message,
+ public static void postMail(String recipient, String subject, String message,
String from) throws MessagingException {
// Set the host smtp address
Properties props = new Properties();
- props.put("mail.smtp.host", this.props.getSmtpServer());
+ props.put("mail.smtp.host", ForgeHelper.props.getSmtpServer());
// Create some properties and get the default Session
Session session = Session.getDefaultInstance(props, null);
@@ -313,7 +313,7 @@
* Gets an instance of read ForgeProperties.
* @return An instance of read ForgeProperties.
*/
- public ForgeProperties getForgeProperties() {
+ public static ForgeProperties getForgeProperties() {
return props;
}
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-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -45,15 +45,11 @@
/** The class logger */
public static final Logger log = Logger.getLogger(JBossPortlet.class);
- private ForgeHelper forgeHelper;
-
/**
* Init method of the portlet
*/
public void init() throws PortletException {
super.init();
-
- forgeHelper = new ForgeHelper();
}
/**
@@ -137,11 +133,11 @@
String cacheKey = AbstractBlog.class.getName()+"/"+projectId;
- SyndFeed feed = (SyndFeed) forgeHelper.getForgeManagement().getFromCache(
+ SyndFeed feed = (SyndFeed) ForgeHelper.getForgeManagement().getFromCache(
portalName, cacheKey);
if (feed == null) {
- feed = (SyndFeed) forgeHelper.getForgeManagement().
+ feed = (SyndFeed) ForgeHelper.getForgeManagement().
addNodeWatcher(portalName, cacheKey,
new BlogNodeWatcher(feedAddress));
}
@@ -176,7 +172,7 @@
projectId, portalName, feedTypeFreeAddress);
ProjectsHelper.prepareRequest(request);
- writePage(request, response, forgeHelper.createRepoAccessPath(
+ writePage(request, response, ForgeHelper.createRepoAccessPath(
portalName, getJsp()));
response.setTitle("Blog");
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogUpdaterNodeWatcher.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogUpdaterNodeWatcher.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogUpdaterNodeWatcher.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -8,8 +8,7 @@
public Object init(String portalName) {
// Initializing blog updater.
- ForgeHelper fh = new ForgeHelper();
- bu = fh.getBlogUpdater(fh.getContentManager());
+ bu = ForgeHelper.getBlogUpdater(ForgeHelper.getContentManager());
// Dummy object.
return new Object();
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -36,8 +36,6 @@
protected ContentManager cm;
- protected ForgeHelper forgeHelper;
-
/**
* Gets the suffix to use in the content reader.
*
@@ -56,8 +54,7 @@
public ContentPortlet(String title, String id) {
this.title = title;
this.id = id;
- this.forgeHelper = new ForgeHelper();
- this.cm = forgeHelper.getContentManager(getContentReaderSuffix());
+ this.cm = ForgeHelper.getContentManager(getContentReaderSuffix());
}
public void init() {
@@ -234,11 +231,11 @@
&& (!javax.portlet.WindowState.MAXIMIZED.equals(ws)))
return;
- content = forgeHelper.getForgeManagement().getFromCache(portalName,
+ content = ForgeHelper.getForgeManagement().getFromCache(portalName,
cacheKey);
if (content == null)
- content = forgeHelper.getForgeManagement().addNodeWatcher(
+ content = ForgeHelper.getForgeManagement().addNodeWatcher(
portalName, cacheKey, new NodeWatcher() {
ResourceWatcher rw;
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-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -28,6 +28,8 @@
import org.jboss.forge.common.projects.elements.PropertiesHandlerDefault;
import org.jboss.forge.common.projects.elements.PropertiesHandlerStack;
import org.jboss.forge.common.projects.elements.PropertiesMap;
+import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -195,11 +197,13 @@
}
if (thisCategory != null)
- thisCategory.fillContext(context);
+ thisCategory.fillContext(context, new NullPermissionsChecker());
if (categoriesDesc != null)
- categoriesDesc.fillContext(context.next("hasCategories"), "categories");
+ categoriesDesc.fillContext(context.next("hasCategories"), "categories",
+ new NullPermissionsChecker());
if (filesDesc != null)
- filesDesc.fillContext(context.next("hasFiles"), "files");
+ filesDesc.fillContext(context.next("hasFiles"), "files",
+ new NullPermissionsChecker());
// Creating the trace (for each category, a path from from the root to
// that category).
@@ -230,17 +234,12 @@
PropertiesHandlerStack stack = new PropertiesHandlerStack();
stack.addHandler(new PropertiesHandlerDefault());
stack.addHandler(new PropertiesHandler() {
- public void fillContextShallow(PropertiesMap properties,
- DelegateContext context) {
+ public void fillContext(PropertiesMap properties,
+ DelegateContext context, PermissionsChecker pc) {
context.put("fullId", categoryContext + CAT_ID_SEPARATOR
+ properties.get("id").getFirstValue());
}
- public void fillContext(PropertiesMap properties,
- DelegateContext context) {
-
- }
-
public void processNode(ElementDescriptor thisElement, Node node) {
String categoryId = thisElement.getId();
try {
@@ -256,6 +255,11 @@
// category.
}
}
+
+ public void collect(PropertiesMap properties, Object data,
+ PermissionsChecker pc) {
+
+ }
});
return stack;
@@ -284,7 +288,8 @@
final String separator, final String portalName,
final String projectId) {
return new PropertiesHandler() {
- public void fillContextShallow(PropertiesMap properties, DelegateContext context) {
+ public void fillContext(PropertiesMap properties, DelegateContext context,
+ PermissionsChecker pc) {
String id = properties.get("id").getFirstValue();
if (isOutsideLink(id))
@@ -302,12 +307,13 @@
context.put("name", properties.get("name").getFirstValue());
}
- public void fillContext(PropertiesMap properties, DelegateContext context) {
+ public void processNode(ElementDescriptor thisElement, Node node) {
}
- public void processNode(ElementDescriptor thisElement, Node node) {
-
+ public void collect(PropertiesMap properties, Object data,
+ PermissionsChecker pc) {
+
}
};
}
@@ -319,8 +325,8 @@
PropertiesHandlerStack stack = new PropertiesHandlerStack();
stack.addHandler(new PropertiesHandlerDefault());
stack.addHandler(new PropertiesHandler() {
- public void fillContextShallow(PropertiesMap properties,
- DelegateContext context) {
+ public void fillContext(PropertiesMap properties,
+ DelegateContext context, PermissionsChecker pc) {
String id = properties.get("id").getFirstValue();
String pathToFile = separator + projectId
+ separator + componentDir + separator
@@ -365,14 +371,14 @@
getFileModification(isf, pathToFile)));
}
- public void fillContext(PropertiesMap properties,
- DelegateContext context) {
+ public void processNode(ElementDescriptor thisElement, Node node) {
}
+
+ public void collect(PropertiesMap properties, Object data,
+ PermissionsChecker pc) {
- public void processNode(ElementDescriptor thisElement, Node node) {
-
- }
+ }
});
return stack;
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-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -21,6 +21,7 @@
import org.jboss.forge.common.projects.elements.PropertiesHandler;
import org.jboss.forge.common.projects.elements.PropertiesHandlerStack;
import org.jboss.forge.common.projects.elements.PropertiesMap;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.logging.Logger;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Document;
@@ -37,7 +38,6 @@
private static final Logger log = Logger.getLogger(ProjectDescriptor.class);
private DownloadsDescriptor downloads;
- private DownloadsDescriptor docs;
private String portalName;
@@ -124,12 +124,7 @@
// And a custom one, which holds more information.
stack.addHandler(new PropertiesHandler() {
public void fillContext(PropertiesMap properties,
- DelegateContext context) {
-
- }
-
- public void fillContextShallow(PropertiesMap properties,
- DelegateContext context) {
+ DelegateContext context, PermissionsChecker pc) {
context.put("companyname", properties.get("company-name")
.getFirstValue());
context.put("info", properties.get("info").getFirstValue());
@@ -150,6 +145,11 @@
public void processNode(ElementDescriptor thisElement, Node node) {
}
+
+ public void collect(PropertiesMap properties, Object data,
+ PermissionsChecker pc) {
+
+ }
});
return stack;
@@ -160,12 +160,7 @@
ph.addHandler(new PropertiesHandlerDefault());
ph.addHandler(new PropertiesHandler() {
public void fillContext(PropertiesMap properties,
- DelegateContext context) {
-
- }
-
- public void fillContextShallow(PropertiesMap properties,
- DelegateContext context) {
+ DelegateContext context, PermissionsChecker pc) {
context.put("link", ProjectsHelper.createFreezonePageLink(
portalName, getId(), properties.get("id")
.getFirstValue()));
@@ -174,6 +169,11 @@
public void processNode(ElementDescriptor thisElement, Node node) {
}
+
+ public void collect(PropertiesMap properties, Object data,
+ PermissionsChecker pc) {
+
+ }
});
return ph;
@@ -185,9 +185,11 @@
*
* @param context
* Context to fill.
+ * @param pc
+ * Permissions checker to use.
*/
- public void fillContextShallow(DelegateContext context) {
- thisProject.fillContextShallow(context);
+ public void fillContextShallow(DelegateContext context, PermissionsChecker pc) {
+ thisProject.fillContextShallow(context, pc);
}
/**
@@ -195,9 +197,11 @@
*
* @param context
* Context to fill.
+ * @param pc
+ * Permissions checker to use.
*/
- public void fillContext(DelegateContext context) {
- thisProject.fillContext(context);
+ public void fillContext(DelegateContext context, PermissionsChecker pc) {
+ thisProject.fillContext(context, pc);
}
/**
@@ -219,16 +223,6 @@
return downloads;
}
- /**
- * Gets a downloads descriptor of this project.
- *
- * @return A component descriptor of this project or null, if the project
- * has no components.
- */
- public DownloadsDescriptor getDocsDescriptor() {
- return docs;
- }
-
/**
* Fills the given set with names of resources from which this project
* descriptor was generated.
@@ -253,4 +247,15 @@
public String getProperty(String propertyName) {
return thisProject.getProperty(propertyName);
}
+
+ /**
+ * Checks if permission to read this project is allowed with permissions
+ * set represented by the given permissions checker.
+ *
+ * @param pc Permissions checker to use.
+ * @return True iff permission is allowed.
+ */
+ public boolean permissionAllowed(PermissionsChecker pc) {
+ return thisProject.permissionAllowed(pc);
+ }
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -10,6 +10,7 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.content.ContentManager;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
/**
@@ -21,7 +22,6 @@
public class Projects {
private ContentManager cm;
private String portalName;
- private ForgeHelper forgeHelper;
/**
* @param cm A content manger suffixed with <portal-name>/memebers.
@@ -30,8 +30,6 @@
public Projects(ContentManager cm, String portalName) {
this.cm = cm;
this.portalName = portalName;
-
- forgeHelper = new ForgeHelper();
}
/**
@@ -39,12 +37,12 @@
*/
private synchronized ProjectsDescriptor getProjectsDescriptor() {
ProjectsDescriptor pd = (ProjectsDescriptor)
- forgeHelper.getForgeManagement().getFromCache(portalName,
+ ForgeHelper.getForgeManagement().getFromCache(portalName,
ProjectsDescriptor.class.getName());
if (pd == null) {
pd = (ProjectsDescriptor)
- forgeHelper.getForgeManagement().addNodeWatcher(portalName,
+ ForgeHelper.getForgeManagement().addNodeWatcher(portalName,
ProjectsDescriptor.class.getName(),
new ProjectsNodeWatcher(cm));
}
@@ -54,24 +52,30 @@
/**
* Gets context of the given project.
+ * @param pc Permissions checker to use.
+ * @param id Id of the project to get.
*/
- public DelegateContext getProjectContext(String id) {
- return getProjectsDescriptor().getProjectContext(id);
+ public DelegateContext getProjectContext(PermissionsChecker pc, String id) {
+ return getProjectsDescriptor().getProjectContext(pc, id);
}
/**
* Gets context of the given category.
+ * @param pc Permissions checker to use.
+ * @param id Id of the category to get.
*/
- public DelegateContext getCategoryContext(String id) {
+ public DelegateContext getCategoryContext(PermissionsChecker pc, String id) {
return getProjectsDescriptor()
- .getOutsidePropertyContext("category", id);
+ .getOutsidePropertyContext(pc, "category", id);
}
/**
* Gets a context describing all projects.
+ *
+ * @param pc Permissions checker to use.
*/
- public DelegateContext getProjectsContext() {
- return getProjectsDescriptor().getContext();
+ public DelegateContext getProjectsContext(PermissionsChecker pc) {
+ return getProjectsDescriptor().getContext(pc);
}
/**
@@ -81,13 +85,14 @@
* Id of the selected project.
* @param categoryId
* Id of the selected category.
+ * @param pc Permissions checker to use.
* @return Download context for the diven project and category or null if no
* such context exists.
*/
- public DelegateContext getDownloadsContext(String projectId,
- String categoryId) {
+ public DelegateContext getDownloadsContext(PermissionsChecker pc,
+ String projectId, String categoryId) {
ProjectDescriptor pd = getProjectsDescriptor().getProjectDescriptor(
- projectId);
+ pc, projectId);
if (pd == null)
return null;
@@ -109,12 +114,13 @@
/**
* Searches for the given string in project's names and descriptions.
*
+ * @param pc Permissions checker to use.
* @param searchFor
* String to search for.
* @return A context containing under the key "projects" contexts of found
* projects.
*/
- public DelegateContext search(String searchFor) {
- return getProjectsDescriptor().search(searchFor);
+ public DelegateContext search(PermissionsChecker pc, String searchFor) {
+ return getProjectsDescriptor().search(pc, searchFor);
}
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -9,6 +9,8 @@
package org.jboss.forge.common.projects;
import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
@@ -26,6 +28,8 @@
import org.jboss.forge.common.projects.elements.PropertiesHandlerDefault;
import org.jboss.forge.common.projects.elements.PropertiesHandlerStack;
import org.jboss.forge.common.projects.elements.PropertiesMap;
+import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.logging.Logger;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Document;
@@ -41,11 +45,17 @@
private static final Logger log = Logger.getLogger(ProjectsDescriptor.class);
/**
- * project id --> Corresponding project descriptor object
+ * Project id --> Corresponding project descriptor object
*/
private Map<String, ProjectDescriptor> projects;
- private DelegateContext context;
+ /**
+ * Permissions descriptor --> Corresponding global context
+ */
+ private Map<String, DelegateContext> contexts;
+ /**
+ * Project id + permissions descriptor --> Corresponding project context
+ */
private Map<String, DelegateContext> projectsContexts;
private OutsidePropertiesMap opm;
@@ -65,10 +75,12 @@
*/
public ProjectsDescriptor(XmlInputFactory isf, String portalName) {
projects = new TreeMap<String, ProjectDescriptor>();
- context = new DelegateContext();
projectWithErrorsDescriptors = new HashSet<String>();
- projectsContexts = new TreeMap<String, DelegateContext>();
+ projectsContexts = Collections.synchronizedMap(
+ new TreeMap<String, DelegateContext>());
+ contexts = Collections.synchronizedMap(
+ new HashMap<String, DelegateContext>());
try {
DomToXmlTransformer xht = new DomToXmlTransformer();
@@ -83,7 +95,7 @@
unmarshallProjects(node, isf, xht, portalName);
- fillContexts();
+ fillContext(new NullPermissionsChecker());
} catch (Exception e) {
log.warn("Projects descriptor contructor: "+e);
}
@@ -121,19 +133,21 @@
PropertiesHandlerStack phs = new PropertiesHandlerStack();
phs.addHandler(new PropertiesHandlerDefault());
phs.addHandler(new PropertiesHandler() {
- public void fillContextShallow(PropertiesMap properties, DelegateContext context) {
+ public void fillContext(PropertiesMap properties, DelegateContext context,
+ PermissionsChecker pc) {
if (properties.get("id").getFirstValue().equals("wiki")) {
context.next("useForgeWiki");
} else context.next("normalPage");
}
- public void fillContext(PropertiesMap properties, DelegateContext context) {
-
- }
-
public void processNode(ElementDescriptor thisElement, Node node) {
}
+
+ public void collect(PropertiesMap properties, Object data,
+ PermissionsChecker pc) {
+
+ }
});
return phs;
@@ -158,19 +172,35 @@
return opm;
}
- private void fillContexts() {
+ private DelegateContext fillContext(PermissionsChecker pc) {
+ String permDesc = pc.getPermissionsDescriptor();
+
+ DelegateContext context = new DelegateContext();
+
for (Iterator iter = projects.keySet().iterator(); iter.hasNext();) {
+ String projectId = (String) iter.next();
+
+ ProjectDescriptor pd = (ProjectDescriptor) projects.get(projectId);
+
+ /// Checking if we can read data from this project.
+ if (!pd.permissionAllowed(pc)) continue;
+
DelegateContext projectContext = context.next(PROJECTS_CTX_KEY);
- String projectId = (String) iter.next();
- ((ProjectDescriptor) projects.get(projectId)).fillContext(projectContext);
- projectsContexts.put(projectId, projectContext);
+ pd.fillContext(projectContext, pc);
+ projectsContexts.put(
+ ElementsDescriptor.getContextMapKey(projectId, permDesc),
+ projectContext);
}
for (int i=0; i<OUTSIDE_PROPERTIES.length; i++) {
opm.getElementsDescriptor((String) OUTSIDE_PROPERTIES[i][1]).fillContext(
- context, (String) OUTSIDE_PROPERTIES[i][2]);
+ context, (String) OUTSIDE_PROPERTIES[i][2], pc);
}
+
+ contexts.put(permDesc, context);
+
+ return context;
}
/**
@@ -210,11 +240,12 @@
/**
* Searches for the given string in project's names and descriptions.
+ * @param pc Permissions checker to use.
* @param searchFor String to search for.
* @return A context containing under the key "projects" contexts of
* found projects.
*/
- public DelegateContext search(String searchFor) {
+ public DelegateContext search(PermissionsChecker pc, String searchFor) {
boolean found = false;
DelegateContext context = new DelegateContext();
@@ -224,13 +255,15 @@
String projectId = (String) iter.next();
ProjectDescriptor project = (ProjectDescriptor) projects.get(projectId);
+ if (!project.permissionAllowed(pc)) continue;
+
if ((SearchTools.searchInString(project.getProperty("name"), tokens) ||
(SearchTools.searchInString(project.getProperty("description"),
tokens)) ||
(SearchTools.searchInString(project.getProperty("companyname"),
tokens)))) {
found = true;
- project.fillContextShallow(context.next("projects"));
+ project.fillContextShallow(context.next("projects"), pc);
}
}
@@ -239,46 +272,83 @@
/**
* Gets a descriptor of a specified project.
+ * @param pc Permissions checker to use.
* @param projectId Id of the project for which to get the descriptor.
- * @return A descriptor of the given project.
+ * @return A descriptor of the given project or null if access to the project is not
+ * allowed.
*/
- public ProjectDescriptor getProjectDescriptor(String projectId) {
- return (ProjectDescriptor) projects.get(projectId);
+ public ProjectDescriptor getProjectDescriptor(PermissionsChecker pc, String projectId) {
+ ProjectDescriptor pd = (ProjectDescriptor) projects.get(projectId);
+
+ // Checking if this project can be read.
+ if (!pd.permissionAllowed(pc))
+ return null;
+
+ return pd;
}
+
/**
- * Gets ids of all projects.
- * @return A set of ids of all projects.
+ * Transforms the given permissions checker for internal use. If a user, who's
+ * permissions are represented by <code>pc</code>, isn't a project manager, then
+ * he won't be able to get customized contexts, and a <code>NullPermissionsChecker</code>
+ * is returned. Otherwise, <code>pc</code> is returned.
+ *
+ * @param pc Permissions checker to transform.
+ * @return A new null permissions checker or the given permissions checker.
*/
- public Set<String> getProjectsIds() {
- return projects.keySet();
+ private PermissionsChecker transformPermissionsChecker(PermissionsChecker pc) {
+ if (!pc.hasPermission("project-manager"))
+ return new NullPermissionsChecker();
+
+ return pc;
}
/**
* Gets a context holding information about all projects.
+ * @param pc Permissions checker to use.
* @return A context holding information about all projects.
*/
- public DelegateContext getContext() {
+ public DelegateContext getContext(PermissionsChecker pc) {
+ PermissionsChecker pcToUse = transformPermissionsChecker(pc);
+ DelegateContext context = contexts.get(pcToUse.getPermissionsDescriptor());
+
+ // If no context for the given permissions set is yet defined, we create a new one
+ // and return it.
+ if (context == null) {
+ return fillContext(pcToUse);
+ }
+
return context;
}
/**
* Gets a context for a project with the given id.
+ * @param pc Permissions checker to use.
* @param id Id of the project for which to get the context.
* @return A context holding information about a specified project.
*/
- public DelegateContext getProjectContext(String id) {
- return (DelegateContext) projectsContexts.get(id);
+ public DelegateContext getProjectContext(PermissionsChecker pc, String id) {
+ PermissionsChecker pcToUse = transformPermissionsChecker(pc);
+ String permDesc = pcToUse.getPermissionsDescriptor();
+
+ if (contexts.get(permDesc) == null)
+ fillContext(pcToUse);
+
+ return (DelegateContext) projectsContexts.get(
+ ElementsDescriptor.getContextMapKey(id, permDesc));
}
/**
* Gets a context of an outside property of projects.
+ * @param pc Permissions checker to use.
* @param propertyName Name of the outside property
- * @param id
- * @return
+ * @param id Id of the element for which to get the context.
+ * @return A context desciribing an outside property with the given id.
*/
- public DelegateContext getOutsidePropertyContext(String propertyName, String id) {
- return opm.getContextForElement(propertyName, id);
+ public DelegateContext getOutsidePropertyContext(PermissionsChecker pc,
+ String propertyName, String id) {
+ return opm.getContextForElement(propertyName, id, pc);
}
/**
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-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -12,6 +12,7 @@
import java.util.Map;
import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
import org.jboss.portlet.JBossRenderRequest;
/**
@@ -45,8 +46,7 @@
/**
* <code>projectsObjects</code> - portalName -> Projects object
*/
- private Map<String, Projects> projectsObjects;
- private ForgeHelper forgeHelper;
+ private static Map<String, Projects> projectsObjects;
protected final static String PAGES_DESC = "pages.xml";
protected final static String JEMS_DESC = "jems.xml";
@@ -65,9 +65,8 @@
public final static String BLOG_DIR = "blog";
public final static String FREEZONE_DIR = "freezone";
- public ProjectsHelper() {
+ static {
projectsObjects = new HashMap<String, Projects>();
- forgeHelper = new ForgeHelper();
}
/**
@@ -77,11 +76,11 @@
* Name of the portal.
* @return An appropriate instance of class Projects.
*/
- public synchronized Projects getProjects(String portalName) {
+ public static synchronized Projects getProjects(String portalName) {
Projects projects = (Projects) projectsObjects.get(portalName);
if (projects == null) {
String suffix = "/" + portalName + "/" + MEMBERS_DIR;
- projects = new Projects(forgeHelper.getContentManager(suffix),
+ projects = new Projects(ForgeHelper.getContentManager(suffix),
portalName);
projectsObjects.put(portalName, projects);
}
@@ -116,11 +115,15 @@
String projectId = ForgeHelper.getRequestParameter(request,
PROJECT_URL_PARAM);
- if ((withDefault) && (projectId == null))
+ if ((withDefault) && (projectId == null)) {
projectId = DEFAULT_PROJECT;
-
- if ((!withDefault) && (DEFAULT_PROJECT.equals(projectId)))
+ } else if ((!withDefault) && (DEFAULT_PROJECT.equals(projectId))) {
projectId = null;
+ } else if (getProjects(ForgeHelper.getPortalName(request)).getProjectContext(
+ new RenderRequestPermissionsChecker(request), projectId) == null) {
+ // No project context --> project does not exist.
+ projectId = null;
+ }
return projectId;
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandler.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandler.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandler.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -8,6 +8,7 @@
*****************************************/
package org.jboss.forge.common.projects.elements;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
/**
@@ -25,6 +26,9 @@
* Bindingis to use.
* @param context
* Context to fill.
+ * @param pc
+ * Permissions checker to use.
*/
- public void fillContext(BindingsMap bindings, DelegateContext context);
+ public void fillContext(BindingsMap bindings, DelegateContext context,
+ PermissionsChecker pc);
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerEmpty.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerEmpty.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerEmpty.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -8,6 +8,7 @@
*****************************************/
package org.jboss.forge.common.projects.elements;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
/**
@@ -15,7 +16,8 @@
* @author adamw
*/
public class BindingsHandlerEmpty implements BindingsHandler {
- public void fillContext(BindingsMap bindings, DelegateContext context) {
+ public void fillContext(BindingsMap bindings, DelegateContext context,
+ PermissionsChecker pc) {
}
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerIterSingleKey.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerIterSingleKey.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerIterSingleKey.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -10,6 +10,7 @@
import java.util.Iterator;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
/**
@@ -34,10 +35,16 @@
this.contextKey = contextKey;
}
- public void fillContext(BindingsMap bindings, DelegateContext context) {
+ public void fillContext(BindingsMap bindings, DelegateContext context,
+ PermissionsChecker pc) {
for (Iterator iter = bindings.get(key).iterator(); iter.hasNext();) {
ElementDescriptor ed = (ElementDescriptor) iter.next();
- ed.fillContextShallow(context.next(contextKey));
+
+ // Checking permissions.
+ if (!ed.permissionAllowed(pc))
+ continue;
+
+ ed.fillContextShallow(context.next(contextKey), pc);
}
}
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerStack.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerStack.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/BindingsHandlerStack.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -12,6 +12,7 @@
import java.util.Iterator;
import java.util.List;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
/**
@@ -33,9 +34,10 @@
handlers.add(handler);
}
- public void fillContext(BindingsMap bindings, DelegateContext context) {
+ public void fillContext(BindingsMap bindings, DelegateContext context,
+ PermissionsChecker pc) {
for (Iterator iter = handlers.iterator(); iter.hasNext();)
((BindingsHandler) iter.next()).fillContext(bindings,
- context);
+ context, pc);
}
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementDescriptor.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -10,6 +10,7 @@
import org.jboss.forge.common.projects.AbstractDescriptor;
import org.jboss.forge.common.projects.DomToXmlTransformer;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -26,6 +27,10 @@
* @author adamw
*/
public class ElementDescriptor extends AbstractDescriptor {
+ // Special properties
+ private final static String PROP_ID = "id";
+ private final static String PROP_PERM = "permission";
+
private String id;
private PropertiesHandler ph;
private PropertiesMap properties;
@@ -87,25 +92,41 @@
*
* @param context
* Context to fill.
+ * @param pc
+ * Permissions checker to use.
*/
- public void fillContextShallow(DelegateContext context) {
- ph.fillContextShallow(properties, context);
+ public void fillContextShallow(DelegateContext context,
+ PermissionsChecker pc) {
+ ph.fillContext(properties, context, pc);
}
+
+ /**
+ * Collects data from this descriptor, passing to the properties handler
+ * the given object, which can be used to store the collected data.
+ *
+ * @param data Object to pass to the properties handler's collect method.
+ * @param pc
+ * Permissions checker to use.
+ */
+ public void collect(Object data, PermissionsChecker pc) {
+ ph.collect(properties, data, pc);
+ }
/**
* Fills the given context with this element's information.
*
* @param context
* Context to fill.
+ * @param pc
+ * Permissions checker to use.
*/
- public void fillContext(DelegateContext context) {
- fillContextShallow(context);
- ph.fillContext(properties, context);
+ public void fillContext(DelegateContext context, PermissionsChecker pc) {
+ fillContextShallow(context, pc);
- bhStack.fillContext(bindings, context);
+ bhStack.fillContext(bindings, context, pc);
- epm.getBindingsHandlersStack().fillContext(bindings, context);
- opm.getBindingsHandlersStack().fillContext(bindings, context);
+ epm.getBindingsHandlersStack().fillContext(bindings, context, pc);
+ opm.getBindingsHandlersStack().fillContext(bindings, context, pc);
}
private void unmarshallElement(Node root, DomToXmlTransformer xht) {
@@ -117,7 +138,7 @@
if (n.getNodeType() == Node.ELEMENT_NODE) {
String nodeName = n.getNodeName();
- if (nodeName.equals("id"))
+ if (nodeName.equals(PROP_ID))
id = unmarshallText(n);
// Adding the corresponding property.
@@ -191,4 +212,26 @@
public String getProperty(String propertyName) {
return properties.get(propertyName).getFirstValue();
}
+
+ /**
+ * Checks if data from this element descriptor can be read by a user who's
+ * permissions can be checked using the provided permissions checker.
+ * @param pc Permissions checker with which permissions can be checked.
+ * @return True iff permission to read data from this element descriptor
+ * is allowed.
+ */
+ public boolean permissionAllowed(PermissionsChecker pc) {
+ // No required permissions defined - returning true.
+ if (!properties.hasValues(PROP_PERM))
+ return true;
+
+ // Checking if any of the required permissions are satisfied.
+ for (String permission : properties.get(PROP_PERM).getAllValues()) {
+ if (pc.hasPermission(permission)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/ElementsDescriptor.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -9,6 +9,7 @@
package org.jboss.forge.common.projects.elements;
import java.io.IOException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -18,6 +19,7 @@
import org.jboss.forge.common.projects.AbstractDescriptor;
import org.jboss.forge.common.projects.XmlInputFactory;
import org.jboss.forge.common.projects.DomToXmlTransformer;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -35,8 +37,10 @@
private Map<String, DelegateContext> contexts;
private ElementsDescriptor() {
- elements = new LinkedHashMap<String, ElementDescriptor>();
- contexts = new HashMap<String, DelegateContext>();
+ elements = Collections.synchronizedMap(
+ new LinkedHashMap<String, ElementDescriptor>());
+ contexts = Collections.synchronizedMap(
+ new HashMap<String, DelegateContext>());
}
/**
@@ -194,18 +198,39 @@
* Name undeer which consecutive elements context's should be
* placed.
*/
- public void fillContext(DelegateContext context, String name) {
+ public void fillContext(DelegateContext context, String name, PermissionsChecker pc) {
for (Iterator iter = elements.keySet().iterator(); iter.hasNext();) {
ElementDescriptor ed = (ElementDescriptor) elements
.get(iter.next());
+
+ // Checking if we can read data from this elements descriptor.
+ if (!ed.permissionAllowed(pc)) continue;
+
DelegateContext nextContext = context.next(name);
- ed.fillContext(nextContext);
-
+ ed.fillContext(nextContext, pc);
+
// Storing the context for later usage.
contexts.put(ed.getId(), nextContext);
}
}
+
+ /**
+ * Collects data from elements contained in this descriptor, passing to
+ * the properties handler the given object, which can be used to store
+ * the collected data.
+ *
+ * @param data Object to pass to the properties handler's collect method
+ * of each remembered element.
+ */
+ public void collect(Object data, PermissionsChecker pc) {
+ for (ElementDescriptor ed : elements.values()) {
+ if (!ed.permissionAllowed(pc)) continue;
+
+ ed.collect(data, pc);
+ }
+ }
+
/**
* Gets a context describing an element with the given id.
*
@@ -213,12 +238,16 @@
* Id for which to get the context.
* @return A context describing an element with the given id.
*/
- public DelegateContext getContextForElement(String id) {
- DelegateContext context = (DelegateContext) contexts.get(id);
+ public DelegateContext getContextForElement(String id, PermissionsChecker pc) {
+ String mapKey = getContextMapKey(id, pc);
+
+ DelegateContext context = (DelegateContext) contexts.get(mapKey);
if (context == null) {
context = new DelegateContext();
- ((ElementDescriptor) elements.get(id)).fillContext(context);
- contexts.put(id, context);
+ ElementDescriptor ed = (ElementDescriptor) elements.get(mapKey);
+
+ ed.fillContext(context, pc);
+ contexts.put(mapKey, context);
}
return context;
@@ -267,4 +296,25 @@
((ElementDescriptor) elements.get(iter.next()))
.addBindingsHandler(bh);
}
+
+ /**
+ * Gets a context map key for a given element id and permissions descriptor.
+ * @param id Id of an element.
+ * @param permDesc Permissions checker descriptor.
+ * @return A string (map key) using both <code>id</code> and <code>permDesc</code>.
+ */
+ public static String getContextMapKey(String id, String permDesc) {
+ return id + "/" + permDesc;
+ }
+
+ /**
+ * Gets a context map key for a given element id and permissions descriptor.
+ * @param id Id of an element.
+ * @param pc Permissions checker to get the descriptor from.
+ * @return A string (map key) using both <code>id</code> and
+ * <code>pc.getPermissionsDescriptor()</code>.
+ */
+ public static String getContextMapKey(String id, PermissionsChecker pc) {
+ return getContextMapKey(id, pc.getPermissionsDescriptor());
+ }
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/OutsidePropertiesMap.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/OutsidePropertiesMap.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/OutsidePropertiesMap.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -8,6 +8,7 @@
*****************************************/
package org.jboss.forge.common.projects.elements;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
/**
@@ -85,8 +86,8 @@
* property and has a given id.
*/
public DelegateContext getContextForElement(String propertyName,
- String elementId) {
+ String elementId, PermissionsChecker pc) {
return getElementsDescriptor(propertyName).getContextForElement(
- elementId);
+ elementId, pc);
}
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesElementValue.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesElementValue.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesElementValue.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -79,7 +79,7 @@
*
* @return A list of held values or null, if no values are held.
*/
- public List getAllValues() {
+ public List<String> getAllValues() {
if (single != null) {
multi = new ArrayList<String>();
multi.add(single);
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandler.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandler.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandler.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -8,6 +8,7 @@
*****************************************/
package org.jboss.forge.common.projects.elements;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
@@ -15,33 +16,42 @@
* This interface should be implemented by classes which map properties of an
* element read from a XML file into contexts which are later passed to JSP
* pages.
+ *
* @author adamw
*/
public interface PropertiesHandler {
- /**
- * Fills the given context based on information held in the properties map,
- * without recursively calling fillContextXXX() for depended/ bound/
- * child elements.
- *
- * @param properties
- * Properties to use.
- * @param context
- * Context to fill.
- */
- public void fillContextShallow(PropertiesMap properties,
- DelegateContext context);
/**
- * Fills the given context based on information held in the properties map.
- *
- * @param properties
- * Properties to use.
- * @param context
- * Context to fill.
- */
- public void fillContext(PropertiesMap properties, DelegateContext context);
- /**
- * Performs actions after processing a new node (adding a new property).
- * @param node A processed node.
- */
- public void processNode(ElementDescriptor thisElement, Node node);
+ * Fills the given context based on information held in the properties map.
+ *
+ * @param properties
+ * Properties to use.
+ * @param context
+ * Context to fill.
+ * @param pc
+ * Permissions checker to use.
+ */
+ public void fillContext(PropertiesMap properties, DelegateContext context,
+ PermissionsChecker pc);
+
+ /**
+ * Collects and transforms data contained in the properties map into the
+ * supplied data object.
+ *
+ * @param properties
+ * Properties to read data from.
+ * @param data
+ * Generic data that can be used to store transformed data.
+ * @param pc
+ * Permissions checker to use.
+ */
+ public void collect(PropertiesMap properties, Object data,
+ PermissionsChecker pc);
+
+ /**
+ * Performs actions after processing a new node (adding a new property).
+ *
+ * @param node
+ * A processed node.
+ */
+ public void processNode(ElementDescriptor thisElement, Node node);
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerDefault.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerDefault.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerDefault.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -8,6 +8,7 @@
*****************************************/
package org.jboss.forge.common.projects.elements;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
@@ -17,18 +18,19 @@
* @author adamw
*/
public class PropertiesHandlerDefault implements PropertiesHandler {
- public void fillContextShallow(PropertiesMap properties,
- DelegateContext context) {
+ public void fillContext(PropertiesMap properties,
+ DelegateContext context, PermissionsChecker pc) {
context.put("id", properties.get("id").getFirstValue());
context.put("name", properties.get("name").getFirstValue());
context.put("description", properties.get("description").getFirstValue());
}
-
- public void fillContext(PropertiesMap properties, DelegateContext context) {
- }
-
public void processNode(ElementDescriptor thisElement, Node node) {
}
+
+ public void collect(PropertiesMap properties, Object data,
+ PermissionsChecker pc) {
+
+ }
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerMultiValue.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerMultiValue.java 2005-09-06 20:52:10 UTC (rev 1051)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/elements/PropertiesHandlerMultiValue.java 2005-09-07 12:15:47 UTC (rev 1052)
@@ -10,6 +10,7 @@
import java.util.Iterator;
+import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
@@ -37,19 +38,19 @@
this.propertyName = propertyName;
}
- public void fillContextShallow(PropertiesMap properties,
- DelegateContext context) {
+ public void fillContext(PropertiesMap properties,
+ DelegateContext context, PermissionsChecker pc) {
PropertiesElementValue ev = properties.get(propertyName);
for (Iterator iter = ev.getAllValues().iterator(); iter.hasNext();)
context.next(parentName).put(childName, (String) iter.next());
}
-
- pu...
[truncated message content] |
|
From: <jbo...@li...> - 2005-09-06 20:52:19
|
Author: soh...@jb... Date: 2005-09-06 16:52:10 -0400 (Tue, 06 Sep 2005) New Revision: 1051 Modified: trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/jboss-web.xml Log: Modified: trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/jboss-web.xml =================================================================== --- trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/jboss-web.xml 2005-09-06 20:49:35 UTC (rev 1050) +++ trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/jboss-web.xml 2005-09-06 20:52:10 UTC (rev 1051) @@ -1,4 +1,4 @@ <?xml version="1.0"?> <jboss-web> - <!--<context-root /> --> + <context-root /> </jboss-web> |
|
From: <jbo...@li...> - 2005-09-06 20:49:37
|
Author: soh...@jb... Date: 2005-09-06 16:49:35 -0400 (Tue, 06 Sep 2005) New Revision: 1050 Modified: trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/jboss-web.xml Log: Modified: trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/jboss-web.xml =================================================================== --- trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/jboss-web.xml 2005-09-06 14:21:18 UTC (rev 1049) +++ trunk/forge/portal-extensions/forge-root-redirect/src/web/WEB-INF/jboss-web.xml 2005-09-06 20:49:35 UTC (rev 1050) @@ -1,4 +1,4 @@ <?xml version="1.0"?> <jboss-web> - <context-root /> + <!--<context-root /> --> </jboss-web> |
Author: adamw
Date: 2005-09-06 08:14:48 -0400 (Tue, 06 Sep 2005)
New Revision: 1048
Added:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/ActionRequestPermissionsChecker.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/PermissionsChecker.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/RenderRequestPermissionsChecker.java
Removed:
trunk/forge/portal-extensions/forge-info/
trunk/forge/portal-extensions/forge-prj-docs/
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/projects/ProjectDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml
trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
trunk/forge/portal-extensions/forge-map/src/java/org/jboss/forge/softwaremap/SoftwareMap.java
trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java
trunk/forge/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java
trunk/forge/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml
Log:
Cleanup
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-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -195,7 +195,7 @@
* Name of the paramter to read.
* @return Value of the demanded parameter or null, if it is not set.
*/
- public String getRequestParameter(JBossRenderRequest request,
+ public static String getRequestParameter(JBossRenderRequest request,
String paramName) {
// First trying to read it from the URL (this works, if it is not a
// render/ action request).
@@ -239,7 +239,7 @@
* Corresponding request.
* @return Name of the current portal.
*/
- public String getPortalName(JBossRenderRequest request) {
+ public static String getPortalName(JBossRenderRequest request) {
PortalContext portalCtx = request.getPortalContext();
String portalName = portalCtx
.getProperty("org.jboss.portal.property.name");
@@ -253,7 +253,7 @@
* @param request
* Request to prepare.
*/
- public void prepareRequest(JBossRenderRequest request) {
+ public static void prepareRequest(JBossRenderRequest request) {
request.setAttribute(ForgeHelper.PORTAL_NAME, getPortalName(request));
}
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-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -45,7 +45,6 @@
/** The class logger */
public static final Logger log = Logger.getLogger(JBossPortlet.class);
- private ProjectsHelper projectsHelper;
private ForgeHelper forgeHelper;
/**
@@ -54,7 +53,6 @@
public void init() throws PortletException {
super.init();
- projectsHelper = new ProjectsHelper();
forgeHelper = new ForgeHelper();
}
@@ -74,8 +72,8 @@
PortalContext portalCtx = request.getPortalContext();
- String projectId = projectsHelper.getSelectedProjectId(request);
- String portalName = forgeHelper.getPortalName(request);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
+ String portalName = ForgeHelper.getPortalName(request);
// Getting the number of headers and entries to display
PortletConfig pConfig = getPortletConfig();
@@ -122,12 +120,12 @@
isMainPortlet = mainportlet.equals("yes");
// Name of the entry to expand
- String blogLink = forgeHelper.getRequestParameter(request, "link");
+ String blogLink = ForgeHelper.getRequestParameter(request, "link");
if (blogLink != null)
blogLink = URLDecoder.decode(blogLink, "UTF-8");
// A string denoting the number of the first displayed entry
- String fromEntryString = forgeHelper.getRequestParameter(request,
+ String fromEntryString = ForgeHelper.getRequestParameter(request,
"from");
if (fromEntryString == null)
@@ -177,7 +175,7 @@
showEntries, blogLink, desiredWindowState, currentWindowState,
projectId, portalName, feedTypeFreeAddress);
- projectsHelper.prepareRequest(request);
+ ProjectsHelper.prepareRequest(request);
writePage(request, response, forgeHelper.createRepoAccessPath(
portalName, getJsp()));
response.setTitle("Blog");
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-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -89,18 +89,6 @@
" descriptor: "+e);
downloads = null;
}
-
- // Trying to create a docs descriptor.
- try {
- docs = new DownloadsDescriptor(isf, xht,
- ProjectsHelper.DOCS_DIR,
- ProjectsHelper.DOCS_DESC,
- portalName, getId());
- } catch (Exception e) {
- log.warn("Project "+getId()+", unable te parse docs" +
- " descriptor: "+e);
- docs = null;
- }
}
/**
@@ -251,12 +239,7 @@
downloads.addWatchedFiles(getId(), toFill,
ProjectsHelper.DOWNLOADS_DIR,
ProjectsHelper.DOWNLOADS_DESC);
-
- if (docs != null)
- docs.addWatchedFiles(getId(), toFill,
- ProjectsHelper.DOCS_DIR,
- ProjectsHelper.DOCS_DESC);
-
+
toFill.add(getId() + "/" + ProjectsHelper.PROJECT_DESC);
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -98,32 +98,7 @@
return dd == null ? null : dd.getContext();
}
-
- /**
- * Gets a docs context for the given project and category.
- *
- * @param projectId
- * Id of the selected project.
- * @param categoryId
- * Id of the selected category.
- * @return Docs context for the diven project and category or null if no
- * such context exists.
- */
- public DelegateContext getDocsContext(String projectId,
- String categoryId) {
- ProjectDescriptor pd = getProjectsDescriptor().getProjectDescriptor(
- projectId);
- if (pd == null)
- return null;
- DownloadsDescriptor dd = pd.getDocsDescriptor();
-
- if (categoryId != null)
- dd = dd.getDownloadsDesciptor(categoryId);
-
- return dd == null ? null : dd.getContext();
- }
-
/**
* Gets the name of the project with the given id.
*/
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-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -55,7 +55,6 @@
protected final static String PROJECT_DESC = "project.xml";
protected final static String PROJECTS_DESC = "projects.xml";
protected final static String DOWNLOADS_DESC = "downloads.xml";
- protected final static String DOCS_DESC = "docs.xml";
/**
* <code>MEMBERS_DIRECTORY</code> - base repository directory in which
@@ -63,7 +62,6 @@
*/
public final static String MEMBERS_DIR = "members";
public final static String DOWNLOADS_DIR = "downloads";
- public final static String DOCS_DIR = "docs";
public final static String BLOG_DIR = "blog";
public final static String FREEZONE_DIR = "freezone";
@@ -99,7 +97,7 @@
* @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) {
+ public static String getSelectedProjectId(JBossRenderRequest request) {
return getSelectedProjectId(request, false);
}
@@ -113,9 +111,9 @@
* @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,
+ public static String getSelectedProjectId(JBossRenderRequest request,
boolean withDefault) {
- String projectId = forgeHelper.getRequestParameter(request,
+ String projectId = ForgeHelper.getRequestParameter(request,
PROJECT_URL_PARAM);
if ((withDefault) && (projectId == null))
@@ -134,8 +132,8 @@
* @param request
* Request to prepare.
*/
- public void prepareRequest(JBossRenderRequest request) {
- forgeHelper.prepareRequest(request);
+ public static void prepareRequest(JBossRenderRequest request) {
+ ForgeHelper.prepareRequest(request);
request.setAttribute(PROJECT_ID, getSelectedProjectId(request));
}
@@ -156,11 +154,4 @@
+ ".freezone&project=" + projectId + "&page="
+ 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, "/", ForgeHelper.FREEZONE_SEPARATOR);
- }
}
Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/ActionRequestPermissionsChecker.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/ActionRequestPermissionsChecker.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/ActionRequestPermissionsChecker.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -0,0 +1,21 @@
+package org.jboss.forge.common.projects.permissions;
+
+import org.jboss.portlet.JBossActionRequest;
+
+
+/**
+ * @author adamw
+ * A per-request permissions checker that uses a JBossActionRequest instance
+ * to check permissions.
+ */
+public class ActionRequestPermissionsChecker implements PermissionsChecker {
+ private JBossActionRequest request;
+
+ public ActionRequestPermissionsChecker(JBossActionRequest request) {
+ this.request = request;
+ }
+
+ public boolean hasPermission(String name) {
+ return request.hasPermission(name);
+ }
+}
Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/PermissionsChecker.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/PermissionsChecker.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/PermissionsChecker.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -0,0 +1,16 @@
+package org.jboss.forge.common.projects.permissions;
+
+/**
+ * @author adamw
+ * An interface implemented by classes which check if the curerent user
+ * has a given permission.
+ */
+public interface PermissionsChecker {
+ /**
+ * Checks if the current user has a permission.
+ * @param name Name of the permission to check.
+ * @return True iff the current user has the given
+ * permission.
+ */
+ public boolean hasPermission(String name);
+}
Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/RenderRequestPermissionsChecker.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/RenderRequestPermissionsChecker.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/RenderRequestPermissionsChecker.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -0,0 +1,23 @@
+package org.jboss.forge.common.projects.permissions;
+
+import org.jboss.portlet.JBossRenderRequest;
+
+/**
+ * @author adamw
+ * A per-request permissions checker that uses a JBossRenderRequest instance
+ * to check permissions.
+ */
+public class RenderRequestPermissionsChecker implements PermissionsChecker {
+ private JBossRenderRequest request;
+
+ public RenderRequestPermissionsChecker(JBossRenderRequest request) {
+ this.request = request;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.forge.common.projects.permissions.PermissionsChecker#hasPermission(java.lang.String)
+ */
+ public boolean hasPermission(String name) {
+ return request.hasPermission(name);
+ }
+}
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-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2005-09-06 12:14:48 UTC (rev 1048)
@@ -40,11 +40,6 @@
</module>
<module>
<web>
- <web-uri>forge-prj-docs.war</web-uri>
- </web>
- </module>
- <module>
- <web>
<web-uri>forge-prj-downloads.war</web-uri>
</web>
</module>
@@ -65,11 +60,6 @@
</module>
<module>
<web>
- <web-uri>info-portlet.war</web-uri>
- </web>
- </module>
- <module>
- <web>
<web-uri>navigation-portlet.war</web-uri>
</web>
</module>
Modified: trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -29,14 +29,11 @@
*/
private final static String DEFAULT_PAGE = "index.html";
- private ProjectsHelper projectsHelper;
-
private ForgeHelper forgeHelper;
private ContentManager cm;
public void init() {
- projectsHelper = new ProjectsHelper();
forgeHelper = new ForgeHelper();
cm = forgeHelper.getContentManager("");
}
@@ -150,14 +147,14 @@
response.setContentType("text/html");
try {
- String portalName = forgeHelper.getPortalName(request);
+ String portalName = ForgeHelper.getPortalName(request);
// Getting the selected project
- String projectId = projectsHelper.getSelectedProjectId(request,
+ String projectId = ProjectsHelper.getSelectedProjectId(request,
true);
// Getting the name of the requested page
- String pagePath = forgeHelper.getRequestParameter(request, "page");
+ String pagePath = ForgeHelper.getRequestParameter(request, "page");
if (pagePath == null)
pagePath = DEFAULT_PAGE;
else
Modified: trunk/forge/portal-extensions/forge-map/src/java/org/jboss/forge/softwaremap/SoftwareMap.java
===================================================================
--- trunk/forge/portal-extensions/forge-map/src/java/org/jboss/forge/softwaremap/SoftwareMap.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-map/src/java/org/jboss/forge/softwaremap/SoftwareMap.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -46,11 +46,11 @@
response.setContentType("text/html");
// Getting the optional paramters: category name and search text
- String categoryName = forgeHelper.getRequestParameter(request,
+ String categoryName = ForgeHelper.getRequestParameter(request,
"category");
- String searchFor = forgeHelper.getRequestParameter(request, "search");
+ String searchFor = ForgeHelper.getRequestParameter(request, "search");
- String portalName = forgeHelper.getPortalName(request);
+ String portalName = ForgeHelper.getPortalName(request);
Projects projects = projectsHelper.getProjects(portalName);
PortletRequestDispatcher rd = null;
@@ -94,7 +94,7 @@
}
}
- projectsHelper.prepareRequest(request);
+ ProjectsHelper.prepareRequest(request);
rd.include(request, response);
response.setTitle("Software map");
}
Modified: trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -42,12 +42,12 @@
throws IOException, PortletException {
response.setContentType("text/html");
- String projectId = projectsHelper.getSelectedProjectId(request);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
- String portalName = forgeHelper.getPortalName(request);
+ String portalName = ForgeHelper.getPortalName(request);
Projects projects = projectsHelper.getProjects(portalName);
- projectsHelper.prepareRequest(request);
+ ProjectsHelper.prepareRequest(request);
PortletRequestDispatcher rd;
Modified: trunk/forge/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -41,15 +41,15 @@
response.setContentType("text/html");
try {
- String portalName = forgeHelper.getPortalName(request);
+ String portalName = ForgeHelper.getPortalName(request);
Projects projects = projectsHelper.getProjects(portalName);
// Getting the selected project
- String projectId = projectsHelper.getSelectedProjectId(request);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
if (projectId == null) throw new Exception("1");
// Getting the selected category (null if no selected category)
- String categoryId = forgeHelper.getRequestParameter(request, "category");
+ String categoryId = ForgeHelper.getRequestParameter(request, "category");
// Getting the appropriate context
DelegateContext context = projects.getDownloadsContext(projectId, categoryId);
@@ -63,7 +63,7 @@
PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(
forgeHelper.createRepoAccessPath(portalName, DOWNLOADS_JSP));
- projectsHelper.prepareRequest(request);
+ ProjectsHelper.prepareRequest(request);
rd.include(request, response);
} catch (Exception e) {
response.getWriter().write("ERROR: "+e.getMessage());
Modified: trunk/forge/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -43,8 +43,8 @@
throws IOException, PortletException {
response.setContentType("text/html");
- String projectId = projectsHelper.getSelectedProjectId(request);
- String portalName = forgeHelper.getPortalName(request);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
+ String portalName = ForgeHelper.getPortalName(request);
Projects projects = projectsHelper.getProjects(portalName);
DelegateContext context = null;
@@ -62,8 +62,8 @@
rd = getPortletContext().getRequestDispatcher(
forgeHelper.createRepoAccessPath(portalName, INFO_JSP));
}
-
- projectsHelper.prepareRequest(request);
+
+ ProjectsHelper.prepareRequest(request);
rd.include(request, response);
}
}
Modified: trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml
===================================================================
--- trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-09-06 12:14:48 UTC (rev 1048)
@@ -218,33 +218,6 @@
<height>0</height>
</window>
</page>
-
- <page>
- <page-name>docs</page-name>
-
- <window>
- <window-name>NavigationPortletWindowDefaultDocs</window-name>
- <instance-ref>navigation.NavigationPortlet.NavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- <window-state>normal</window-state>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultDocs</window-name>
- <instance-ref>ads.AdsPortlet.AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- <window-state>normal</window-state>
- </window>
-
- <window>
- <window-name>PrjDocsPortletWindowDefaultDocs</window-name>
- <instance-ref>prj-docs.PrjDocsPortlet.PrjDocsPortletInstance</instance-ref>
- <default>true</default>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
<page>
<page-name>downloads</page-name>
|
|
From: <jbo...@li...> - 2005-09-06 06:53:56
|
Author: adamw
Date: 2005-09-06 02:53:53 -0400 (Tue, 06 Sep 2005)
New Revision: 1047
Modified:
trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java
Log:
Some comments
Modified: trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java
===================================================================
--- trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java 2005-09-05 21:45:40 UTC (rev 1046)
+++ trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java 2005-09-06 06:53:53 UTC (rev 1047)
@@ -6,6 +6,11 @@
import java.util.HashMap;
import java.util.Map;
+/**
+ * @author adamw
+ * An object holder which holds the object only for some time (by default,
+ * one day).
+ */
class ObjectWithTime {
private Object o;
private long time;
@@ -17,6 +22,10 @@
time = Calendar.getInstance().getTimeInMillis();
}
+ /**
+ * @return Object that is remembered by this instance or null
+ * if the object is held for longer then one day.
+ */
public Object get() {
long now = Calendar.getInstance().getTimeInMillis();
if (now - time > TIMEOUT)
@@ -86,6 +95,9 @@
try {
String[] p;
p = (String []) params.get(name);
+
+ if (p == null) return "null";
+
String ret = "";
for (int i=0; i<p.length; i++)
ret += p[i] + ", ";
@@ -99,6 +111,12 @@
}
}
+ /**
+ * Gets a string representation of all objects in the given
+ * array.
+ * @param a Array to convert.
+ * @return A string of the form: a[0] + ", " + a[1] + ....
+ */
public static String objectArrayToString(Object[] a) {
String ret = "";
for (int i=0; i<a.length; i++)
|
|
From: <jbo...@li...> - 2005-09-05 21:45:46
|
Author: adamw
Date: 2005-09-05 17:45:40 -0400 (Mon, 05 Sep 2005)
New Revision: 1046
Modified:
trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java
Log:
Cache with timeouts
Modified: trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java
===================================================================
--- trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java 2005-09-05 16:33:01 UTC (rev 1045)
+++ trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java 2005-09-05 21:45:40 UTC (rev 1046)
@@ -1,10 +1,31 @@
package pl.net.mamut.jira;
import java.lang.ref.SoftReference;
+import java.util.Calendar;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+class ObjectWithTime {
+ private Object o;
+ private long time;
+
+ private final static int TIMEOUT = 24*60*60*1000;
+
+ public ObjectWithTime(Object o) {
+ this.o = o;
+ time = Calendar.getInstance().getTimeInMillis();
+ }
+
+ public Object get() {
+ long now = Calendar.getInstance().getTimeInMillis();
+ if (now - time > TIMEOUT)
+ return null;
+
+ return o;
+ }
+}
+
/**
* @author adamw
* A simple SoftReference-based cache.
@@ -25,8 +46,13 @@
Object o = cache.get(key);
if (o == null)
return o;
- else
- return ((SoftReference) o).get();
+ else {
+ o = ((SoftReference) o).get();
+ if (o == null)
+ return o;
+
+ return ((ObjectWithTime) o).get();
+ }
}
/**
@@ -35,7 +61,7 @@
* @param o Value to put.
*/
public static void put(String key, Object o) {
- cache.put(key, new SoftReference(o));
+ cache.put(key, new SoftReference(new ObjectWithTime(o)));
}
/**
|
|
From: <jbo...@li...> - 2005-09-05 16:33:11
|
Author: adamw
Date: 2005-09-05 12:33:01 -0400 (Mon, 05 Sep 2005)
New Revision: 1045
Modified:
trunk/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java
trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java
Log:
Report bug fix
Modified: trunk/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java
===================================================================
--- trunk/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-09-05 15:56:44 UTC (rev 1044)
+++ trunk/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-09-05 16:33:01 UTC (rev 1045)
@@ -144,10 +144,7 @@
this.getClass().getName() +
Cache.cacheKey(params, "dateend") +
Cache.cacheKey(params, "period") +
- Cache.cacheKey(params, "types") +
- Cache.cacheKey(params, "priorities") +
- Cache.cacheKey(params, "projects") +
- Cache.cacheKey(params, "style");
+ Cache.cacheKey(params, "projects");
String ret = (String) Cache.get(cacheKey);
if (ret == null) {
Modified: trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java
===================================================================
--- trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-09-05 15:56:44 UTC (rev 1044)
+++ trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-09-05 16:33:01 UTC (rev 1045)
@@ -40,14 +40,14 @@
Properties properties = new Properties();
try {
- properties.load(
+ /*properties.load(
AbstractJiraTest.class.getResourceAsStream("jira_tests.properties"));
adminLogin = properties.getProperty("adminLogin");
adminPassword = properties.getProperty("adminPassword");
userLogin = properties.getProperty("userLogin");
userPassword = properties.getProperty("userPassword");
- host = properties.getProperty("host");
+ host = properties.getProperty("host");*/
adminLogin = "00testuser1";
adminPassword = "00TesTUseR1";
@@ -58,8 +58,8 @@
adminPassword = "adamw";
userLogin = "user1";
userPassword = "user1";
- host = "http://localhost:8080/jira";
- if (false) throw new IOException();*/
+ host = "http://localhost:8080/jira";*/
+ if (false) throw new IOException();
} catch (IOException e) {
adminLogin = null;
}
|
Author: adamw
Date: 2005-09-05 11:56:44 -0400 (Mon, 05 Sep 2005)
New Revision: 1044
Modified:
trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java
trunk/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java
trunk/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java
Log:
Further java 1.5 -> 1.4 fixes
Modified: trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java
===================================================================
--- trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java 2005-09-05 15:48:52 UTC (rev 1043)
+++ trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java 2005-09-05 15:56:44 UTC (rev 1044)
@@ -72,4 +72,12 @@
}
}
}
+
+ public static String objectArrayToString(Object[] a) {
+ String ret = "";
+ for (int i=0; i<a.length; i++)
+ ret += a[i].toString() + ", ";
+
+ return ret;
+ }
}
Modified: trunk/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java
===================================================================
--- trunk/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-09-05 15:48:52 UTC (rev 1043)
+++ trunk/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-09-05 15:56:44 UTC (rev 1044)
@@ -360,7 +360,7 @@
Cache.cacheKey(params, "showProj") +
Cache.cacheKey(params, "showUsers") +
Cache.cacheKey(params, "period") +
- Arrays.toString(
+ Cache.objectArrayToString(
permissionManager.getProjects(Permissions.BROWSE,
remoteUser).toArray());
String ret = (String) Cache.get(cacheKey);
Modified: trunk/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java
===================================================================
--- trunk/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-09-05 15:48:52 UTC (rev 1043)
+++ trunk/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-09-05 15:56:44 UTC (rev 1044)
@@ -151,7 +151,7 @@
this.getClass().getName() +
Cache.cacheKey(params, "endDate") +
Cache.cacheKey(params, "period") +
- Arrays.toString(
+ Cache.objectArrayToString(
permissionManager.getProjects(Permissions.BROWSE,
remoteUser).toArray());
String ret = (String) Cache.get(cacheKey);
|
|
From: <jbo...@li...> - 2005-09-05 15:49:16
|
Author: adamw
Date: 2005-09-05 11:48:52 -0400 (Mon, 05 Sep 2005)
New Revision: 1043
Modified:
trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java
Log:
Array to string fix
Modified: trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java
===================================================================
--- trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java 2005-09-05 15:38:17 UTC (rev 1042)
+++ trunk/jira-extensions/cache/src/java/pl/net/mamut/jira/Cache.java 2005-09-05 15:48:52 UTC (rev 1043)
@@ -1,7 +1,6 @@
package pl.net.mamut.jira;
import java.lang.ref.SoftReference;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -61,7 +60,10 @@
try {
String[] p;
p = (String []) params.get(name);
- return Arrays.toString(p);
+ String ret = "";
+ for (int i=0; i<p.length; i++)
+ ret += p[i] + ", ";
+ return ret;
} catch (ClassCastException e1) {
try {
return (String) params.get(name);
|
|
From: <jbo...@li...> - 2005-09-03 10:02:25
|
Author: adamw
Date: 2005-09-03 06:02:18 -0400 (Sat, 03 Sep 2005)
New Revision: 1041
Added:
trunk/forge/portal-extensions/forge-forums/scripts/fix.sql
Modified:
trunk/forge/portal-extensions/forge-forums/scripts/all.sql
trunk/forge/portal-extensions/forge-forums/scripts/conv.sql
Log:
Imporved scripts with null handling and poll import
Modified: trunk/forge/portal-extensions/forge-forums/scripts/all.sql
===================================================================
--- trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-09-02 16:19:50 UTC (rev 1040)
+++ trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-09-03 10:02:18 UTC (rev 1041)
@@ -4,7 +4,8 @@
\. portal-pure.sql
\. conv.sql
\. portal-keys.sql
+\. fix.sql
--- AFTER ADDING THE KEYS: UPDATING POST COUNT
--- UPDATE jbp_forums_posters posters SET posters.jbp_post_count = (SELECT COUNT(posts.jbp_id)
--- FROM jbp_forums_posts posts WHERE posts.jbp_poster_id = posters.jbp_id);
+-- TODO:
+-- - migrate topics watch
+-- - lost fields - what's with them?
Modified: trunk/forge/portal-extensions/forge-forums/scripts/conv.sql
===================================================================
--- trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-09-02 16:19:50 UTC (rev 1040)
+++ trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-09-03 10:02:18 UTC (rev 1041)
@@ -63,16 +63,28 @@
n.post_time, n.post_subject, n.post_text, n.enable_html,
n.poster_id FROM phpbb_posts n;
--- Hibernate doesn't like null-like dates.
-UPDATE jbp_forums_posts SET jbp_create_date='1970-01-01 00:00:00' WHERE jbp_create_date='0000-00-00 00:00:00';
-UPDATE jbp_forums_posts SET jbp_edit_date='1970-01-01 00:00:00' WHERE jbp_edit_date='0000-00-00 00:00:00';
+-- Copying pools
+INSERT INTO jbp_forums_polls (jbp_poll_id, jbp_title, jbp_length, jbp_creation_date)
+ SELECT n.vote_id, n.vote_text, n.vote_length, date(concat(n.vote_start, '-01-01'))
+ FROM phpbb_vote_desc n;
+UPDATE jbp_forums_topics SET jbp_poll =
+ (SELECT n.vote_id FROM phpbb_vote_desc n WHERE n.topic_id = jbp_id)
+ WHERE (SELECT COUNT(*) FROM phpbb_vote_desc n WHERE n.topic_id = jbp_id) = 1;
+
-- Copying pool options
+INSERT INTO jbp_forums_poll_option (jbp_poll_id, jbp_votes, jbp_question,
+ jbp_poll_option_position)
+ SELECT n.vote_desc_id, n.vote_result, n.vote_option_text,
+ (SELECT COUNT(jbp_poll_id) FROM jbp_forums_poll_option WHERE
+ jbp_poll_id = n.vote_desc_id)
+ FROM phpbb_vote_results n;
-- Copying pool votes
+INSERT INTO jbp_forums_poll_voted (jbp_poll_id, jbp_poll_voted)
+ SELECT n.vote_desc_id, n.vote_user_id
+ FROM phpbb_vote_voters n;
--- Copying pools
-
-- Updating the "admin" account to be the same as on labs.
UPDATE jbp_users SET jbp_password = "0E6C6B302E803D8F03C2906211D39486" WHERE jbp_uname = "admin";
Added: trunk/forge/portal-extensions/forge-forums/scripts/fix.sql
===================================================================
--- trunk/forge/portal-extensions/forge-forums/scripts/fix.sql 2005-09-02 16:19:50 UTC (rev 1040)
+++ trunk/forge/portal-extensions/forge-forums/scripts/fix.sql 2005-09-03 10:02:18 UTC (rev 1041)
@@ -0,0 +1,47 @@
+-- Hibernate doesn't like null-like dates.
+UPDATE jbp_forums_posts SET jbp_create_date='1970-01-01 00:00:00' WHERE jbp_create_date='0000-00-00 00:00:00';
+UPDATE jbp_forums_posts SET jbp_edit_date='1970-01-01 00:00:00' WHERE jbp_edit_date='0000-00-00 00:00:00';
+
+-- Portal doesn't like "null" here.
+UPDATE jbp_forums_forums SET jbp_prune_next=0 WHERE jbp_prune_next IS NULL;
+
+-- Deleting forums with no category.
+DELETE FROM jbp_forums_forums WHERE jbp_category_id IS NULL;
+
+-- Deleting posts with no topic.
+DELETE FROM jbp_forums_posts WHERE jbp_topic_id IS NULL;
+
+-- Inserting a "dummy" user which will be the poster of posts, topics with no poster.
+-- Nobody can log in as that user because his password is illegal - not a md5 hash.
+INSERT INTO jbp_users (jbp_uname, jbp_password, jbp_regdate, jbp_realemail, jbp_fakeemail,
+ jbp_viewrealemail, jbp_enabled) VALUES
+ ('Past user', 'A text that is not an md5 hash.', now(), 'no-email', 'no-email',
+ 0, 1);
+
+SET @dummy_user_id = (SELECT u.jbp_uid FROM jbp_users u WHERE u.jbp_uname = 'Past user');
+
+INSERT INTO jbp_forums_posters (jbp_id, jbp_user_id, jbp_post_count)
+ VALUES (@dummy_user_id, @dummy_user_id, 0);
+
+INSERT INTO jbp_role_membership (jbp_rid, jbp_uid) VALUES
+ (2, @dummy_user_id);
+
+-- Updating posts that have been posted by a null user to be posted by the dummy user just
+-- created.
+UPDATE jbp_forums_posts SET jbp_poster_id = @dummy_user_id WHERE jbp_poster_id IS NULL;
+
+-- Updating topics without a first post so they have the youngest post as a first post.
+UPDATE jbp_forums_topics t SET t.jbp_first_post_id =
+ (SELECT MIN(p.jbp_create_date) FROM jbp_forums_posts p WHERE p.jbp_topic_id = t.jbp_id)
+ WHERE t.jbp_first_post_id IS NULL;
+
+-- Deleting the topics without a first posts which haven't been successfully updated.
+DELETE FROM jbp_forums_topics WHERE jbp_first_post_id IS NULL;
+
+-- Updating topics that have been created by a null user to be created by the dummy user.
+UPDATE jbp_forums_topics SET jbp_poster = @dummy_user_id WHERE jbp_poster IS NULL;
+
+-- Updating post count
+UPDATE jbp_forums_posters posters SET posters.jbp_post_count = (SELECT COUNT(posts.jbp_id)
+FROM jbp_forums_posts posts WHERE posts.jbp_poster_id = posters.jbp_id);
+
|
|
From: <jbo...@li...> - 2005-09-02 16:19:58
|
Author: adamw
Date: 2005-09-02 12:19:50 -0400 (Fri, 02 Sep 2005)
New Revision: 1040
Modified:
trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
Log:
CSS from file-access in freezone
Modified: trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-09-02 15:20:58 UTC (rev 1039)
+++ trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-09-02 16:19:50 UTC (rev 1040)
@@ -23,235 +23,240 @@
* @author adamw
*/
public class Freezone extends JBossPortlet {
- /**
- * <code>DEFAULT_PAGE</code> - Name of the page that is displayed if no
- * page is selected.
- */
- private final static String DEFAULT_PAGE = "index.html";
-
- private ProjectsHelper projectsHelper;
- private ForgeHelper forgeHelper;
- private ContentManager cm;
-
- public void init() {
- projectsHelper = new ProjectsHelper();
- forgeHelper = new ForgeHelper();
- cm = forgeHelper.getContentManager("");
- }
-
- /**
- * In the given content, finds a first string of the form:
- * <link ... href=, and returns the text inside the reference.
- *
- * @param content
- * String in which to look for the reference.
- * @param refName
- * Name of the reference.
- * @return Text contained in the reference or null if no reference is found.
- */
- private String findNextReference(String content, String refName) {
- int h;
- int start;
- if (refName.equals("link")) {
- h = content.indexOf(" href="); //search for one of the link types
- if (h == -1)
- {
- return null;
- }
- else start = h;
- int begin = content.substring(start).indexOf('"');
- int end = content.substring(start + begin + 1).indexOf('"');
- begin += start;
- end += begin;
- return content.substring(begin + 1, end + 1);
- }
- else if(refName.equals("image"))
- {
- start=content.indexOf("<img src=");
- if (start == -1)
- return null;
- int begin = content.substring(start).indexOf('"');
- int end=content.substring(start+begin+1).indexOf('"');
- begin+=start; end+=begin;
- return content.substring(begin+1, end+1);}
- else
- return null;
- }
-
- /**
- * Figures out if a link is an off-site link. This recognizes the most
- * common protocols by checking how it starts. (clears all white space in
- * case the link starts with '\n' or [space]
- *
- * @author Janne Jalkanen
- */
- private boolean isExternalLink(String link) {
- link = link.trim();
- return link.startsWith("http:") || link.startsWith("ftp:")
- || link.startsWith("https:") || link.startsWith("mailto:")
- || link.startsWith("news:") || link.startsWith("file:");
- }
-
-// modifies path to page/resource so folder structure can be supported
- private String modifyPath(String path, String element) {
- int start, end;
- String mainPath = "";
- if (element.startsWith("#"))
- {
- return path+element;
-
- }
- else if (element.startsWith("./"))
- { System.out.println("found a match");
- element = element.substring(2);
- System.out.println("and element is now "+ element);
- }//ignore ./ only clutters the code
-
- int pre = path.lastIndexOf('/');
- if(pre== -1)//we are in root dir
- {
- return element;
- }
- else {
- mainPath = path.substring(0, pre);
- }//main path to page
-
-
- if (element.startsWith("/"))
- return element.substring(1); //base path, start with WEB-root
-
- if (element.indexOf('/') != -1) {
- if (element.indexOf("../") != -1)//need to go up a few levels
- {
- while (element.indexOf("../") != -1) //do we need to go more
- {
- if (mainPath.equals(""))
- return DEFAULT_PAGE; //trying to go too far up
- else {
- start = element.lastIndexOf("../");//go one level up
- end = mainPath.lastIndexOf("/");//find last level
- if(end == -1)
- {end = 0;} //we have reached last level
- element = element.substring(0, start)
- + element
- .substring(start + 3, element.length());
- mainPath = mainPath.substring(0, end);
-
- }//else
-
- }//while
-
- }//if ../
-
- }
-
- return mainPath + '/' + element;
- }
-
- public void doView(JBossRenderRequest request, JBossRenderResponse response)
- throws IOException {
- response.setContentType("text/html");
-
- try {
- String portalName = forgeHelper.getPortalName(request);
-
- // Getting the selected project
- 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,
- ForgeHelper.FREEZONE_SEPARATOR, "/");
-
- // If the tried to break into other files, denying access to him.
- if (pagePath.indexOf("..") != -1)
- throw new Exception();
-
- // Reading the file.
- String pageContent = cm.read(portalName + "/"
- + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"
- + ProjectsHelper.FREEZONE_DIR + "/" + pagePath);
- if (pageContent == null)
- throw new Exception();
-
- String nextRef;
- String nextRef2;
- String imagePrepend = "/file-access/" + portalName + "/"
- + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/";
- while(pageContent.indexOf("HREF=")!= -1)
- {
- pageContent = ForgeHelper.replace(pageContent,"HREF=", "href=");
- }
-
- while(pageContent.indexOf("<IMG SRC=")!= -1)
- {
- pageContent = ForgeHelper.replace(pageContent,"<IMG SRC=", "<img src=");
- }
-
-// Replacing links
- while ((nextRef = findNextReference(pageContent, "link")) != null) {
- if(!isExternalLink(nextRef))
- {
- //it would be relative not outside link
- nextRef2 = modifyPath(pagePath, nextRef);
- if(nextRef2.endsWith(".png"))
- {
- nextRef2=imagePrepend+nextRef2+"\" target=\"_blank\"";
- pageContent = ForgeHelper.replace(pageContent,"href="
- + '"' + nextRef + '"', "*ref="+'"'+ nextRef2);
- }
- else
- pageContent = ForgeHelper.replace(pageContent, "href="
- + '"' + nextRef + '"',
- ProjectsHelper.createFreezonePageLink(portalName,
- projectId, nextRef2+'"'));
- }
- else {
- pageContent = ForgeHelper.replace(pageContent, "href="
- + '"' + nextRef, "$"+nextRef+'"');
- }
- }
-
- // Replacing images
- while ((nextRef = findNextReference(pageContent, "image")) != null)
- {
- nextRef2 = modifyPath(pagePath, nextRef);
- pageContent = ForgeHelper.replace(pageContent, "<img src="+'"'
- + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef2+'"');}
-
- //fix back internal links
- while (pageContent.indexOf("*ref=") != -1)
- pageContent = ForgeHelper.replace(pageContent,
- "*ref=", " href=" );
-
- while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1)
- pageContent = ForgeHelper.replace(pageContent,
- " /portal/index.html?ctrl:id", " href=" + '"'
- + "/portal/index.html?ctrl:id");
-
- //fix back external links
-
- while (pageContent.indexOf("$http:") != -1
- || pageContent.indexOf("$ftp:") != -1
- || pageContent.indexOf("$https:") != -1
- || pageContent.indexOf("$file:") != -1
- || pageContent.indexOf("$mailto:") != -1
- || pageContent.indexOf("$news:") != -1)
- {pageContent = ForgeHelper.replace(pageContent, "$",
- " href=" + '"');}
- //fix back image links
- while (pageContent.indexOf("*img src=") != -1 )
- {pageContent = ForgeHelper.replace(pageContent, "*img src=",
- "<img src=");}
-
- response.getWriter().write(pageContent);
- } catch (Exception e) {
- e.printStackTrace();
- response.getWriter().write(
- "The page you requested cannot be accessed ");
- }
- }
+ /**
+ * <code>DEFAULT_PAGE</code> - Name of the page that is displayed if no
+ * page is selected.
+ */
+ private final static String DEFAULT_PAGE = "index.html";
+
+ private ProjectsHelper projectsHelper;
+
+ private ForgeHelper forgeHelper;
+
+ private ContentManager cm;
+
+ public void init() {
+ projectsHelper = new ProjectsHelper();
+ forgeHelper = new ForgeHelper();
+ cm = forgeHelper.getContentManager("");
+ }
+
+ /**
+ * In the given content, finds a first string of the form: <link ... href=,
+ * and returns the text inside the reference.
+ *
+ * @param content
+ * String in which to look for the reference.
+ * @param refName
+ * Name of the reference.
+ * @return Text contained in the reference or null if no reference is found.
+ */
+ private String findNextReference(String content, String refName) {
+ int h;
+ int start;
+ if (refName.equals("link")) {
+ h = content.indexOf(" href="); // search for one of the link types
+ if (h == -1) {
+ return null;
+ } else
+ start = h;
+ int begin = content.substring(start).indexOf('"');
+ int end = content.substring(start + begin + 1).indexOf('"');
+ begin += start;
+ end += begin;
+ return content.substring(begin + 1, end + 1);
+ } else if (refName.equals("image")) {
+ start = content.indexOf("<img src=");
+ if (start == -1)
+ return null;
+ int begin = content.substring(start).indexOf('"');
+ int end = content.substring(start + begin + 1).indexOf('"');
+ begin += start;
+ end += begin;
+ return content.substring(begin + 1, end + 1);
+ } else
+ return null;
+ }
+
+ /**
+ * Figures out if a link is an off-site link. This recognizes the most
+ * common protocols by checking how it starts. (clears all white space in
+ * case the link starts with '\n' or [space]
+ *
+ * @author Janne Jalkanen
+ */
+ private boolean isExternalLink(String link) {
+ link = link.trim();
+ return link.startsWith("http:") || link.startsWith("ftp:")
+ || link.startsWith("https:") || link.startsWith("mailto:")
+ || link.startsWith("news:") || link.startsWith("file:");
+ }
+
+ // modifies path to page/resource so folder structure can be supported
+ private String modifyPath(String path, String element) {
+ int start, end;
+ String mainPath = "";
+ if (element.startsWith("#")) {
+ return path + element;
+
+ } else if (element.startsWith("./")) {
+ System.out.println("found a match");
+ element = element.substring(2);
+ System.out.println("and element is now " + element);
+ }// ignore ./ only clutters the code
+
+ int pre = path.lastIndexOf('/');
+ if (pre == -1)// we are in root dir
+ {
+ return element;
+ } else {
+ mainPath = path.substring(0, pre);
+ }// main path to page
+
+ if (element.startsWith("/"))
+ return element.substring(1); // base path, start with WEB-root
+
+ if (element.indexOf('/') != -1) {
+ if (element.indexOf("../") != -1)// need to go up a few levels
+ {
+ while (element.indexOf("../") != -1) // do we need to go more
+ {
+ if (mainPath.equals(""))
+ return DEFAULT_PAGE; // trying to go too far up
+ else {
+ start = element.lastIndexOf("../");// go one level up
+ end = mainPath.lastIndexOf("/");// find last level
+ if (end == -1) {
+ end = 0;
+ } // we have reached last level
+ element = element.substring(0, start)
+ + element
+ .substring(start + 3, element.length());
+ mainPath = mainPath.substring(0, end);
+
+ }// else
+
+ }// while
+
+ }// if ../
+
+ }
+
+ return mainPath + '/' + element;
+ }
+
+ public void doView(JBossRenderRequest request, JBossRenderResponse response)
+ throws IOException {
+ response.setContentType("text/html");
+
+ try {
+ String portalName = forgeHelper.getPortalName(request);
+
+ // Getting the selected project
+ 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,
+ ForgeHelper.FREEZONE_SEPARATOR, "/");
+
+ // If the tried to break into other files, denying access to him.
+ if (pagePath.indexOf("..") != -1)
+ throw new Exception();
+
+ // Reading the file.
+ String pageContent = cm.read(portalName + "/"
+ + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"
+ + ProjectsHelper.FREEZONE_DIR + "/" + pagePath);
+ if (pageContent == null)
+ throw new Exception();
+
+ String nextRef;
+ String nextRef2;
+ String fileAccessPrepend = "/file-access/" + portalName + "/"
+ + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"
+ + ProjectsHelper.FREEZONE_DIR + "/";
+ while (pageContent.indexOf("HREF=") != -1) {
+ pageContent = ForgeHelper
+ .replace(pageContent, "HREF=", "href=");
+ }
+
+ while (pageContent.indexOf("<IMG SRC=") != -1) {
+ pageContent = ForgeHelper.replace(pageContent, "<IMG SRC=",
+ "<img src=");
+ }
+
+ // Replacing links
+ while ((nextRef = findNextReference(pageContent, "link")) != null) {
+ if (!isExternalLink(nextRef)) {
+ // it would be relative not outside link
+ nextRef2 = modifyPath(pagePath, nextRef);
+ if (nextRef2.endsWith(".png")) {
+ nextRef2 = fileAccessPrepend + nextRef2
+ + "\" target=\"_blank\"";
+ pageContent = ForgeHelper
+ .replace(pageContent, "href=" + '"' + nextRef
+ + '"', "*ref=" + '"' + nextRef2);
+ } if (nextRef2.endsWith(".css")) {
+ nextRef2 = fileAccessPrepend + nextRef2 + "\"";
+ pageContent = ForgeHelper
+ .replace(pageContent, "href=" + '"' + nextRef
+ + '"', "*ref=" + '"' + nextRef2);
+ } else
+ pageContent = ForgeHelper.replace(pageContent, "href="
+ + '"' + nextRef + '"', ProjectsHelper
+ .createFreezonePageLink(portalName, projectId,
+ nextRef2 + '"'));
+ } else {
+ pageContent = ForgeHelper.replace(pageContent, "href="
+ + '"' + nextRef, "$" + nextRef + '"');
+ }
+ }
+
+ // Replacing images
+ while ((nextRef = findNextReference(pageContent, "image")) != null) {
+ nextRef2 = modifyPath(pagePath, nextRef);
+ pageContent = ForgeHelper.replace(pageContent, "<img src="
+ + '"' + nextRef + '"', "*img src=" + '"' + fileAccessPrepend
+ + nextRef2 + '"');
+ }
+
+ // fix back internal links
+ while (pageContent.indexOf("*ref=") != -1)
+ pageContent = ForgeHelper.replace(pageContent, "*ref=",
+ " href=");
+
+ while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1)
+ pageContent = ForgeHelper.replace(pageContent,
+ " /portal/index.html?ctrl:id", " href=" + '"'
+ + "/portal/index.html?ctrl:id");
+
+ // fix back external links
+
+ while (pageContent.indexOf("$http:") != -1
+ || pageContent.indexOf("$ftp:") != -1
+ || pageContent.indexOf("$https:") != -1
+ || pageContent.indexOf("$file:") != -1
+ || pageContent.indexOf("$mailto:") != -1
+ || pageContent.indexOf("$news:") != -1) {
+ pageContent = ForgeHelper.replace(pageContent, "$",
+ " href=" + '"');
+ }
+ // fix back image links
+ while (pageContent.indexOf("*img src=") != -1) {
+ pageContent = ForgeHelper.replace(pageContent, "*img src=",
+ "<img src=");
+ }
+
+ response.getWriter().write(pageContent);
+ } catch (Exception e) {
+ e.printStackTrace();
+ response.getWriter().write(
+ "The page you requested cannot be accessed ");
+ }
+ }
}
|
|
From: <jbo...@li...> - 2005-09-02 15:21:07
|
Author: adamw Date: 2005-09-02 11:20:58 -0400 (Fri, 02 Sep 2005) New Revision: 1039 Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/FreezoneURLTag.java Log: Missing file for freezone tag Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/FreezoneURLTag.java =================================================================== --- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/FreezoneURLTag.java 2005-09-02 15:03:56 UTC (rev 1038) +++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/FreezoneURLTag.java 2005-09-02 15:20:58 UTC (rev 1039) @@ -0,0 +1,54 @@ +/***************************************** + * * + * 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.JspTagException; +import javax.servlet.jsp.tagext.BodyTagSupport; + +import org.jboss.forge.common.ForgeHelper; + +public class FreezoneURLTag extends BodyTagSupport { + private String page; + + public int doStartTag() throws JspException { + try { + pageContext.getOut().write(ForgeHelper.createFreezonePageLink( + (String) pageContext.getRequest().getAttribute( + ForgeHelper.PORTAL_NAME), + page)); + } catch (IOException e) { + throw new JspException(e); + } + + return EVAL_BODY_BUFFERED; + } + + public int doAfterBody() throws JspTagException { + return SKIP_BODY; + } + + public int doEndTag() { + return EVAL_PAGE; + } + + public void release() { + page = null; + } + + public String getPage() { + return page; + } + + public void setPage(String page) { + this.page = page; + } +} |
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>
|
|
From: <jbo...@li...> - 2005-09-02 09:24:00
|
Author: szimano
Date: 2005-09-02 05:23:53 -0400 (Fri, 02 Sep 2005)
New Revision: 1037
Modified:
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java
Log:
test was worng due to dir structure change
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java 2005-09-02 09:10:29 UTC (rev 1036)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java 2005-09-02 09:23:53 UTC (rev 1037)
@@ -28,7 +28,7 @@
public void testParseLinks() {
FileReader fin = null;
HTMLTranslator tr = new HTMLTranslator();
- File dir = new File("data");
+ File dir = new File("../data");
// The list of files can also be retrieved as File objects
File[] files = null;
|
Author: adamw
Date: 2005-09-01 16:13:46 -0400 (Thu, 01 Sep 2005)
New Revision: 1034
Modified:
trunk/forge/portal-extensions/blojsom/maven.xml
trunk/forge/portal-extensions/federation-register/maven.xml
trunk/forge/portal-extensions/forge-ads/maven.xml
trunk/forge/portal-extensions/forge-blog/maven.xml
trunk/forge/portal-extensions/forge-common/maven.xml
trunk/forge/portal-extensions/forge-contributor/maven.xml
trunk/forge/portal-extensions/forge-file-access/maven.xml
trunk/forge/portal-extensions/forge-forums/maven.xml
trunk/forge/portal-extensions/forge-info/maven.xml
trunk/forge/portal-extensions/forge-jspwiki/maven.xml
trunk/forge/portal-extensions/forge-login/maven.xml
trunk/forge/portal-extensions/forge-map/maven.xml
trunk/forge/portal-extensions/forge-navigation/maven.xml
trunk/forge/portal-extensions/forge-portal-attr/maven.xml
trunk/forge/portal-extensions/forge-prj-blog/maven.xml
trunk/forge/portal-extensions/forge-prj-docs/maven.xml
trunk/forge/portal-extensions/forge-prj-downloads/maven.xml
trunk/forge/portal-extensions/forge-prj-freezone/maven.xml
trunk/forge/portal-extensions/forge-prj-info/maven.xml
trunk/forge/portal-extensions/forge-root-redirect/maven.xml
trunk/forge/portal-extensions/forge-service/maven.xml
trunk/forge/portal-extensions/forge-theme/maven.xml
trunk/forge/portal-extensions/jspwiki/maven.xml
trunk/forge/portal-extensions/maven.xml
trunk/forge/portal-extensions/mysql-connector/maven.xml
trunk/forge/portal-extensions/portal-default/maven.xml
trunk/forge/portal-extensions/portal-federation/maven.xml
Log:
Clean goal fixed
Modified: trunk/forge/portal-extensions/blojsom/maven.xml
===================================================================
--- trunk/forge/portal-extensions/blojsom/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/blojsom/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -16,6 +16,10 @@
</goal>
+ <goal name="clean">
+
+ </goal>
+
<goal name="prj-install">
<ant:copy todir="${local.deploy.dir}" overwrite="no">
<ant:fileset dir="to-copy" />
Modified: trunk/forge/portal-extensions/federation-register/maven.xml
===================================================================
--- trunk/forge/portal-extensions/federation-register/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/federation-register/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-ads/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-ads/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-ads/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-blog/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-blog/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-blog/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-common/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-common/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-common/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -7,6 +7,10 @@
<goal name="all">
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
<goal name="build">
<attainGoal name="jar" />
Modified: trunk/forge/portal-extensions/forge-contributor/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-contributor/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-contributor/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-file-access/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-file-access/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-file-access/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-forums/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-forums/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-forums/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -10,6 +10,9 @@
</ant:copy>
</goal>
+ <goal name="clean">
+ </goal>
+
<goal name="all">
</goal>
Modified: trunk/forge/portal-extensions/forge-info/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-info/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-info/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-jspwiki/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-jspwiki/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-jspwiki/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -7,6 +7,10 @@
<goal name="all">
</goal>
+
+ <goal name="clean">
+
+ </goal>
<goal name="build">
<!--<attainGoal name="copy-tld" />
Modified: trunk/forge/portal-extensions/forge-login/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-login/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-login/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -7,6 +7,10 @@
<goal name="all">
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
<goal name="build">
<attainGoal name="jar" />
Modified: trunk/forge/portal-extensions/forge-map/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-map/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-map/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-navigation/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-navigation/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-navigation/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-portal-attr/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-portal-attr/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-portal-attr/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -9,6 +9,11 @@
<goal name="all">
</goal>
+
+ <goal name="clean">
+ <ant:delete dir="${maven.build.dir}"/>
+ <ant:delete dir="${maven.build.dest}"/>
+ </goal>
<goal name="build">
<attainGoal name="jar" />
Modified: trunk/forge/portal-extensions/forge-prj-blog/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-prj-blog/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-prj-blog/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-prj-docs/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-prj-docs/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-prj-docs/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-prj-downloads/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-prj-downloads/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-prj-downloads/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-prj-freezone/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-prj-freezone/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-prj-freezone/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-prj-info/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-prj-info/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-prj-info/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-root-redirect/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-root-redirect/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-root-redirect/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: trunk/forge/portal-extensions/forge-service/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-service/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-service/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -7,6 +7,10 @@
<goal name="all">
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
<goal name="build">
<attainGoal name="ejb" />
Modified: trunk/forge/portal-extensions/forge-theme/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-theme/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/forge-theme/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -16,8 +16,13 @@
<goal name="all">
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
<goal name="build">
+ <attainGoal name="jar" />
</goal>
<goal name="deploy">
Modified: trunk/forge/portal-extensions/jspwiki/maven.xml
===================================================================
--- trunk/forge/portal-extensions/jspwiki/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/jspwiki/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -4,6 +4,9 @@
See terms of license at gnu.org.
-->
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+ <goal name="clean">
+ </goal>
+
<goal name="build">
<!--<ant:ant dir="${basedir}" antfile="build.xml" target="war" />-->
</goal>
Modified: trunk/forge/portal-extensions/maven.xml
===================================================================
--- trunk/forge/portal-extensions/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -27,6 +27,11 @@
</ant:fileset>
</ant:copy>
</goal>
+
+ <goal name="prj-clean">
+ <ant:delete dir="${maven.build.dir}"/>
+ <ant:delete dir="${maven.build.dest}"/>
+ </goal>
<!-- A convenience goal that redeploys only one project -->
<goal name="prj-all">
Modified: trunk/forge/portal-extensions/mysql-connector/maven.xml
===================================================================
--- trunk/forge/portal-extensions/mysql-connector/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/mysql-connector/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -12,6 +12,10 @@
</goal>
+ <goal name="clean">
+
+ </goal>
+
<goal name="prj-install">
<ant:copy
file="mysql-connector-java-3.1.10-bin.jar"
Modified: trunk/forge/portal-extensions/portal-default/maven.xml
===================================================================
--- trunk/forge/portal-extensions/portal-default/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/portal-default/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -14,6 +14,10 @@
<attainGoal name="war" />
</goal>
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
+
<goal name="deploy">
<!--<ant:touch>
<ant:fileset dir="${local.deploy.dir}/jboss-portal.sar">
Modified: trunk/forge/portal-extensions/portal-federation/maven.xml
===================================================================
--- trunk/forge/portal-extensions/portal-federation/maven.xml 2005-09-01 08:51:00 UTC (rev 1033)
+++ trunk/forge/portal-extensions/portal-federation/maven.xml 2005-09-01 20:13:46 UTC (rev 1034)
@@ -17,4 +17,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
|
|
From: <jbo...@li...> - 2005-09-01 08:54:37
|
Author: aron.gombas
Date: 2005-09-01 04:51:00 -0400 (Thu, 01 Sep 2005)
New Revision: 1033
Modified:
trunk/labs/kosmos/conf-portlet/jboss-portal/kosmos-pages.xml
trunk/labs/kosmos/conf-portlet/jboss-portal/portlet-instances.xml
Log:
Instance names standardized
Modified: trunk/labs/kosmos/conf-portlet/jboss-portal/kosmos-pages.xml
===================================================================
--- trunk/labs/kosmos/conf-portlet/jboss-portal/kosmos-pages.xml 2005-09-01 08:50:33 UTC (rev 1032)
+++ trunk/labs/kosmos/conf-portlet/jboss-portal/kosmos-pages.xml 2005-09-01 08:51:00 UTC (rev 1033)
@@ -5,7 +5,7 @@
<window>
<window-name>LocalCcMonitoring</window-name>
- <instance-ref>kosmos-portal.LocalCcMonitoringPortlet.LocalCcMonitoringPortlet_</instance-ref>
+ <instance-ref>kosmos-portal.LocalCcMonitoringPortlet.LocalCcMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>center</region>
<height>0</height>
@@ -13,7 +13,7 @@
<window>
<window-name>AtlassianJiraMonitoring</window-name>
- <instance-ref>kosmos-portal.AtlassianJiraMonitoringPortlet.AtlassianJiraMonitoringPortlet_</instance-ref>
+ <instance-ref>kosmos-portal.AtlassianJiraMonitoringPortlet.AtlassianJiraMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>center</region>
<height>1</height>
@@ -21,7 +21,7 @@
<window>
<window-name>CodehausJiraMonitoring</window-name>
- <instance-ref>kosmos-portal.CodehausJiraMonitoringPortlet.CodehausJiraMonitoringPortlet_</instance-ref>
+ <instance-ref>kosmos-portal.CodehausJiraMonitoringPortlet.CodehausJiraMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>center</region>
<height>2</height>
@@ -29,7 +29,7 @@
<window>
<window-name>JBossJiraMonitoring</window-name>
- <instance-ref>kosmos-portal.JBossJiraMonitoringPortlet.JBossJiraMonitoringPortlet_</instance-ref>
+ <instance-ref>kosmos-portal.JBossJiraMonitoringPortlet.JBossJiraMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>center</region>
<height>3</height>
@@ -37,7 +37,7 @@
<window>
<window-name>KosmosDependenciesSfMonitoring</window-name>
- <instance-ref>kosmos-portal.KosmosDependenciesSfMonitoringPortlet.KosmosDependenciesSfMonitoringPortlet_</instance-ref>
+ <instance-ref>kosmos-portal.KosmosDependenciesSfMonitoringPortlet.KosmosDependenciesSfMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>left</region>
<height>0</height>
@@ -45,7 +45,7 @@
<window>
<window-name>KosmosToolsSfMonitoring</window-name>
- <instance-ref>kosmos-portal.KosmosToolsSfMonitoringPortlet.KosmosToolsSfMonitoringPortlet_</instance-ref>
+ <instance-ref>kosmos-portal.KosmosToolsSfMonitoringPortlet.KosmosToolsSfMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>left</region>
<height>1</height>
@@ -53,7 +53,7 @@
<window>
<window-name>JBossProductsSfMonitoring</window-name>
- <instance-ref>kosmos-portal.JBossProductsSfMonitoringPortlet.JBossProductsSfMonitoringPortlet_</instance-ref>
+ <instance-ref>kosmos-portal.JBossProductsSfMonitoringPortlet.JBossProductsSfMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>left</region>
<height>2</height>
@@ -61,7 +61,7 @@
<window>
<window-name>ApacheSvnMonitoringPortlet</window-name>
- <instance-ref>kosmos-portal.ApacheSvnMonitoringPortlet.ApacheSvnMonitoringPortlet_</instance-ref>
+ <instance-ref>kosmos-portal.ApacheSvnMonitoringPortlet.ApacheSvnMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>right</region>
<height>0</height>
@@ -69,7 +69,7 @@
<window>
<window-name>JBossSvnMonitoringPortlet</window-name>
- <instance-ref>kosmos-portal.JBossSvnMonitoringPortlet.JBossSvnMonitoringPortlet_</instance-ref>
+ <instance-ref>kosmos-portal.JBossSvnMonitoringPortlet.JBossSvnMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>right</region>
<height>1</height>
Modified: trunk/labs/kosmos/conf-portlet/jboss-portal/portlet-instances.xml
===================================================================
--- trunk/labs/kosmos/conf-portlet/jboss-portal/portlet-instances.xml 2005-09-01 08:50:33 UTC (rev 1032)
+++ trunk/labs/kosmos/conf-portlet/jboss-portal/portlet-instances.xml 2005-09-01 08:51:00 UTC (rev 1033)
@@ -1,39 +1,39 @@
<?xml version="1.0" standalone="yes"?>
<instances>
<instance>
- <instance-name>LocalCcMonitoringPortlet_</instance-name>
+ <instance-name>LocalCcMonitoringPortletInstance</instance-name>
<component-ref>LocalCcMonitoringPortlet</component-ref>
</instance>
<instance>
- <instance-name>AtlassianJiraMonitoringPortlet_</instance-name>
+ <instance-name>AtlassianJiraMonitoringPortletInstance</instance-name>
<component-ref>AtlassianJiraMonitoringPortlet</component-ref>
</instance>
<instance>
- <instance-name>CodehausJiraMonitoringPortlet_</instance-name>
+ <instance-name>CodehausJiraMonitoringPortletInstance</instance-name>
<component-ref>CodehausJiraMonitoringPortlet</component-ref>
</instance>
<instance>
- <instance-name>JBossJiraMonitoringPortlet_</instance-name>
+ <instance-name>JBossJiraMonitoringPortletInstance</instance-name>
<component-ref>JBossJiraMonitoringPortlet</component-ref>
</instance>
<instance>
- <instance-name>KosmosDependenciesSfMonitoringPortlet_</instance-name>
+ <instance-name>KosmosDependenciesSfMonitoringPortletInstance</instance-name>
<component-ref>KosmosDependenciesSfMonitoringPortlet</component-ref>
</instance>
<instance>
- <instance-name>KosmosToolsSfMonitoringPortlet_</instance-name>
+ <instance-name>KosmosToolsSfMonitoringPortletInstance</instance-name>
<component-ref>KosmosToolsSfMonitoringPortlet</component-ref>
</instance>
<instance>
- <instance-name>JBossProductsSfMonitoringPortlet_</instance-name>
+ <instance-name>JBossProductsSfMonitoringPortletInstance</instance-name>
<component-ref>JBossProductsSfMonitoringPortlet</component-ref>
</instance>
<instance>
- <instance-name>ApacheSvnMonitoringPortlet_</instance-name>
+ <instance-name>ApacheSvnMonitoringPortletInstance</instance-name>
<component-ref>ApacheSvnMonitoringPortlet</component-ref>
</instance>
<instance>
- <instance-name>JBossSvnMonitoringPortlet_</instance-name>
+ <instance-name>JBossSvnMonitoringPortletInstance</instance-name>
<component-ref>JBossSvnMonitoringPortlet</component-ref>
</instance>
</instances>
|
|
From: <jbo...@li...> - 2005-09-01 08:50:41
|
Author: aron.gombas
Date: 2005-09-01 04:50:33 -0400 (Thu, 01 Sep 2005)
New Revision: 1032
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/model/Identified.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/model/JiraProject.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/model/SfRelease.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/model/SvnRepository.java
Log:
Improved "persistent" IDs, fix for KOSMOS-13 bug
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java 2005-09-01 07:54:49 UTC (rev 1031)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java 2005-09-01 08:50:33 UTC (rev 1032)
@@ -38,8 +38,18 @@
/** URL of the tests-per-category chart image. */
private String testsPerCategoryChartUrl;
+
+ /**
+ * By design this should be private to avoid instantiation
+ * without discriminator, but Hessian needs default ctor.
+ */
+ public CcProject() {
+ super(null);
+ }
public CcProject(String name, String buildLabel, int status, Date timestamp, int modifications, String buildTime, int tests, int errors, int failures, String testsPerCategoryChartUrl) {
+ super(name + buildLabel + timestamp.getTime());
+
this.name = name;
this.buildLabel = buildLabel;
this.status = status;
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/Identified.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/model/Identified.java 2005-09-01 07:54:49 UTC (rev 1031)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/model/Identified.java 2005-09-01 08:50:33 UTC (rev 1032)
@@ -8,25 +8,29 @@
import java.util.Collection;
import java.util.Iterator;
-import java.util.UUID;
/**
* Each identifiable entity class should extend this.
- * It uses the <code>java.util.UUID</code> to generate unique
- * identifiers for each object.
+ * The identifiable classes must pass a discriminator String to its ctor,
+ * that will be used to generate the integer ID.
*
* @author <a href="mailto:aro...@mi...">Aron Gombas</a>
* @version $Id$
*/
public abstract class Identified {
/** Unique identifier. */
- private String id;// TODO this should be "UUID" type, but Hessian can't handle that
+ private int id;
- public Identified() {
- this.id = UUID.randomUUID().toString();
+ /**
+ * @param discriminator must be unique and will be used to generate the integer ID.
+ * @see #getId()
+ */
+ public Identified(String discriminator) {
+ // TODO if a simple Object.hashCode() doesn't work in practice, try a more intelligent hash (MD5?) from the crypto package
+ this.id = (discriminator == null) ? 0 : discriminator.hashCode();
}
- public String getId() {
+ public int getId() {
return id;
}
@@ -34,14 +38,25 @@
* Returns the <code>Identified</code> object from a collection
* by using a simple linear search, or <code>null</code> if not found.
*/
- public static Identified findInCollection(Collection<? extends Identified> items, String id) {
+ public static Identified findInCollection(Collection<? extends Identified> items, int id) {
Iterator<? extends Identified> it = items.iterator();
while(it.hasNext()) {
Identified item = it.next();
- if(item.getId().equals(id))
+ if(item.getId() == id)
return item;
}
return null;
}
+
+ /**
+ * Returns the <code>Identified</code> object from a collection.
+ * It receives the ID as String, so can be passed from request
+ * params directly.
+ *
+ * @see #findInCollection(Collection, int)
+ */
+ public static Identified findInCollection(Collection<? extends Identified> items, String id) {
+ return findInCollection(items, Integer.parseInt(id));
+ }
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/JiraProject.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/model/JiraProject.java 2005-09-01 07:54:49 UTC (rev 1031)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/model/JiraProject.java 2005-09-01 08:50:33 UTC (rev 1032)
@@ -54,8 +54,18 @@
/** URL of the open-issues-per-assignee chart image. */
private String openIssuesPerAssigneeChartUrl;
+ /**
+ * By design this should be private to avoid instantiation
+ * without discriminator, but Hessian needs default ctor.
+ */
+ public JiraProject() {
+ super(null);
+ }
+
public JiraProject(String name, String url, String key, String projectUrl, String description, String lead, int openIssues, int codingInProgressIssues, int reopenedIssues, int resolvedIssues, int closedIssues, int blockerOpenIssues, int criticalOpenIssues, int majorOpenIssues, int minorOpenIssues, int trivialOpenIssues, int optionalOpenIssues, List<Map.Entry<String,Integer>> issuesPerAssignee, String issuesPerStatusChartUrl, String openIssuesPerPriorityChartUrl, String openIssuesPerAssigneeChartUrl) {
- this.name = name;
+ super(name + url + key + projectUrl);
+
+ this.name = name;
this.url = url;
this.key = key;
this.projectUrl = projectUrl;
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/SfRelease.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/model/SfRelease.java 2005-09-01 07:54:49 UTC (rev 1031)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/model/SfRelease.java 2005-09-01 08:50:33 UTC (rev 1032)
@@ -26,8 +26,18 @@
/** Release date. */
private Date date;
+ /**
+ * By design this should be private to avoid instantiation
+ * without discriminator, but Hessian needs default ctor.
+ */
+ public SfRelease() {
+ super(null);
+ }
+
public SfRelease(String packageName, String packageUrl, String version, String versionUrl, Date date) {
- this.packageName = packageName;
+ super(packageName + version + date.getTime());
+
+ this.packageName = packageName;
this.packageUrl = packageUrl;
this.version = version;
this.versionUrl = versionUrl;
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/SvnRepository.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/model/SvnRepository.java 2005-09-01 07:54:49 UTC (rev 1031)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/model/SvnRepository.java 2005-09-01 08:50:33 UTC (rev 1032)
@@ -62,8 +62,18 @@
/** Commits-per-file sorted by commits in descending order. */
private List<Map.Entry<String,Integer>> commitsPerFile;
+ /**
+ * By design this should be private to avoid instantiation
+ * without discriminator, but Hessian needs default ctor.
+ */
+ public SvnRepository() {
+ super(null);
+ }
+
public SvnRepository(String location, long revision, Date createdDate, Date latestTouchDate, String latestTouchAuthor, String latestTouchMessage, int commitsTotal, int commitsToday, int commitsLast7Days, int commitsLast31Days, String commitsPerAuthorChartUrl, String commitsPerFileChartUrl, String commitsPerWeekChartUrl, String repoEntriesPerWeekChartUrl, int dirs, int files, int totalFileSize, List<Map.Entry<String,Integer>> commitsPerAuthor, List<Map.Entry<String,Integer>> commitsPerFile) {
- this.location = location;
+ super(location + revision + latestTouchDate.getTime());
+
+ this.location = location;
this.revision = revision;
this.createdDate = createdDate;
|
|
From: <jbo...@li...> - 2005-09-01 07:59:42
|
Author: aron.gombas Date: 2005-09-01 03:54:49 -0400 (Thu, 01 Sep 2005) New Revision: 1031 Modified: trunk/labs/kosmos/web-server/WEB-INF/lib/saxon8-dom.jar trunk/labs/kosmos/web-server/WEB-INF/lib/saxon8.jar trunk/labs/kosmos/web-server/WEB-INF/lib/spring.jar Log: Dependencies updated Modified: trunk/labs/kosmos/web-server/WEB-INF/lib/saxon8-dom.jar =================================================================== (Binary files differ) Modified: trunk/labs/kosmos/web-server/WEB-INF/lib/saxon8.jar =================================================================== (Binary files differ) Modified: trunk/labs/kosmos/web-server/WEB-INF/lib/spring.jar =================================================================== (Binary files differ) |
Author: dam...@jb... Date: 2005-08-31 13:36:49 -0400 (Wed, 31 Aug 2005) New Revision: 1029 Added: prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/ prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js Removed: prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js Modified: prod/forge/portal-extensions/forge-forums/scripts/all.sql prod/forge/portal-extensions/forge-forums/scripts/conv.sql prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp Log: MERGED: -r 1025:1028 https://svn.labs.jboss.com/qa/forge into prod/forge which adds Eloqua tracking. Modified: prod/forge/portal-extensions/forge-forums/scripts/all.sql =================================================================== --- prod/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-31 17:06:41 UTC (rev 1028) +++ prod/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-31 17:36:49 UTC (rev 1029) @@ -6,8 +6,5 @@ \. portal-keys.sql -- AFTER ADDING THE KEYS: UPDATING POST COUNT - --- ANY IDEAS WHY THIS ISN'T WORKING? ---UPDATE jbp_forums_posters posters SET posters.jbp_post_count = 10; ---- (SELECT COUNT(posts.jbp_id) FROM jbp_forums_posts posts WHERE --- posts.jbp_poster_id = posters.jbp_id); +-- UPDATE jbp_forums_posters posters SET posters.jbp_post_count = (SELECT COUNT(posts.jbp_id) +-- FROM jbp_forums_posts posts WHERE posts.jbp_poster_id = posters.jbp_id); Modified: prod/forge/portal-extensions/forge-forums/scripts/conv.sql =================================================================== --- prod/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-31 17:06:41 UTC (rev 1028) +++ prod/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-31 17:36:49 UTC (rev 1029) @@ -1,11 +1,5 @@ -- DB CONVERT SCRIPT OF NUKES3 FORUMS TO PORTAL FORUMS W/ USERS TABLE --- Converting categories ---ALTER TABLE phpbb_categories RENAME TO jbp_forums_categories; ---ALTER TABLE jbp_forums_categories CHANGE cat_id jbp_id int(11) NOT NULL auto_increment, ADD PRIMARY KEY (jbp_id); ---ALTER TABLE jbp_forums_categories CHANGE cat_title jbp_title varchar(255) default NULL; ---ALTER TABLE jbp_forums_categories CHANGE cat_order jbp_order int(11) default NULL; - -- Copying data from users (into users and posters). -- To make things easy, we assume that poster id == user id. This makes this -- script useable only for making a completely new portal db, not merging it @@ -38,7 +32,7 @@ n.forum_status, 0 FROM phpbb_forums n; -- Portal doesn't like "null" here. -UPDATE jbp_forums_forums SET jbp_prune_next=0 WHERE jbp_prune_next = NULL; +UPDATE jbp_forums_forums SET jbp_prune_next=0 WHERE jbp_prune_next IS NULL; -- Copying data from forumswatch - two tables required here. -- First inserting user+mode data. Copied: prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow (from rev 1028, qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow) Deleted: prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js =================================================================== --- qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js 2005-08-31 17:06:41 UTC (rev 1028) +++ prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js 2005-08-31 17:36:49 UTC (rev 1029) @@ -1,56 +0,0 @@ -//------------------------------------------------------ -// Copyright Eloqua Corporation. -// -var elqSiteID = '257'; -var elqVer = 'v200'; -// -var elqERoot = 'now.eloqua.com/'; -var elqSecERoot = 'secure.eloqua.com/'; -// -//------------------------------------------------------ -function elqErr(){return true;} -window.onerror = elqErr; -var elqCurESite = '', elqAltESite = '', elqWCount = 0, elqTryI = false; -var elqStr = '', elqTID = null, elqTRun = false, elqLoad = false, elqFail = false; -if (location.protocol == 'https:') { elqCurESite = 'https://' + elqSecERoot; elqAltESite = 'http://' + elqERoot;} -else { elqCurESite = 'http://' + elqERoot; elqAltESite = 'https://' + elqSecERoot;} -var elqCurE = elqCurESite + 'visitor/' + elqVer + '/svrGP.asp'; -if (navigator.appVersion.indexOf('Macintosh') == -1) { - if ((navigator.appName == 'Netscape') && (parseInt(navigator.appVersion) > 4)) { elqTryI = true; } - if (((navigator.appName == 'Microsoft Internet Explorer') || (navigator.userAgent.indexOf('AOL') != -1)) && (navigator.appVersion.indexOf('3.0') == -1)) { elqTryI = true; }} -function elqClearT() { if(elqTRun) { clearTimeout(elqTID); elqTID = null; elqTRun = false;}} -function elqWrite() { - if ((elqWCount > 75) || elqFail) { elqClearT(); } - else { elqWCount++; - if (!elqLoad) { elqTRun = true; elqTID = setTimeout('elqInit();', 1000);} - else { elqClearT(); if (!elqFail) {document.write(elqStr); }}}} -function elqInit(){ elqClearT(); elqWrite();} -function elqReplace(string,text,by) { - var strLength = string.length, txtLength = text.length; - if ((strLength == 0) || (txtLength == 0)) return string; - var i = string.indexOf(text); - if ((!i) && (text != string.substring(0,txtLength))) return string; - if (i == -1) return string; - var newstr = string.substring(0,i) + by; - if (i+txtLength < strLength) - newstr += elqReplace(string.substring(i+txtLength,strLength),text,by); - return newstr; } -function elqQString(strVariable, strDefault, intUnencode) { - var strSearchString = strVariable.toLowerCase() + '='; - var strQString = location.search + '&'; - var strQStringLower = strQString.toLowerCase(); - var intStart = strQStringLower.indexOf(strSearchString); - if (intStart != -1) { - strQString = strQString.substring(intStart); - strQString = strQString ? strQString.substring(strQString.indexOf('=') + 1, strQString.indexOf('&')) : '';} - if ((intStart == -1) || (strQString == '')) { strQString = strDefault;} - if (intUnencode == 1) { strQString = elqReplace(strQString,'%26','&');} - else if (intUnencode == 2) { strQString = elqReplace(elqReplace(strQString,'%26','&'),'%23','#');} - return strQString;} -function elqAddQS(strURL, strAdd) { - if ((strAdd == '') || (strURL == '')) {return strURL;} - var intP = strURL.indexOf('?'); - var intH = (strURL.indexOf('#') != -1) ? strURL.indexOf('#') : strURL.length; - if (intP == -1) {return (strURL.substring(0,intH) + '?' + strAdd + strURL.substring(intH,strURL.length));} - if (intP == strURL.length - 1) { return (strURL + strAdd);} - return (strURL.substring(0,intP+1) + strAdd + '&' + strURL.substring(intP+1,strURL.length));} \ No newline at end of file Copied: prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js (from rev 1028, qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js) Deleted: prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js =================================================================== --- qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js 2005-08-31 17:06:41 UTC (rev 1028) +++ prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js 2005-08-31 17:36:49 UTC (rev 1029) @@ -1,13 +0,0 @@ -// Copyright Eloqua Corporation. -var elqWDt = new Date(20020101); -var elqDt = new Date(); -var elqMs = elqDt.getMilliseconds(); -var elqTzo = elqWDt.getTimezoneOffset(); -var elqRef2 = ''; -if (typeof elqCurE != 'undefined'){ -if (document.referrer) { elqRef2 = document.referrer; } -if ((typeof elqRef2 == 'undefined') || (elqRef2 == 'undefined') || (elqRef2 == '')) { elqRef2 = 'elqNone'; } -else { elqRef2 = elqReplace(elqReplace(elqRef2,'&','%26'),'#','%23'); } -if (navigator.appName == 'Netscape') { document.write('<la' + 'yer hidden=true><im' + 'g src="' + elqCurE + '?pps=3&siteid=' + elqSiteID + '&ref2=' + elqRef2 + '&tzo=' + elqTzo + '&ms=' + elqMs + '" border=0 width=1 height=1 ><\/la' + 'yer>');} -else { document.write('<im' + 'g style="display:none" src="' + elqCurE + '?pps=3&siteid=' + elqSiteID + '&ref2=' + elqRef2 + '&tzo=' + elqTzo + '&ms=' + elqMs + '" border=0 width=1 height=1 >');} -} Copied: prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js (from rev 1028, qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js) Modified: prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-08-31 17:06:41 UTC (rev 1028) +++ prod/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-08-31 17:36:49 UTC (rev 1029) @@ -1,91 +1,97 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> -<html xmlns="http://www.w3.org/1999/xhtml"> -<!-- - JBoss, the OpenSource J2EE webOS - Distributable under LGPL license. - See terms of license at gnu.org. - --> -<head><title>JBoss Labs</title> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> -<!-- changed to local CSS for now - -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/screen.css" type="text/css" media="screen"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/print.css" type="text/css" media="print"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/common.css" type="text/css" media="all"> - --> -<link rel="stylesheet" href="/jbossForge/screen.css" type="text/css" media="screen"> -<link rel="stylesheet" href="/jbossForge/print.css" type="text/css" media="print"> -<link rel="stylesheet" href="/jbossForge/common.css" type="text/css" media="all"> -<link rel="stylesheet" href="/jbossForge/jboss-forge.css" type="text/css" media="all"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<html xmlns="http://www.w3.org/1999/xhtml"> +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<head><title>JBoss Labs</title> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> +<!-- changed to local CSS for now + +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/screen.css" type="text/css" media="screen"> +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/print.css" type="text/css" media="print"> +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/common.css" type="text/css" media="all"> + --> +<link rel="stylesheet" href="/jbossForge/screen.css" type="text/css" media="screen"> +<link rel="stylesheet" href="/jbossForge/print.css" type="text/css" media="print"> +<link rel="stylesheet" href="/jbossForge/common.css" type="text/css" media="all"> +<link rel="stylesheet" href="/jbossForge/jboss-forge.css" type="text/css" media="all"> <link rel="stylesheet" href="/jbossForge/jboss-forge-forums.css" type="text/css" media="all"> -<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> - <!-- <p:theme themeName='jboss-forge' /> --> - -</head> - -<body> -<!-- HEADER START --> -<!-- this image creates IE problems --> -<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> - -<div class="brand_FED" id="container"> - -<div id="TopLogo"> - <img src="/jbossForge/images/logo.gif" alt="JBoss - The Professional Open Source Company"> -</div> -<div id="TopMenu"> - <table cellpadding="0" cellspacing="0"> - <tbody><tr> - <td class="menu_JBnetwork"><a href="http://network.jboss.com/">JBoss Network</a></td> - <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">JEMS Products</a></td> - <td class="menu_JBcom"><a href="http://www.jboss.com/index">JBoss.com</a></td> - <td class="menu_JBfed"><a href="http://www.jboss.com/federation/index">JBoss Federation</a></td> - </tr> - </tbody></table> -</div> -<div id="ControlMenu"> - <form id="TopSearch" action="http://www.jboss.com/search.jsp"> - <ul> - <li><a href="/portal/authsec">Login</a></li> - <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> - <li><a href="http://www.jboss.com/careers">Careers</a></li> - <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> - <li> - <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> - <input class="searchbutton" type="image" src="/jbossForge/images/spacer.gif" value="go" align="middle" /> - </li> - </ul> - </form> - -</div> -<!-- HEADER END --> - -<!-- main page table --> -<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> -<tbody><tr> - <td colspan="2" class="topheader"></td> - </tr> - <tr> - <td class="leftside"><p:region regionName='left'/></td> - <td class="bodycell"><p:region regionName='center'/></td> - - -</tr> -</tbody></table> - -<div id="jbfPageFooter"> - <div id="Copyright"> - JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br> -Theme made by <a href="http://mamut.net.pl">Szimano</a> - </div> -</div> - - - -</body> -</html> - - - - +<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> + <!-- <p:theme themeName='jboss-forge' /> --> + + +<SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' +SRC='jbossForge/elqNow/elqCfg.js'></SCRIPT> +<SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' +SRC='jbossForge/elqNow/elqImg.js'></SCRIPT> + +</head> + +<body> +<!-- HEADER START --> +<!-- this image creates IE problems --> +<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> + +<div class="brand_FED" id="container"> + +<div id="TopLogo"> + <img src="/jbossForge/images/logo.gif" alt="JBoss - The Professional Open Source Company"> +</div> +<div id="TopMenu"> + <table cellpadding="0" cellspacing="0"> + <tbody><tr> + <td class="menu_JBnetwork"><a href="http://network.jboss.com/">JBoss Network</a></td> + <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">JEMS Products</a></td> + <td class="menu_JBcom"><a href="http://www.jboss.com/index">JBoss.com</a></td> + <td class="menu_JBfed"><a href="http://www.jboss.com/federation/index">JBoss Federation</a></td> + </tr> + </tbody></table> +</div> +<div id="ControlMenu"> + <form id="TopSearch" action="http://www.jboss.com/search.jsp"> + <ul> + <li><a href="/portal/authsec">Login</a></li> + <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> + <li><a href="http://www.jboss.com/careers">Careers</a></li> + <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> + <li> + <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> + <input class="searchbutton" type="image" src="/jbossForge/images/spacer.gif" value="go" align="middle" /> + </li> + </ul> + </form> + +</div> +<!-- HEADER END --> + +<!-- main page table --> +<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> +<tbody><tr> + <td colspan="2" class="topheader"></td> + </tr> + <tr> + <td class="leftside"><p:region regionName='left'/></td> + <td class="bodycell"><p:region regionName='center'/></td> + + +</tr> +</tbody></table> + +<div id="jbfPageFooter"> + <div id="Copyright"> + JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br> +Theme made by <a href="http://mamut.net.pl">Szimano</a> + </div> +</div> + + + +</body> +</html> + + + + |
Author: dam...@jb... Date: 2005-08-31 13:06:41 -0400 (Wed, 31 Aug 2005) New Revision: 1028 Added: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js Removed: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js Modified: qa/forge/portal-extensions/forge-forums/scripts/all.sql qa/forge/portal-extensions/forge-forums/scripts/conv.sql qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp Log: MERGED: -r 1010:1027 https://svn.labs.jboss.com/trunk/forge into qa/forge. This adds the Eloqua tracking in Labs. Modified: qa/forge/portal-extensions/forge-forums/scripts/all.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-31 17:06:41 UTC (rev 1028) @@ -6,8 +6,5 @@ \. portal-keys.sql -- AFTER ADDING THE KEYS: UPDATING POST COUNT - --- ANY IDEAS WHY THIS ISN'T WORKING? ---UPDATE jbp_forums_posters posters SET posters.jbp_post_count = 10; ---- (SELECT COUNT(posts.jbp_id) FROM jbp_forums_posts posts WHERE --- posts.jbp_poster_id = posters.jbp_id); +-- UPDATE jbp_forums_posters posters SET posters.jbp_post_count = (SELECT COUNT(posts.jbp_id) +-- FROM jbp_forums_posts posts WHERE posts.jbp_poster_id = posters.jbp_id); Modified: qa/forge/portal-extensions/forge-forums/scripts/conv.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-31 17:06:41 UTC (rev 1028) @@ -1,11 +1,5 @@ -- DB CONVERT SCRIPT OF NUKES3 FORUMS TO PORTAL FORUMS W/ USERS TABLE --- Converting categories ---ALTER TABLE phpbb_categories RENAME TO jbp_forums_categories; ---ALTER TABLE jbp_forums_categories CHANGE cat_id jbp_id int(11) NOT NULL auto_increment, ADD PRIMARY KEY (jbp_id); ---ALTER TABLE jbp_forums_categories CHANGE cat_title jbp_title varchar(255) default NULL; ---ALTER TABLE jbp_forums_categories CHANGE cat_order jbp_order int(11) default NULL; - -- Copying data from users (into users and posters). -- To make things easy, we assume that poster id == user id. This makes this -- script useable only for making a completely new portal db, not merging it @@ -38,7 +32,7 @@ n.forum_status, 0 FROM phpbb_forums n; -- Portal doesn't like "null" here. -UPDATE jbp_forums_forums SET jbp_prune_next=0 WHERE jbp_prune_next = NULL; +UPDATE jbp_forums_forums SET jbp_prune_next=0 WHERE jbp_prune_next IS NULL; -- Copying data from forumswatch - two tables required here. -- First inserting user+mode data. Copied: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow (from rev 1027, trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow) Deleted: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js =================================================================== --- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js 2005-08-31 17:06:41 UTC (rev 1028) @@ -1,56 +0,0 @@ -//------------------------------------------------------ -// Copyright Eloqua Corporation. -// -var elqSiteID = '257'; -var elqVer = 'v200'; -// -var elqERoot = 'now.eloqua.com/'; -var elqSecERoot = 'secure.eloqua.com/'; -// -//------------------------------------------------------ -function elqErr(){return true;} -window.onerror = elqErr; -var elqCurESite = '', elqAltESite = '', elqWCount = 0, elqTryI = false; -var elqStr = '', elqTID = null, elqTRun = false, elqLoad = false, elqFail = false; -if (location.protocol == 'https:') { elqCurESite = 'https://' + elqSecERoot; elqAltESite = 'http://' + elqERoot;} -else { elqCurESite = 'http://' + elqERoot; elqAltESite = 'https://' + elqSecERoot;} -var elqCurE = elqCurESite + 'visitor/' + elqVer + '/svrGP.asp'; -if (navigator.appVersion.indexOf('Macintosh') == -1) { - if ((navigator.appName == 'Netscape') && (parseInt(navigator.appVersion) > 4)) { elqTryI = true; } - if (((navigator.appName == 'Microsoft Internet Explorer') || (navigator.userAgent.indexOf('AOL') != -1)) && (navigator.appVersion.indexOf('3.0') == -1)) { elqTryI = true; }} -function elqClearT() { if(elqTRun) { clearTimeout(elqTID); elqTID = null; elqTRun = false;}} -function elqWrite() { - if ((elqWCount > 75) || elqFail) { elqClearT(); } - else { elqWCount++; - if (!elqLoad) { elqTRun = true; elqTID = setTimeout('elqInit();', 1000);} - else { elqClearT(); if (!elqFail) {document.write(elqStr); }}}} -function elqInit(){ elqClearT(); elqWrite();} -function elqReplace(string,text,by) { - var strLength = string.length, txtLength = text.length; - if ((strLength == 0) || (txtLength == 0)) return string; - var i = string.indexOf(text); - if ((!i) && (text != string.substring(0,txtLength))) return string; - if (i == -1) return string; - var newstr = string.substring(0,i) + by; - if (i+txtLength < strLength) - newstr += elqReplace(string.substring(i+txtLength,strLength),text,by); - return newstr; } -function elqQString(strVariable, strDefault, intUnencode) { - var strSearchString = strVariable.toLowerCase() + '='; - var strQString = location.search + '&'; - var strQStringLower = strQString.toLowerCase(); - var intStart = strQStringLower.indexOf(strSearchString); - if (intStart != -1) { - strQString = strQString.substring(intStart); - strQString = strQString ? strQString.substring(strQString.indexOf('=') + 1, strQString.indexOf('&')) : '';} - if ((intStart == -1) || (strQString == '')) { strQString = strDefault;} - if (intUnencode == 1) { strQString = elqReplace(strQString,'%26','&');} - else if (intUnencode == 2) { strQString = elqReplace(elqReplace(strQString,'%26','&'),'%23','#');} - return strQString;} -function elqAddQS(strURL, strAdd) { - if ((strAdd == '') || (strURL == '')) {return strURL;} - var intP = strURL.indexOf('?'); - var intH = (strURL.indexOf('#') != -1) ? strURL.indexOf('#') : strURL.length; - if (intP == -1) {return (strURL.substring(0,intH) + '?' + strAdd + strURL.substring(intH,strURL.length));} - if (intP == strURL.length - 1) { return (strURL + strAdd);} - return (strURL.substring(0,intP+1) + strAdd + '&' + strURL.substring(intP+1,strURL.length));} \ No newline at end of file Copied: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js (from rev 1027, trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js) Deleted: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js =================================================================== --- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js 2005-08-31 17:06:41 UTC (rev 1028) @@ -1,13 +0,0 @@ -// Copyright Eloqua Corporation. -var elqWDt = new Date(20020101); -var elqDt = new Date(); -var elqMs = elqDt.getMilliseconds(); -var elqTzo = elqWDt.getTimezoneOffset(); -var elqRef2 = ''; -if (typeof elqCurE != 'undefined'){ -if (document.referrer) { elqRef2 = document.referrer; } -if ((typeof elqRef2 == 'undefined') || (elqRef2 == 'undefined') || (elqRef2 == '')) { elqRef2 = 'elqNone'; } -else { elqRef2 = elqReplace(elqReplace(elqRef2,'&','%26'),'#','%23'); } -if (navigator.appName == 'Netscape') { document.write('<la' + 'yer hidden=true><im' + 'g src="' + elqCurE + '?pps=3&siteid=' + elqSiteID + '&ref2=' + elqRef2 + '&tzo=' + elqTzo + '&ms=' + elqMs + '" border=0 width=1 height=1 ><\/la' + 'yer>');} -else { document.write('<im' + 'g style="display:none" src="' + elqCurE + '?pps=3&siteid=' + elqSiteID + '&ref2=' + elqRef2 + '&tzo=' + elqTzo + '&ms=' + elqMs + '" border=0 width=1 height=1 >');} -} Copied: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js (from rev 1027, trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js) Modified: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-08-31 17:06:41 UTC (rev 1028) @@ -1,91 +1,97 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> -<html xmlns="http://www.w3.org/1999/xhtml"> -<!-- - JBoss, the OpenSource J2EE webOS - Distributable under LGPL license. - See terms of license at gnu.org. - --> -<head><title>JBoss Labs</title> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> -<!-- changed to local CSS for now - -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/screen.css" type="text/css" media="screen"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/print.css" type="text/css" media="print"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/common.css" type="text/css" media="all"> - --> -<link rel="stylesheet" href="/jbossForge/screen.css" type="text/css" media="screen"> -<link rel="stylesheet" href="/jbossForge/print.css" type="text/css" media="print"> -<link rel="stylesheet" href="/jbossForge/common.css" type="text/css" media="all"> -<link rel="stylesheet" href="/jbossForge/jboss-forge.css" type="text/css" media="all"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<html xmlns="http://www.w3.org/1999/xhtml"> +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<head><title>JBoss Labs</title> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> +<!-- changed to local CSS for now + +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/screen.css" type="text/css" media="screen"> +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/print.css" type="text/css" media="print"> +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/common.css" type="text/css" media="all"> + --> +<link rel="stylesheet" href="/jbossForge/screen.css" type="text/css" media="screen"> +<link rel="stylesheet" href="/jbossForge/print.css" type="text/css" media="print"> +<link rel="stylesheet" href="/jbossForge/common.css" type="text/css" media="all"> +<link rel="stylesheet" href="/jbossForge/jboss-forge.css" type="text/css" media="all"> <link rel="stylesheet" href="/jbossForge/jboss-forge-forums.css" type="text/css" media="all"> -<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> - <!-- <p:theme themeName='jboss-forge' /> --> - -</head> - -<body> -<!-- HEADER START --> -<!-- this image creates IE problems --> -<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> - -<div class="brand_FED" id="container"> - -<div id="TopLogo"> - <img src="/jbossForge/images/logo.gif" alt="JBoss - The Professional Open Source Company"> -</div> -<div id="TopMenu"> - <table cellpadding="0" cellspacing="0"> - <tbody><tr> - <td class="menu_JBnetwork"><a href="http://network.jboss.com/">JBoss Network</a></td> - <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">JEMS Products</a></td> - <td class="menu_JBcom"><a href="http://www.jboss.com/index">JBoss.com</a></td> - <td class="menu_JBfed"><a href="http://www.jboss.com/federation/index">JBoss Federation</a></td> - </tr> - </tbody></table> -</div> -<div id="ControlMenu"> - <form id="TopSearch" action="http://www.jboss.com/search.jsp"> - <ul> - <li><a href="/portal/authsec">Login</a></li> - <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> - <li><a href="http://www.jboss.com/careers">Careers</a></li> - <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> - <li> - <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> - <input class="searchbutton" type="image" src="/jbossForge/images/spacer.gif" value="go" align="middle" /> - </li> - </ul> - </form> - -</div> -<!-- HEADER END --> - -<!-- main page table --> -<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> -<tbody><tr> - <td colspan="2" class="topheader"></td> - </tr> - <tr> - <td class="leftside"><p:region regionName='left'/></td> - <td class="bodycell"><p:region regionName='center'/></td> - - -</tr> -</tbody></table> - -<div id="jbfPageFooter"> - <div id="Copyright"> - JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br> -Theme made by <a href="http://mamut.net.pl">Szimano</a> - </div> -</div> - - - -</body> -</html> - - - - +<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> + <!-- <p:theme themeName='jboss-forge' /> --> + + +<SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' +SRC='jbossForge/elqNow/elqCfg.js'></SCRIPT> +<SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' +SRC='jbossForge/elqNow/elqImg.js'></SCRIPT> + +</head> + +<body> +<!-- HEADER START --> +<!-- this image creates IE problems --> +<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> + +<div class="brand_FED" id="container"> + +<div id="TopLogo"> + <img src="/jbossForge/images/logo.gif" alt="JBoss - The Professional Open Source Company"> +</div> +<div id="TopMenu"> + <table cellpadding="0" cellspacing="0"> + <tbody><tr> + <td class="menu_JBnetwork"><a href="http://network.jboss.com/">JBoss Network</a></td> + <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">JEMS Products</a></td> + <td class="menu_JBcom"><a href="http://www.jboss.com/index">JBoss.com</a></td> + <td class="menu_JBfed"><a href="http://www.jboss.com/federation/index">JBoss Federation</a></td> + </tr> + </tbody></table> +</div> +<div id="ControlMenu"> + <form id="TopSearch" action="http://www.jboss.com/search.jsp"> + <ul> + <li><a href="/portal/authsec">Login</a></li> + <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> + <li><a href="http://www.jboss.com/careers">Careers</a></li> + <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> + <li> + <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> + <input class="searchbutton" type="image" src="/jbossForge/images/spacer.gif" value="go" align="middle" /> + </li> + </ul> + </form> + +</div> +<!-- HEADER END --> + +<!-- main page table --> +<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> +<tbody><tr> + <td colspan="2" class="topheader"></td> + </tr> + <tr> + <td class="leftside"><p:region regionName='left'/></td> + <td class="bodycell"><p:region regionName='center'/></td> + + +</tr> +</tbody></table> + +<div id="jbfPageFooter"> + <div id="Copyright"> + JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br> +Theme made by <a href="http://mamut.net.pl">Szimano</a> + </div> +</div> + + + +</body> +</html> + + + + |
|
From: <jbo...@li...> - 2005-08-31 16:26:22
|
Author: dam...@jb... Date: 2005-08-31 12:26:13 -0400 (Wed, 31 Aug 2005) New Revision: 1027 Added: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp Log: Added Eloqua tracking. Added: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js =================================================================== --- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js 2005-08-30 22:57:05 UTC (rev 1026) +++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js 2005-08-31 16:26:13 UTC (rev 1027) @@ -0,0 +1,56 @@ +//------------------------------------------------------ +// Copyright Eloqua Corporation. +// +var elqSiteID = '257'; +var elqVer = 'v200'; +// +var elqERoot = 'now.eloqua.com/'; +var elqSecERoot = 'secure.eloqua.com/'; +// +//------------------------------------------------------ +function elqErr(){return true;} +window.onerror = elqErr; +var elqCurESite = '', elqAltESite = '', elqWCount = 0, elqTryI = false; +var elqStr = '', elqTID = null, elqTRun = false, elqLoad = false, elqFail = false; +if (location.protocol == 'https:') { elqCurESite = 'https://' + elqSecERoot; elqAltESite = 'http://' + elqERoot;} +else { elqCurESite = 'http://' + elqERoot; elqAltESite = 'https://' + elqSecERoot;} +var elqCurE = elqCurESite + 'visitor/' + elqVer + '/svrGP.asp'; +if (navigator.appVersion.indexOf('Macintosh') == -1) { + if ((navigator.appName == 'Netscape') && (parseInt(navigator.appVersion) > 4)) { elqTryI = true; } + if (((navigator.appName == 'Microsoft Internet Explorer') || (navigator.userAgent.indexOf('AOL') != -1)) && (navigator.appVersion.indexOf('3.0') == -1)) { elqTryI = true; }} +function elqClearT() { if(elqTRun) { clearTimeout(elqTID); elqTID = null; elqTRun = false;}} +function elqWrite() { + if ((elqWCount > 75) || elqFail) { elqClearT(); } + else { elqWCount++; + if (!elqLoad) { elqTRun = true; elqTID = setTimeout('elqInit();', 1000);} + else { elqClearT(); if (!elqFail) {document.write(elqStr); }}}} +function elqInit(){ elqClearT(); elqWrite();} +function elqReplace(string,text,by) { + var strLength = string.length, txtLength = text.length; + if ((strLength == 0) || (txtLength == 0)) return string; + var i = string.indexOf(text); + if ((!i) && (text != string.substring(0,txtLength))) return string; + if (i == -1) return string; + var newstr = string.substring(0,i) + by; + if (i+txtLength < strLength) + newstr += elqReplace(string.substring(i+txtLength,strLength),text,by); + return newstr; } +function elqQString(strVariable, strDefault, intUnencode) { + var strSearchString = strVariable.toLowerCase() + '='; + var strQString = location.search + '&'; + var strQStringLower = strQString.toLowerCase(); + var intStart = strQStringLower.indexOf(strSearchString); + if (intStart != -1) { + strQString = strQString.substring(intStart); + strQString = strQString ? strQString.substring(strQString.indexOf('=') + 1, strQString.indexOf('&')) : '';} + if ((intStart == -1) || (strQString == '')) { strQString = strDefault;} + if (intUnencode == 1) { strQString = elqReplace(strQString,'%26','&');} + else if (intUnencode == 2) { strQString = elqReplace(elqReplace(strQString,'%26','&'),'%23','#');} + return strQString;} +function elqAddQS(strURL, strAdd) { + if ((strAdd == '') || (strURL == '')) {return strURL;} + var intP = strURL.indexOf('?'); + var intH = (strURL.indexOf('#') != -1) ? strURL.indexOf('#') : strURL.length; + if (intP == -1) {return (strURL.substring(0,intH) + '?' + strAdd + strURL.substring(intH,strURL.length));} + if (intP == strURL.length - 1) { return (strURL + strAdd);} + return (strURL.substring(0,intP+1) + strAdd + '&' + strURL.substring(intP+1,strURL.length));} \ No newline at end of file Added: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js =================================================================== --- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js 2005-08-30 22:57:05 UTC (rev 1026) +++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js 2005-08-31 16:26:13 UTC (rev 1027) @@ -0,0 +1,13 @@ +// Copyright Eloqua Corporation. +var elqWDt = new Date(20020101); +var elqDt = new Date(); +var elqMs = elqDt.getMilliseconds(); +var elqTzo = elqWDt.getTimezoneOffset(); +var elqRef2 = ''; +if (typeof elqCurE != 'undefined'){ +if (document.referrer) { elqRef2 = document.referrer; } +if ((typeof elqRef2 == 'undefined') || (elqRef2 == 'undefined') || (elqRef2 == '')) { elqRef2 = 'elqNone'; } +else { elqRef2 = elqReplace(elqReplace(elqRef2,'&','%26'),'#','%23'); } +if (navigator.appName == 'Netscape') { document.write('<la' + 'yer hidden=true><im' + 'g src="' + elqCurE + '?pps=3&siteid=' + elqSiteID + '&ref2=' + elqRef2 + '&tzo=' + elqTzo + '&ms=' + elqMs + '" border=0 width=1 height=1 ><\/la' + 'yer>');} +else { document.write('<im' + 'g style="display:none" src="' + elqCurE + '?pps=3&siteid=' + elqSiteID + '&ref2=' + elqRef2 + '&tzo=' + elqTzo + '&ms=' + elqMs + '" border=0 width=1 height=1 >');} +} Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-08-30 22:57:05 UTC (rev 1026) +++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-08-31 16:26:13 UTC (rev 1027) @@ -1,91 +1,97 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> -<html xmlns="http://www.w3.org/1999/xhtml"> -<!-- - JBoss, the OpenSource J2EE webOS - Distributable under LGPL license. - See terms of license at gnu.org. - --> -<head><title>JBoss Labs</title> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> -<!-- changed to local CSS for now - -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/screen.css" type="text/css" media="screen"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/print.css" type="text/css" media="print"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/common.css" type="text/css" media="all"> - --> -<link rel="stylesheet" href="/jbossForge/screen.css" type="text/css" media="screen"> -<link rel="stylesheet" href="/jbossForge/print.css" type="text/css" media="print"> -<link rel="stylesheet" href="/jbossForge/common.css" type="text/css" media="all"> -<link rel="stylesheet" href="/jbossForge/jboss-forge.css" type="text/css" media="all"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<html xmlns="http://www.w3.org/1999/xhtml"> +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<head><title>JBoss Labs</title> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> +<!-- changed to local CSS for now + +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/screen.css" type="text/css" media="screen"> +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/print.css" type="text/css" media="print"> +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/common.css" type="text/css" media="all"> + --> +<link rel="stylesheet" href="/jbossForge/screen.css" type="text/css" media="screen"> +<link rel="stylesheet" href="/jbossForge/print.css" type="text/css" media="print"> +<link rel="stylesheet" href="/jbossForge/common.css" type="text/css" media="all"> +<link rel="stylesheet" href="/jbossForge/jboss-forge.css" type="text/css" media="all"> <link rel="stylesheet" href="/jbossForge/jboss-forge-forums.css" type="text/css" media="all"> -<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> - <!-- <p:theme themeName='jboss-forge' /> --> - -</head> - -<body> -<!-- HEADER START --> -<!-- this image creates IE problems --> -<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> - -<div class="brand_FED" id="container"> - -<div id="TopLogo"> - <img src="/jbossForge/images/logo.gif" alt="JBoss - The Professional Open Source Company"> -</div> -<div id="TopMenu"> - <table cellpadding="0" cellspacing="0"> - <tbody><tr> - <td class="menu_JBnetwork"><a href="http://network.jboss.com/">JBoss Network</a></td> - <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">JEMS Products</a></td> - <td class="menu_JBcom"><a href="http://www.jboss.com/index">JBoss.com</a></td> - <td class="menu_JBfed"><a href="http://www.jboss.com/federation/index">JBoss Federation</a></td> - </tr> - </tbody></table> -</div> -<div id="ControlMenu"> - <form id="TopSearch" action="http://www.jboss.com/search.jsp"> - <ul> - <li><a href="/portal/authsec">Login</a></li> - <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> - <li><a href="http://www.jboss.com/careers">Careers</a></li> - <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> - <li> - <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> - <input class="searchbutton" type="image" src="/jbossForge/images/spacer.gif" value="go" align="middle" /> - </li> - </ul> - </form> - -</div> -<!-- HEADER END --> - -<!-- main page table --> -<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> -<tbody><tr> - <td colspan="2" class="topheader"></td> - </tr> - <tr> - <td class="leftside"><p:region regionName='left'/></td> - <td class="bodycell"><p:region regionName='center'/></td> - - -</tr> -</tbody></table> - -<div id="jbfPageFooter"> - <div id="Copyright"> - JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br> -Theme made by <a href="http://mamut.net.pl">Szimano</a> - </div> -</div> - - - -</body> -</html> - - - - +<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> + <!-- <p:theme themeName='jboss-forge' /> --> + + +<SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' +SRC='jbossForge/elqNow/elqCfg.js'></SCRIPT> +<SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' +SRC='jbossForge/elqNow/elqImg.js'></SCRIPT> + +</head> + +<body> +<!-- HEADER START --> +<!-- this image creates IE problems --> +<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> + +<div class="brand_FED" id="container"> + +<div id="TopLogo"> + <img src="/jbossForge/images/logo.gif" alt="JBoss - The Professional Open Source Company"> +</div> +<div id="TopMenu"> + <table cellpadding="0" cellspacing="0"> + <tbody><tr> + <td class="menu_JBnetwork"><a href="http://network.jboss.com/">JBoss Network</a></td> + <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">JEMS Products</a></td> + <td class="menu_JBcom"><a href="http://www.jboss.com/index">JBoss.com</a></td> + <td class="menu_JBfed"><a href="http://www.jboss.com/federation/index">JBoss Federation</a></td> + </tr> + </tbody></table> +</div> +<div id="ControlMenu"> + <form id="TopSearch" action="http://www.jboss.com/search.jsp"> + <ul> + <li><a href="/portal/authsec">Login</a></li> + <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> + <li><a href="http://www.jboss.com/careers">Careers</a></li> + <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> + <li> + <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> + <input class="searchbutton" type="image" src="/jbossForge/images/spacer.gif" value="go" align="middle" /> + </li> + </ul> + </form> + +</div> +<!-- HEADER END --> + +<!-- main page table --> +<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> +<tbody><tr> + <td colspan="2" class="topheader"></td> + </tr> + <tr> + <td class="leftside"><p:region regionName='left'/></td> + <td class="bodycell"><p:region regionName='center'/></td> + + +</tr> +</tbody></table> + +<div id="jbfPageFooter"> + <div id="Copyright"> + JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br> +Theme made by <a href="http://mamut.net.pl">Szimano</a> + </div> +</div> + + + +</body> +</html> + + + + |
Author: dam...@jb... Date: 2005-08-30 18:57:05 -0400 (Tue, 30 Aug 2005) New Revision: 1026 Added: prod/forge/portal-extensions/forge-forums/scripts/ prod/forge/portal-extensions/forge-forums/scripts/all.sql prod/forge/portal-extensions/forge-forums/scripts/conv.sql prod/forge/portal-extensions/forge-forums/scripts/diff.sql prod/forge/portal-extensions/forge-forums/scripts/nukes3.sql prod/forge/portal-extensions/forge-forums/scripts/portal-keys.sql prod/forge/portal-extensions/forge-forums/scripts/portal-pure.sql prod/forge/portal-extensions/forge-forums/scripts/test.sql prod/forge/portal-extensions/forge-wiki/docs/wiki-reversed.zuml prod/forge/portal-extensions/forge-wiki/lib/ prod/forge/portal-extensions/forge-wiki/lib/cglib2.jar prod/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar prod/forge/portal-extensions/forge-wiki/lib/commons-collections.jar prod/forge/portal-extensions/forge-wiki/lib/commons-lang.jar prod/forge/portal-extensions/forge-wiki/lib/commons-logging.jar prod/forge/portal-extensions/forge-wiki/lib/dom4j.jar prod/forge/portal-extensions/forge-wiki/lib/ehcache.jar prod/forge/portal-extensions/forge-wiki/lib/hibernate2.jar prod/forge/portal-extensions/forge-wiki/lib/hsqldb.jar prod/forge/portal-extensions/forge-wiki/lib/informa.jar prod/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar prod/forge/portal-extensions/forge-wiki/lib/jdom.jar prod/forge/portal-extensions/forge-wiki/lib/jta.jar prod/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar prod/forge/portal-extensions/forge-wiki/lib/lucene.jar prod/forge/portal-extensions/forge-wiki/lib/odmg.jar prod/forge/portal-extensions/forge-wiki/lib/xalan.jar prod/forge/portal-extensions/forge-wiki/lib/xml-apis.jar prod/forge/portal-extensions/forge-wiki/src/etc/application.xml prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/ prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java Removed: prod/forge/portal-content/ prod/forge/portal-extensions/forge-forums/scripts/all.sql prod/forge/portal-extensions/forge-forums/scripts/conv.sql prod/forge/portal-extensions/forge-forums/scripts/diff.sql prod/forge/portal-extensions/forge-forums/scripts/nukes3.sql prod/forge/portal-extensions/forge-forums/scripts/portal-keys.sql prod/forge/portal-extensions/forge-forums/scripts/portal-pure.sql prod/forge/portal-extensions/forge-forums/scripts/test.sql prod/forge/portal-extensions/forge-wiki/lib/cglib2.jar prod/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar prod/forge/portal-extensions/forge-wiki/lib/commons-collections.jar prod/forge/portal-extensions/forge-wiki/lib/commons-lang.jar prod/forge/portal-extensions/forge-wiki/lib/commons-logging.jar prod/forge/portal-extensions/forge-wiki/lib/dom4j.jar prod/forge/portal-extensions/forge-wiki/lib/ehcache.jar prod/forge/portal-extensions/forge-wiki/lib/hibernate2.jar prod/forge/portal-extensions/forge-wiki/lib/hsqldb.jar prod/forge/portal-extensions/forge-wiki/lib/informa.jar prod/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar prod/forge/portal-extensions/forge-wiki/lib/jdom.jar prod/forge/portal-extensions/forge-wiki/lib/jta.jar prod/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar prod/forge/portal-extensions/forge-wiki/lib/lucene.jar prod/forge/portal-extensions/forge-wiki/lib/odmg.jar prod/forge/portal-extensions/forge-wiki/lib/xalan.jar prod/forge/portal-extensions/forge-wiki/lib/xml-apis.jar prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java Modified: prod/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java prod/forge/portal-extensions/forge-wiki/maven.xml prod/forge/portal-extensions/forge-wiki/project.properties prod/forge/portal-extensions/forge-wiki/project.xml prod/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java prod/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp prod/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld Log: MERGED: -r 1020:1025 https://svn.labs.jboss.com/qa/forge into prod forge. Still need to add the eloqua tracking links. Copied: prod/forge/portal-extensions/forge-forums/scripts (from rev 1025, qa/forge/portal-extensions/forge-forums/scripts) Deleted: prod/forge/portal-extensions/forge-forums/scripts/all.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 22:23:01 UTC (rev 1025) +++ prod/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 22:57:05 UTC (rev 1026) @@ -1,13 +0,0 @@ --- THIS SHOULD BE RUN ON AN EXISTING NUKES3 DATABASE. PORTAL FORUMS TABLES AND --- PORTAL USERS TABLES WILL BE CREATED AND POPULATED WITH DATA. - -\. portal-pure.sql -\. conv.sql -\. portal-keys.sql - --- AFTER ADDING THE KEYS: UPDATING POST COUNT - --- ANY IDEAS WHY THIS ISN'T WORKING? ---UPDATE jbp_forums_posters posters SET posters.jbp_post_count = 10; ---- (SELECT COUNT(posts.jbp_id) FROM jbp_forums_posts posts WHERE --- posts.jbp_poster_id = posters.jbp_id); Copied: prod/forge/portal-extensions/forge-forums/scripts/all.sql (from rev 1025, qa/forge/portal-extensions/forge-forums/scripts/all.sql) Deleted: prod/forge/portal-extensions/forge-forums/scripts/conv.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 22:23:01 UTC (rev 1025) +++ prod/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 22:57:05 UTC (rev 1026) @@ -1,97 +0,0 @@ --- DB CONVERT SCRIPT OF NUKES3 FORUMS TO PORTAL FORUMS W/ USERS TABLE - --- Converting categories ---ALTER TABLE phpbb_categories RENAME TO jbp_forums_categories; ---ALTER TABLE jbp_forums_categories CHANGE cat_id jbp_id int(11) NOT NULL auto_increment, ADD PRIMARY KEY (jbp_id); ---ALTER TABLE jbp_forums_categories CHANGE cat_title jbp_title varchar(255) default NULL; ---ALTER TABLE jbp_forums_categories CHANGE cat_order jbp_order int(11) default NULL; - --- Copying data from users (into users and posters). --- To make things easy, we assume that poster id == user id. This makes this --- script useable only for making a completely new portal db, not merging it --- with an existing one. -INSERT INTO jbp_users (jbp_uid, jbp_root_pref_set_id, jbp_uname, - jbp_givenname, jbp_familyname, jbp_password, jbp_realemail, - jbp_fakeemail, jbp_regdate, jbp_viewrealemail, jbp_enabled) - SELECT n.pn_uid, NULL, n.pn_uname, n.pn_name, n.pn_fname, - n.pn_pass, n.pn_email, n.pn_femail, n.pn_user_regdate, - n.pn_user_viewemail, n.pn_enabled FROM nuke_users n; - --- TODO: update givenname/ familyname - -INSERT INTO jbp_forums_posters (jbp_id, jbp_user_id, jbp_post_count) - SELECT n.pn_uid, n.pn_uid, 0 FROM nuke_users n; - --- Copying data from categories. -INSERT INTO jbp_forums_categories (jbp_id, jbp_order, jbp_title) - SELECT n.cat_id, n.cat_order, n.cat_title - FROM phpbb_categories n; - --- Copying data from forums. -INSERT INTO jbp_forums_forums (jbp_id, jbp_category_id, jbp_description, - jbp_last_post_id, jbp_name, jbp_order, jbp_topic_count, - jbp_post_count, jbp_prune_enable, jbp_prune_next, - jbp_status, jbp_type) - SELECT n.forum_id, n.cat_id, n.forum_desc, n.forum_last_post_id, - n.forum_name, n.forum_order, n.forum_topics, - n.forum_posts, n.prune_enable, n.prune_next, - n.forum_status, 0 FROM phpbb_forums n; - --- Portal doesn't like "null" here. -UPDATE jbp_forums_forums SET jbp_prune_next=0 WHERE jbp_prune_next = NULL; - --- Copying data from forumswatch - two tables required here. --- First inserting user+mode data. -INSERT INTO jbp_forums_watch (jbp_poster_id, jbp_mode) - SELECT DISTINCT n.user_id, n.watch_mode FROM phpbb_forums_watch n; - --- Now inserting the actual watches. -INSERT INTO jbp_forums_forumswatch (jbp_id, jbp_forum_id) - SELECT DISTINCT n.forum_id, p.jbp_id - FROM phpbb_forums_watch n, jbp_forums_watch p - WHERE p.jbp_poster_id = n.user_id AND p.jbp_mode = n.watch_mode; - --- Copying topics. -INSERT INTO jbp_forums_topics (jbp_id, jbp_forum_id, jbp_view_count, - jbp_replies, jbp_first_post_id, jbp_last_post_id, - jbp_last_post_date, jbp_poster, jbp_type, jbp_status, - jbp_subject, jbp_poll) - SELECT n.topic_id, n.forum_id, n.topic_views, n.topic_replies, - n.topic_first_post_id, n.topic_last_post_id, - n.topic_last_post_time, n.topic_poster, n.topic_type, - n.topic_status, n.topic_title, NULL FROM phpbb_topics n; - --- Copying posts. -INSERT INTO jbp_forums_posts (jbp_id, jbp_topic_id, jbp_edit_count, - jbp_edit_date, jbp_create_date, jbp_subject, jbp_text, - jbp_htmlenabled, jbp_poster_id) - SELECT n.post_id, n.topic_id, n.post_edit_count, n.post_edit_time, - n.post_time, n.post_subject, n.post_text, n.enable_html, - n.poster_id FROM phpbb_posts n; - --- Hibernate doesn't like null-like dates. -UPDATE jbp_forums_posts SET jbp_create_date='1970-01-01 00:00:00' WHERE jbp_create_date='0000-00-00 00:00:00'; -UPDATE jbp_forums_posts SET jbp_edit_date='1970-01-01 00:00:00' WHERE jbp_edit_date='0000-00-00 00:00:00'; - --- Copying pool options - --- Copying pool votes - --- Copying pools - --- Updating the "admin" account to be the same as on labs. -UPDATE jbp_users SET jbp_password = "0E6C6B302E803D8F03C2906211D39486" WHERE jbp_uname = "admin"; - --- Creating the "Admin" and "User" roles. -INSERT INTO jbp_roles (jbp_rid, jbp_name, jbp_displayname) VALUES (1, "Admin", "Administrators"); -INSERT INTO jbp_roles (jbp_rid, jbp_name, jbp_displayname) VALUES (2, "User", "Users"); - --- Assigning everybody to the "User" role. -INSERT INTO jbp_role_membership (jbp_rid, jbp_uid) - SELECT 2, p.jbp_uid FROM jbp_users p; - --- Assigning "adamw" and "admin" to the "Admin" role. -INSERT INTO jbp_role_membership (jbp_rid, jbp_uid) - SELECT 1, p.jbp_uid FROM jbp_users p WHERE p.jbp_uname = "adamw"; -INSERT INTO jbp_role_membership (jbp_rid, jbp_uid) - SELECT 1, p.jbp_uid FROM jbp_users p WHERE p.jbp_uname = "admin"; Copied: prod/forge/portal-extensions/forge-forums/scripts/conv.sql (from rev 1025, qa/forge/portal-extensions/forge-forums/scripts/conv.sql) Deleted: prod/forge/portal-extensions/forge-forums/scripts/diff.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-30 22:23:01 UTC (rev 1025) +++ prod/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-30 22:57:05 UTC (rev 1026) @@ -1,263 +0,0 @@ --- MySQL dump 10.9 --- --- Host: staging.jboss.com Database: nukes3 --- ------------------------------------------------------ - --- SELECTED NUKES3 TABLES WITH MIGRATION INFO TO JB PORTAL 2 DB - -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `nukes3`; - -USE `nukes3`; - --- --- Table structure for table `phpbb_categories` --- - -CREATE TABLE `phpbb_categories` ( --> jbp_forums_categories - `cat_id` mediumint(8) unsigned NOT NULL auto_increment, --> jbp_id - `cat_title` varchar(100) NOT NULL default '', --> jbp_title - `cat_order` mediumint(8) unsigned NOT NULL default '0', --> jbp_order - PRIMARY KEY (`cat_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_forums` --- - -CREATE TABLE `phpbb_forums` ( --> jbp_forums_forums - `forum_id` smallint(5) unsigned NOT NULL auto_increment, --> jbp_id - `cat_id` mediumint(8) unsigned default NULL, --> jbp_category_id - `forum_name` varchar(150) NOT NULL default '', --> jbp_name - -- NOTE: field type text --> varchar(255) - possible loss of data. - `forum_desc` text NOT NULL, --> jbp_description - `forum_status` tinyint(4) NOT NULL default '0', --> jbp_status - `forum_order` mediumint(8) unsigned NOT NULL default '1', --> jbp_order - `forum_posts` mediumint(8) unsigned NOT NULL default '0', --> jbp_post_count - `forum_topics` mediumint(8) unsigned NOT NULL default '0', --> jbp_topic_count - `forum_last_post_id` mediumint(8) unsigned default NULL, --> jbp_last_post_id - `prune_next` int(11) default NULL, --> jbp_prune_next - `prune_enable` tinyint(1) NOT NULL default '0', --> jbp_prune_enable - - -- NOTE: all of the auth* fields are not present in the portal DB. They probably - -- enabled forums administrators to specify what actions users can take. Data - -- loss here. - `auth_view` tinyint(2) NOT NULL default '0', - `auth_read` tinyint(2) NOT NULL default '0', - `auth_post` tinyint(2) NOT NULL default '1', - `auth_reply` tinyint(2) NOT NULL default '1', - `auth_edit` tinyint(2) NOT NULL default '3', - `auth_delete` tinyint(2) NOT NULL default '3', - `auth_sticky` tinyint(2) NOT NULL default '3', - `auth_announce` tinyint(2) NOT NULL default '3', - `auth_vote` tinyint(2) NOT NULL default '1', - `auth_pollcreate` tinyint(2) NOT NULL default '3', - `auth_attachments` tinyint(2) NOT NULL default '0', - - -- NOTE: new field in portal DB: - -- jbp_type - -- No idea what it's function is supposed to be though. - PRIMARY KEY (`forum_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_forums_watch` --- - - -- NOTE: here is a major incompatibility. In nukes, we have a simple implementation: - -- forum_id + user_id. Here, it's more complicated: - -- 1. user_id --> jbf_forums_posters.jbp_user_id - -- 2. jbf_forums_watch.jbp_poster_id references jbf_forums_poster.jbp_id - -- 3. jbf_forums_forumswatch.jbp_id references jbf_forums_watch.jbp_id - -- Any explanation on why jbf_forums_forumswatch is needed, instead of putting jbp_forum_id - -- in jbf_forums_watch is welcome. -CREATE TABLE `phpbb_forums_watch` ( --> jbp_forums_forumswatch & jbp_forums_watch - `forum_id` mediumint(8) unsigned NOT NULL default '0', --> jbp_forums_forumswatch.jbp_forum_id - `user_id` mediumint(8) NOT NULL default '0', --> jbp_forums_watch.jbp_poster_id - --> jbp_forums_posters.jbp_user_id - `watch_mode` tinyint(3) NOT NULL default '0', --> jbp_forums_watch.jbp_mode - PRIMARY KEY (`forum_id`,`user_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_posts` --- - -CREATE TABLE `phpbb_posts` ( --> jbp_forums_posts - `post_id` mediumint(8) unsigned NOT NULL auto_increment, --> jbp_id - `topic_id` mediumint(8) unsigned default NULL, --> jbp_topic_id - -- NOTE: This field does not have a corresponding one in portal DB. - -- But I think it's redundant anyway. You can get it get doing - -- SELECT t.forum_id FROM phpbb_topics t, php_bb posts p - -- WHERE t.topic_id = p.topic_id AND p.post_id = xx - `forum_id` smallint(5) unsigned default NULL, - -- NOTE: In phpbb, this references user_id. In forums portlet, this - -- references the posters table (which references the users table - - -- so one addition step here). - `poster_id` mediumint(11) default NULL, --> (jbp_poster_id) - `post_time` datetime NOT NULL default '0000-00-00 00:00:00', --> jbp_create_date - -- NOTE: The next three fields are not present in portal DB. Possible - -- loss of data. Also, afaik, forums portlet doesn't support bbcode. - `poster_ip` varchar(8) NOT NULL default '', - `post_username` varchar(25) default NULL, - `enable_bbcode` tinyint(1) NOT NULL default '1', - `enable_html` tinyint(1) NOT NULL default '0', --> jbp_htmlenabled - -- NOTE: This and next fields are also not present. Possble loss of data. - `enable_smilies` tinyint(1) NOT NULL default '1', - `enable_sig` tinyint(1) NOT NULL default '1', - `post_edit_time` datetime NOT NULL default '0000-00-00 00:00:00', --> jbp_edit_date - `post_edit_count` smallint(5) unsigned NOT NULL default '0', --> jbp_edit_count - `post_subject` varchar(60) NOT NULL default '', --> jbp_subject - `post_text` text NOT NULL, --> jbp_text - PRIMARY KEY (`post_id`), - KEY `topic_id` (`topic_id`), - KEY `forum_id` (`forum_id`), - KEY `phpbb_posts_topic_id` (`topic_id`), - KEY `phpbb_posts_forum_id` (`forum_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_topics` --- - -CREATE TABLE `phpbb_topics` ( --> jbp_forums_topics - `topic_id` mediumint(8) unsigned NOT NULL auto_increment, --> jbp_id - `forum_id` smallint(8) unsigned default NULL, --> jbp_forum_id - `topic_title` char(60) NOT NULL default '', --> jbp_subject - -- NOTE: This also has a different meaning in both DBs. See the posts table. - `topic_poster` mediumint(11) default NULL, --> (jbp_poster) - -- NOTE: This is not present in portal DB. But probably, can be calculated - -- by taking the first post date. - `topic_time` datetime NOT NULL default '0000-00-00 00:00:00', - `topic_views` mediumint(8) unsigned NOT NULL default '0', --> jbp_view_count - `topic_replies` mediumint(8) unsigned NOT NULL default '0', --> jbp_replies - `topic_status` tinyint(3) NOT NULL default '0', --> jbp_status - -- NOTE: In nukes3, this field holds just a yes/no: is there a pool (most probably). - -- And in the pools table, there is a field that is a reference to this table. Now, - -- in portal DB, it's done quite differently: for each topic a corresponding entry - -- in jbp_forums_polls is created. And the jbp_poll simply = jpb_id, as the ids in - -- both tabels are the same (well, at least during my tests - but I don't see why this should - -- ever be different; however, I suppose that the original intent was for this field - -- to hold jbp_forums_polls.jbp_id, which theoretically may be different from - -- jbp_forums_topics.jbp_id, but never is, as a new poll entry is created with a new - -- topic). - `topic_vote` tinyint(1) NOT NULL default '0', --> (jbp_poll) - `topic_type` tinyint(3) NOT NULL default '0', --> jbp_type - `topic_first_post_id` mediumint(8) unsigned default NULL, --> jbp_first_post_id - `topic_last_post_id` mediumint(8) unsigned default NULL, --> jbp_last_post_id - `topic_last_post_time` datetime NOT NULL default '0000-00-00 00:00:00', --> jbp_last_post_date - -- NOTE: This field is not present in portal DB. Possible loss of data. - `topic_moved_id` mediumint(8) unsigned default NULL, - PRIMARY KEY (`topic_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_topics_watch` --- - - -- NOTE: The table for topics watch exists in portal DB, but the feature is not - -- implemented. Also, it seemsthat the table lacks columns to hold all necessary - -- data. So here, all data would be lost. -CREATE TABLE `phpbb_topics_watch` ( --> (jbp_forums_topicswatch) - `topic_id` mediumint(8) unsigned NOT NULL default '0', --> jbp_topic_id - `user_id` mediumint(8) NOT NULL default '0', - `notify_status` tinyint(1) NOT NULL default '0', - PRIMARY KEY (`topic_id`,`user_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_vote_desc` --- - -CREATE TABLE `phpbb_vote_desc` ( --> jbp_forums_polls - `vote_id` mediumint(8) unsigned NOT NULL auto_increment, --> jbp_poll_id - -- NOTE: This field is not present in portal DB. Instead, there's a field - -- in jbp_forums_topic which holds a reference to this table. Also, in reality, - -- for each topic an empty (with jbp_title = NULL) poll is created. - `topic_id` mediumint(8) unsigned default NULL, - -- NOTE: Conversion from text to varchar(255). Possible loss of data. - `vote_text` text NOT NULL, --> jbp_title - -- NOTE: Not sure what this field means. In the DB, it has values like 2003, 2004. - -- So maybe it's the year of creation? - `vote_start` int(11) NOT NULL default '0', --> (jbp_creation_date) - `vote_length` int(11) NOT NULL default '0', --> jbp_length - PRIMARY KEY (`vote_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_vote_results` --- - -CREATE TABLE `phpbb_vote_results` ( --> jbp_forums_poll_option - -- NOTE: No unique id in portal DB. But that's not a problem, as it's role - -- is taken by (jbp_poll_id, jbp_poll_option_position). - `vote_option_id` mediumint(8) unsigned NOT NULL auto_increment, - `vote_desc_id` mediumint(8) unsigned default NULL, --> jbp_poll_id - `vote_option_text` varchar(255) NOT NULL default '', --> jbp_question - `vote_result` int(11) NOT NULL default '0', --> jbp_votes - -- NOTE: One new field in portal DB: - -- jbp_poll_option_position - -- It can be just filled with subsequent values. - PRIMARY KEY (`vote_option_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_vote_voters` --- - -CREATE TABLE `phpbb_vote_voters` ( --> jbp_forums_poll_voted - -- NOTE: This field is not present in portal DB. Not information loss though, - -- as it doesn't bring any necessary information. - `vote_id` mediumint(8) unsigned NOT NULL auto_increment, - `vote_desc_id` mediumint(8) unsigned default NULL, --> jbp_poll_id - -- NOTE: This is a user id, not a poster id - in the portal DB. - `vote_user_id` mediumint(8) unsigned default NULL, --> jbp_poll_voted - -- NOTE: This field is not present in portal DB. Loss of data. - `vote_user_ip` char(8) NOT NULL default '', - PRIMARY KEY (`vote_id`) -) TYPE=InnoDB; - - -- NOTE: No idea what is the role of the following two tables. - --- --- Table structure for table `tmp_posts` --- - -CREATE TABLE `tmp_posts` ( - `post_id` mediumint(8) unsigned NOT NULL default '0', - `topic_id` mediumint(8) unsigned default NULL, - `forum_id` smallint(5) unsigned default NULL, - `poster_id` mediumint(11) default NULL, - `post_time` datetime NOT NULL default '0000-00-00 00:00:00', - `poster_ip` varchar(8) NOT NULL default '', - `post_username` varchar(25) default NULL, - `enable_bbcode` tinyint(1) NOT NULL default '1', - `enable_html` tinyint(1) NOT NULL default '0', - `enable_smilies` tinyint(1) NOT NULL default '1', - `enable_sig` tinyint(1) NOT NULL default '1', - `post_edit_time` datetime NOT NULL default '0000-00-00 00:00:00', - `post_edit_count` smallint(5) unsigned NOT NULL default '0', - `post_subject` varchar(60) NOT NULL default '', - `post_text` text NOT NULL -) TYPE=InnoDB; - --- --- Table structure for table `tmp_topics` --- - -CREATE TABLE `tmp_topics` ( - `topic_id` mediumint(8) unsigned NOT NULL default '0', - `forum_id` smallint(8) unsigned default NULL, - `topic_title` char(60) NOT NULL default '', - `topic_poster` mediumint(11) default NULL, - `topic_time` datetime NOT NULL default '0000-00-00 00:00:00', - `topic_views` mediumint(8) unsigned NOT NULL default '0', - `topic_replies` mediumint(8) unsigned NOT NULL default '0', - `topic_status` tinyint(3) NOT NULL default '0', - `topic_vote` tinyint(1) NOT NULL default '0', - `topic_type` tinyint(3) NOT NULL default '0', - `topic_first_post_id` mediumint(8) unsigned default NULL, - `topic_last_post_id` mediumint(8) unsigned default NULL, - `topic_last_post_time` datetime NOT NULL default '0000-00-00 00:00:00', - `topic_moved_id` mediumint(8) unsigned default NULL -) TYPE=InnoDB; - Copied: prod/forge/portal-extensions/forge-forums/scripts/diff.sql (from rev 1025, qa/forge/portal-extensions/forge-forums/scripts/diff.sql) Deleted: prod/forge/portal-extensions/forge-forums/scripts/nukes3.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/nukes3.sql 2005-08-30 22:23:01 UTC (rev 1025) +++ prod/forge/portal-extensions/forge-forums/scripts/nukes3.sql 2005-08-30 22:57:05 UTC (rev 1026) @@ -1,759 +0,0 @@ --- MySQL dump 10.9 --- --- Host: staging.jboss.com Database: nukes3 --- ------------------------------------------------------ --- Server version 3.23.58 -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Current Database: `nukes3` --- - -DROP DATABASE nukes3; -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `nukes3`; - -USE `nukes3`; - --- --- Table structure for table `nuke_downloads_categories` --- - -DROP TABLE IF EXISTS `nuke_downloads_categories`; -CREATE TABLE `nuke_downloads_categories` ( - `categoryId` bigint(20) NOT NULL auto_increment, - `title` varchar(50) NOT NULL default '', - `description` text NOT NULL, - `parentId` bigint(20) default '0', - PRIMARY KEY (`categoryId`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_downloads_categories_old` --- - -DROP TABLE IF EXISTS `nuke_downloads_categories_old`; -CREATE TABLE `nuke_downloads_categories_old` ( - `categoryId` bigint(20) NOT NULL auto_increment, - `title` varchar(50) NOT NULL default '', - `description` text NOT NULL, - `parentId` bigint(20) default '0', - PRIMARY KEY (`categoryId`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_downloads_downloads` --- - -DROP TABLE IF EXISTS `nuke_downloads_downloads`; -CREATE TABLE `nuke_downloads_downloads` ( - `downloadId` bigint(20) NOT NULL auto_increment, - `categoryId` bigint(20) default '0', - `title` varchar(100) NOT NULL default '', - `url` varchar(100) NOT NULL default '', - `description` text NOT NULL, - `timestamp` datetime default NULL, - `name` varchar(100) NOT NULL default '', - `email` varchar(100) NOT NULL default '', - `hits` int(11) NOT NULL default '0', - `submitterId` int(11) default NULL, - `downloadratingsummary` double(6,4) NOT NULL default '0.0000', - `totalvotes` int(11) NOT NULL default '0', - `totalcomments` int(11) NOT NULL default '0', - `filesize` int(11) NOT NULL default '0', - `version` varchar(10) NOT NULL default '', - `homepage` varchar(200) NOT NULL default '', - PRIMARY KEY (`downloadId`), - KEY `categoryId` (`categoryId`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_downloads_downloads_old` --- - -DROP TABLE IF EXISTS `nuke_downloads_downloads_old`; -CREATE TABLE `nuke_downloads_downloads_old` ( - `downloadId` bigint(20) NOT NULL auto_increment, - `categoryId` bigint(20) default '0', - `title` varchar(100) NOT NULL default '', - `url` varchar(100) NOT NULL default '', - `description` text NOT NULL, - `timestamp` datetime default NULL, - `name` varchar(100) NOT NULL default '', - `email` varchar(100) NOT NULL default '', - `hits` int(11) NOT NULL default '0', - `submitterId` int(11) default NULL, - `downloadratingsummary` double(6,4) NOT NULL default '0.0000', - `totalvotes` int(11) NOT NULL default '0', - `totalcomments` int(11) NOT NULL default '0', - `filesize` int(11) NOT NULL default '0', - `version` varchar(10) NOT NULL default '', - `homepage` varchar(200) NOT NULL default '', - PRIMARY KEY (`downloadId`), - KEY `categoryId` (`categoryId`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_downloads_editorials` --- - -DROP TABLE IF EXISTS `nuke_downloads_editorials`; -CREATE TABLE `nuke_downloads_editorials` ( - `editorialId` bigint(20) NOT NULL auto_increment, - `downloadId` bigint(20) default NULL, - `reviewerId` int(11) default NULL, - `timestamp` datetime NOT NULL default '0000-00-00 00:00:00', - `editorial` text NOT NULL, - `title` varchar(100) NOT NULL default '', - PRIMARY KEY (`editorialId`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_downloads_modrequest` --- - -DROP TABLE IF EXISTS `nuke_downloads_modrequest`; -CREATE TABLE `nuke_downloads_modrequest` ( - `requestId` bigint(20) NOT NULL default '0', - `downloadId` bigint(20) default '0', - `categoryId` bigint(20) default '0', - `title` varchar(100) NOT NULL default '', - `url` varchar(100) NOT NULL default '', - `description` text NOT NULL, - `submitterId` int(11) default NULL, - `brokendownload` int(3) NOT NULL default '0', - `name` varchar(100) NOT NULL default '', - `email` varchar(100) NOT NULL default '', - `filesize` int(11) NOT NULL default '0', - `version` varchar(10) NOT NULL default '', - `homepage` varchar(200) NOT NULL default '', - PRIMARY KEY (`requestId`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_downloads_newdownload` --- - -DROP TABLE IF EXISTS `nuke_downloads_newdownload`; -CREATE TABLE `nuke_downloads_newdownload` ( - `downloadId` bigint(20) NOT NULL auto_increment, - `categoryId` bigint(20) default NULL, - `title` varchar(100) NOT NULL default '', - `url` varchar(100) NOT NULL default '', - `description` text NOT NULL, - `name` varchar(100) NOT NULL default '', - `email` varchar(100) NOT NULL default '', - `submitterId` int(11) default NULL, - `filesize` int(11) NOT NULL default '0', - `version` varchar(10) NOT NULL default '', - `homepage` varchar(200) NOT NULL default '', - PRIMARY KEY (`downloadId`), - KEY `categoryId` (`categoryId`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_downloads_ratings` --- - -DROP TABLE IF EXISTS `nuke_downloads_ratings`; -CREATE TABLE `nuke_downloads_ratings` ( - `ratingId` bigint(20) NOT NULL auto_increment, - `isOutside` tinyint(4) default NULL, - `rating` int(11) default NULL, - `hostname` varchar(250) binary default NULL, - `comments` varchar(250) binary default NULL, - `timestamp` datetime default NULL, - `userId` int(11) default NULL, - `downloadId` bigint(20) default NULL, - PRIMARY KEY (`ratingId`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_faq` --- - -DROP TABLE IF EXISTS `nuke_faq`; -CREATE TABLE `nuke_faq` ( - `pn_question` varchar(250) binary default NULL, - `pn_submitter` varchar(250) binary default NULL, - `pn_answer` varchar(250) binary default NULL, - `pn_id` int(11) NOT NULL auto_increment, - `pn_category_id` int(11) default NULL, - PRIMARY KEY (`pn_id`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_faq_categories` --- - -DROP TABLE IF EXISTS `nuke_faq_categories`; -CREATE TABLE `nuke_faq_categories` ( - `pn_name` varchar(250) binary default NULL, - `pn_language` varchar(250) binary default NULL, - `pn_id` int(11) NOT NULL auto_increment, - `pn_parent_id` int(11) default NULL, - PRIMARY KEY (`pn_id`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_file` --- - -DROP TABLE IF EXISTS `nuke_file`; -CREATE TABLE `nuke_file` ( - `pn_id` int(11) NOT NULL auto_increment, - `pn_fid` varchar(255) NOT NULL default '', - `pn_uid` int(11) default NULL, - `pn_content_type` varchar(50) NOT NULL default '', - `pn_content` longblob NOT NULL, - `pn_timest` datetime NOT NULL default '0000-00-00 00:00:00', - `pn_public` tinyint(1) NOT NULL default '0', - PRIMARY KEY (`pn_id`), - KEY `pn_fid` (`pn_fid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_file_old` --- - -DROP TABLE IF EXISTS `nuke_file_old`; -CREATE TABLE `nuke_file_old` ( - `pn_id` int(11) NOT NULL auto_increment, - `pn_fid` varchar(255) NOT NULL default '', - `pn_uid` int(11) default NULL, - `pn_content_type` varchar(50) NOT NULL default '', - `pn_content` longblob NOT NULL, - `pn_timest` datetime NOT NULL default '0000-00-00 00:00:00', - `pn_public` tinyint(1) NOT NULL default '0', - PRIMARY KEY (`pn_id`), - KEY `pn_fid` (`pn_fid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_filestat` --- - -DROP TABLE IF EXISTS `nuke_filestat`; -CREATE TABLE `nuke_filestat` ( - `pn_vmid` varchar(16) NOT NULL default '', - `pn_id` bigint(20) NOT NULL default '0', - `pn_from` bigint(20) NOT NULL default '0', - `pn_length` bigint(20) NOT NULL default '0', - `pn_view_count` bigint(20) NOT NULL default '0', - PRIMARY KEY (`pn_vmid`,`pn_id`,`pn_from`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_group_membership` --- - -DROP TABLE IF EXISTS `nuke_group_membership`; -CREATE TABLE `nuke_group_membership` ( - `pn_gid` int(11) NOT NULL default '0', - `pn_uid` int(11) NOT NULL default '0', - PRIMARY KEY (`pn_uid`,`pn_gid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_groups` --- - -DROP TABLE IF EXISTS `nuke_groups`; -CREATE TABLE `nuke_groups` ( - `pn_gid` int(11) NOT NULL auto_increment, - `pn_name` varchar(255) NOT NULL default '', - PRIMARY KEY (`pn_gid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_journal` --- - -DROP TABLE IF EXISTS `nuke_journal`; -CREATE TABLE `nuke_journal` ( - `pn_jid` int(11) NOT NULL auto_increment, - `pn_sid` int(11) default '0', - `pn_title` varchar(80) NOT NULL default '', - `pn_bodytext` text NOT NULL, - `pn_mood` varchar(48) NOT NULL default '', - `pn_pdate` datetime NOT NULL default '0000-00-00 00:00:00', - `pn_status` tinyint(1) NOT NULL default '0', - `pn_mdate` datetime NOT NULL default '0000-00-00 00:00:00', - PRIMARY KEY (`pn_jid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_journal_comments` --- - -DROP TABLE IF EXISTS `nuke_journal_comments`; -CREATE TABLE `nuke_journal_comments` ( - `pn_cid` int(11) NOT NULL auto_increment, - `pn_jid` int(11) default '0', - `pn_uid` int(11) NOT NULL default '0', - `pn_comment` text NOT NULL, - `pn_pdate` datetime NOT NULL default '0000-00-00 00:00:00', - PRIMARY KEY (`pn_cid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_journal_stats` --- - -DROP TABLE IF EXISTS `nuke_journal_stats`; -CREATE TABLE `nuke_journal_stats` ( - `pn_sid` int(11) NOT NULL auto_increment, - `pn_uid` int(11) NOT NULL default '0', - `pn_nop` int(11) NOT NULL default '0', - `pn_lp` datetime NOT NULL default '0000-00-00 00:00:00', - `pn_micro` datetime NOT NULL default '0000-00-00 00:00:00', - PRIMARY KEY (`pn_sid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_list_users` --- - -DROP TABLE IF EXISTS `nuke_list_users`; -CREATE TABLE `nuke_list_users` ( - `pn_uid` int(11) NOT NULL auto_increment, - `pn_user_regdate` datetime NOT NULL default '0000-00-00 00:00:00', - `pn_email` varchar(60) NOT NULL default '', - `pn_ip` varchar(128) NOT NULL default '', - `pn_pass` varchar(40) NOT NULL default '', - `pn_active` tinyint(1) default NULL, - PRIMARY KEY (`pn_uid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_news_comments` --- - -DROP TABLE IF EXISTS `nuke_news_comments`; -CREATE TABLE `nuke_news_comments` ( - `comment_id` int(11) NOT NULL auto_increment, - `reason_id` int(11) NOT NULL default '0', - `score` int(11) NOT NULL default '0', - `subject` varchar(250) binary NOT NULL default '', - `comment` text NOT NULL, - `create_date` datetime NOT NULL default '0000-00-00 00:00:00', - `ip_addr` varchar(250) binary NOT NULL default '', - `parent_cid` int(11) default NULL, - `story_id` int(11) default NULL, - `author_id` int(11) default NULL, - PRIMARY KEY (`comment_id`), - KEY `nuke_news_comments_idx0` (`comment_id`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_news_stories` --- - -DROP TABLE IF EXISTS `nuke_news_stories`; -CREATE TABLE `nuke_news_stories` ( - `allow_comments` tinyint(4) NOT NULL default '0', - `state` int(11) NOT NULL default '0', - `admin_notes` text, - `story_id` int(11) NOT NULL auto_increment, - `summary` text NOT NULL, - `ext_text` text NOT NULL, - `title` varchar(250) binary NOT NULL default '', - `views` int(11) NOT NULL default '0', - `create_date` datetime NOT NULL default '0000-00-00 00:00:00', - `ip_addr` varchar(250) binary NOT NULL default '', - `author_id` int(11) default NULL, - `topic_id` int(11) default NULL, - PRIMARY KEY (`story_id`), - KEY `nuke_news_stories_idx1` (`story_id`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_news_topics` --- - -DROP TABLE IF EXISTS `nuke_news_topics`; -CREATE TABLE `nuke_news_topics` ( - `state` int(11) NOT NULL default '0', - `topic_id` int(11) NOT NULL auto_increment, - `image` varchar(250) binary default NULL, - `name` varchar(250) binary NOT NULL default '', - `text` varchar(250) binary NOT NULL default '', - `views` int(11) NOT NULL default '0', - `create_date` datetime NOT NULL default '0000-00-00 00:00:00', - `ip_addr` varchar(250) binary NOT NULL default '', - `creator_id` int(11) default NULL, - PRIMARY KEY (`topic_id`), - UNIQUE KEY `name` (`name`), - KEY `nuke_news_topics_idx0` (`topic_id`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_profile` --- - -DROP TABLE IF EXISTS `nuke_profile`; -CREATE TABLE `nuke_profile` ( - `pn_id` int(11) NOT NULL auto_increment, - `pn_name` varchar(32) NOT NULL default '', - `pn_desc` varchar(255) NOT NULL default '', - `pn_status` tinyint(4) NOT NULL default '0', - `pn_usage` tinyint(4) NOT NULL default '0', - `pn_access` tinyint(4) NOT NULL default '0', - PRIMARY KEY (`pn_id`), - UNIQUE KEY `pn_name` (`pn_name`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_property` --- - -DROP TABLE IF EXISTS `nuke_property`; -CREATE TABLE `nuke_property` ( - `pn_id` int(11) NOT NULL auto_increment, - `pn_name` varchar(32) NOT NULL default '', - `pn_desc` varchar(255) NOT NULL default '', - `pn_type` tinyint(4) NOT NULL default '0', - `pn_prof_id` int(11) default NULL, - PRIMARY KEY (`pn_id`), - UNIQUE KEY `pn_prof_id` (`pn_prof_id`,`pn_name`), - KEY `pn_prof_id_2` (`pn_prof_id`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_property_default_value` --- - -DROP TABLE IF EXISTS `nuke_property_default_value`; -CREATE TABLE `nuke_property_default_value` ( - `pn_id` int(11) NOT NULL auto_increment, - `pn_value` varchar(32) NOT NULL default '', - `pn_desc` varchar(255) NOT NULL default '', - `pn_order` tinyint(4) NOT NULL default '0', - `pn_property_id` int(11) default NULL, - PRIMARY KEY (`pn_id`), - KEY `pn_property_id` (`pn_property_id`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_property_value` --- - -DROP TABLE IF EXISTS `nuke_property_value`; -CREATE TABLE `nuke_property_value` ( - `pn_id` int(11) NOT NULL auto_increment, - `pn_uid` int(11) default NULL, - `pn_property_id` int(11) default NULL, - `pn_value` varchar(255) NOT NULL default '', - PRIMARY KEY (`pn_id`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_services` --- - -DROP TABLE IF EXISTS `nuke_services`; -CREATE TABLE `nuke_services` ( - `pn_sid` varchar(128) NOT NULL default '', - `pn_last_modified` bigint(20) NOT NULL default '0', - `pn_class_name` varchar(255) NOT NULL default '', - PRIMARY KEY (`pn_sid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_services_attributes` --- - -DROP TABLE IF EXISTS `nuke_services_attributes`; -CREATE TABLE `nuke_services_attributes` ( - `pn_sid` varchar(128) NOT NULL default '', - `pn_aid` varchar(128) NOT NULL default '', - `pn_value` text, - PRIMARY KEY (`pn_sid`,`pn_aid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_services_attributes_old` --- - -DROP TABLE IF EXISTS `nuke_services_attributes_old`; -CREATE TABLE `nuke_services_attributes_old` ( - `pn_sid` varchar(128) NOT NULL default '', - `pn_aid` varchar(128) NOT NULL default '', - `pn_value` text, - PRIMARY KEY (`pn_sid`,`pn_aid`) -) TYPE=InnoDB; - --- --- Table structure for table `nuke_users` --- - -DROP TABLE IF EXISTS `nuke_users`; -CREATE TABLE `nuke_users` ( - `pn_uid` int(11) NOT NULL auto_increment, - `pn_uname` varchar(25) NOT NULL default '', - `pn_user_regdate` datetime NOT NULL default '0000-00-00 00:00:00', - `pn_user_viewemail` tinyint(1) NOT NULL default '1', - `pn_name` varchar(60) NOT NULL default '', - `pn_email` varchar(60) NOT NULL default '', - `pn_femail` varchar(60) NOT NULL default '', - `pn_url` varchar(254) NOT NULL default '', - `pn_timezone_offset` tinyint(4) NOT NULL default '0', - `pn_user_avatar` varchar(30) NOT NULL default 'blank.gif', - `pn_user_icq` varchar(15) NOT NULL default '', - `pn_user_aim` varchar(18) NOT NULL default '', - `pn_user_yim` varchar(25) NOT NULL default '', - `pn_user_msnm` varchar(25) NOT NULL default '', - `pn_user_from` varchar(100) NOT NULL default '', - `pn_user_lang` int(3) NOT NULL default '0', - `pn_user_occ` varchar(100) NOT NULL default '', - `pn_user_intrest` varchar(150) NOT NULL default '', - `pn_user_sig` varchar(255) NOT NULL default '', - `pn_bio` tinytext NOT NULL, - `pn_pass` varchar(40) NOT NULL default '', - `pn_theme` varchar(255) NOT NULL default '', - `pn_umode` varchar(10) NOT NULL default '', - `pn_uorder` tinyint(1) NOT NULL default '0', - `pn_thold` tinyint(1) NOT NULL default '0', - `pn_noscore` tinyint(1) NOT NULL default '0', - `pn_commentmax` int(11) NOT NULL default '4096', - `pn_last_visit` datetime NOT NULL default '1974-09-21 00:00:00', - `pn_prev_last_visit` datetime NOT NULL default '1974-09-21 00:00:00', - `pn_question` tinytext NOT NULL, - `pn_answer` tinytext NOT NULL, - `pn_enabled` tinyint(1) NOT NULL default '1', - `pn_fname` varchar(60) default NULL, - `pn_lname` varchar(60) default NULL, - `pn_cname` varchar(80) default NULL, - `pn_street` varchar(125) default NULL, - `pn_city` varchar(80) default NULL, - `pn_state` varchar(30) default NULL, - `pn_zip` varchar(20) default NULL, - `pn_country` varchar(80) default NULL, - `pn_phone` varchar(30) default NULL, - `pn_usertype` varchar(20) default NULL, - `pn_companysize` varchar(10) default NULL, - `pn_role` varchar(20) default NULL, - `pn_interestinjboss` varchar(20) default NULL, - `pn_hardware` varchar(50) default NULL, - `pn_os` varchar(50) default NULL, - `pn_usingsince` varchar(10) default NULL, - `pn_firsthear` varchar(20) default NULL, - `pn_newsletter` tinyint(1) default '0', - `pn_salescontact` tinyint(1) default '0', - `pn_memberplusdate` datetime default '0000-00-00 00:00:00', - `pn_title` varchar(50) default NULL, - `pn_supportcontact` tinyint(1) default NULL, - PRIMARY KEY (`pn_uid`), - UNIQUE KEY `pn_uname` (`pn_uname`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_categories` --- - -DROP TABLE IF EXISTS `phpbb_categories`; -CREATE TABLE `phpbb_categories` ( - `cat_id` mediumint(8) unsigned NOT NULL auto_increment, - `cat_title` varchar(100) NOT NULL default '', - `cat_order` mediumint(8) unsigned NOT NULL default '0', - PRIMARY KEY (`cat_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_forums` --- - -DROP TABLE IF EXISTS `phpbb_forums`; -CREATE TABLE `phpbb_forums` ( - `forum_id` smallint(5) unsigned NOT NULL auto_increment, - `cat_id` mediumint(8) unsigned default NULL, - `forum_name` varchar(150) NOT NULL default '', - `forum_desc` text NOT NULL, - `forum_status` tinyint(4) NOT NULL default '0', - `forum_order` mediumint(8) unsigned NOT NULL default '1', - `forum_posts` mediumint(8) unsigned NOT NULL default '0', - `forum_topics` mediumint(8) unsigned NOT NULL default '0', - `forum_last_post_id` mediumint(8) unsigned default NULL, - `prune_next` int(11) default NULL, - `prune_enable` tinyint(1) NOT NULL default '0', - `auth_view` tinyint(2) NOT NULL default '0', - `auth_read` tinyint(2) NOT NULL default '0', - `auth_post` tinyint(2) NOT NULL default '1', - `auth_reply` tinyint(2) NOT NULL default '1', - `auth_edit` tinyint(2) NOT NULL default '3', - `auth_delete` tinyint(2) NOT NULL default '3', - `auth_sticky` tinyint(2) NOT NULL default '3', - `auth_announce` tinyint(2) NOT NULL default '3', - `auth_vote` tinyint(2) NOT NULL default '1', - `auth_pollcreate` tinyint(2) NOT NULL default '3', - `auth_attachments` tinyint(2) NOT NULL default '0', - PRIMARY KEY (`forum_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_forums_watch` --- - -DROP TABLE IF EXISTS `phpbb_forums_watch`; -CREATE TABLE `phpbb_forums_watch` ( - `forum_id` mediumint(8) unsigned NOT NULL default '0', - `user_id` mediumint(8) NOT NULL default '0', - `watch_mode` tinyint(3) NOT NULL default '0', - PRIMARY KEY (`forum_id`,`user_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_posts` --- - -DROP TABLE IF EXISTS `phpbb_posts`; -CREATE TABLE `phpbb_posts` ( - `post_id` mediumint(8) unsigned NOT NULL auto_increment, - `topic_id` mediumint(8) unsigned default NULL, - `forum_id` smallint(5) unsigned default NULL, - `poster_id` mediumint(11) default NULL, - `post_time` datetime NOT NULL default '0000-00-00 00:00:00', - `poster_ip` varchar(8) NOT NULL default '', - `post_username` varchar(25) default NULL, - `enable_bbcode` tinyint(1) NOT NULL default '1', - `enable_html` tinyint(1) NOT NULL default '0', - `enable_smilies` tinyint(1) NOT NULL default '1', - `enable_sig` tinyint(1) NOT NULL default '1', - `post_edit_time` datetime NOT NULL default '0000-00-00 00:00:00', - `post_edit_count` smallint(5) unsigned NOT NULL default '0', - `post_subject` varchar(60) NOT NULL default '', - `post_text` text NOT NULL, - PRIMARY KEY (`post_id`), - KEY `topic_id` (`topic_id`), - KEY `forum_id` (`forum_id`), - KEY `phpbb_posts_topic_id` (`topic_id`), - KEY `phpbb_posts_forum_id` (`forum_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_topics` --- - -DROP TABLE IF EXISTS `phpbb_topics`; -CREATE TABLE `phpbb_topics` ( - `topic_id` mediumint(8) unsigned NOT NULL auto_increment, - `forum_id` smallint(8) unsigned default NULL, - `topic_title` char(60) NOT NULL default '', - `topic_poster` mediumint(11) default NULL, - `topic_time` datetime NOT NULL default '0000-00-00 00:00:00', - `topic_views` mediumint(8) unsigned NOT NULL default '0', - `topic_replies` mediumint(8) unsigned NOT NULL default '0', - `topic_status` tinyint(3) NOT NULL default '0', - `topic_vote` tinyint(1) NOT NULL default '0', - `topic_type` tinyint(3) NOT NULL default '0', - `topic_first_post_id` mediumint(8) unsigned default NULL, - `topic_last_post_id` mediumint(8) unsigned default NULL, - `topic_last_post_time` datetime NOT NULL default '0000-00-00 00:00:00', - `topic_moved_id` mediumint(8) unsigned default NULL, - PRIMARY KEY (`topic_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_topics_watch` --- - -DROP TABLE IF EXISTS `phpbb_topics_watch`; -CREATE TABLE `phpbb_topics_watch` ( - `topic_id` mediumint(8) unsigned NOT NULL default '0', - `user_id` mediumint(8) NOT NULL default '0', - `notify_status` tinyint(1) NOT NULL default '0', - PRIMARY KEY (`topic_id`,`user_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_vote_desc` --- - -DROP TABLE IF EXISTS `phpbb_vote_desc`; -CREATE TABLE `phpbb_vote_desc` ( - `vote_id` mediumint(8) unsigned NOT NULL auto_increment, - `topic_id` mediumint(8) unsigned default NULL, - `vote_text` text NOT NULL, - `vote_start` int(11) NOT NULL default '0', - `vote_length` int(11) NOT NULL default '0', - PRIMARY KEY (`vote_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_vote_results` --- - -DROP TABLE IF EXISTS `phpbb_vote_results`; -CREATE TABLE `phpbb_vote_results` ( - `vote_option_id` mediumint(8) unsigned NOT NULL auto_increment, - `vote_desc_id` mediumint(8) unsigned default NULL, - `vote_option_text` varchar(255) NOT NULL default '', - `vote_result` int(11) NOT NULL default '0', - PRIMARY KEY (`vote_option_id`) -) TYPE=InnoDB; - --- --- Table structure for table `phpbb_vote_voters` --- - -DROP TABLE IF EXISTS `phpbb_vote_voters`; -CREATE TABLE `phpbb_vote_voters` ( - `vote_id` mediumint(8) unsigned NOT NULL auto_increment, - `vote_desc_id` mediumint(8) unsigned default NULL, - `vote_user_id` mediumint(8) unsigned default NULL, - `vote_user_ip` char(8) NOT NULL default '', - PRIMARY KEY (`vote_id`) -) TYPE=InnoDB; - --- --- Table structure for table `tmp_posts` --- - -DROP TABLE IF EXISTS `tmp_posts`; -CREATE TABLE `tmp_posts` ( - `post_id` mediumint(8) unsigned NOT NULL default '0', - `topic_id` mediumint(8) unsigned default NULL, - `forum_id` smallint(5) unsigned default NULL, - `poster_id` mediumint(11) default NULL, - `post_time` datetime NOT NULL default '0000-00-00 00:00:00', - `poster_ip` varchar(8) NOT NULL default '', - `post_username` varchar(25) default NULL, - `enable_bbcode` tinyint(1) NOT NULL default '1', - `enable_html` tinyint(1) NOT NULL default '0', - `enable_smilies` tinyint(1) NOT NULL default '1', - `enable_sig` tinyint(1) NOT NULL default '1', - `post_edit_time` datetime NOT NULL default '0000-00-00 00:00:00', - `post_edit_count` smallint(5) unsigned NOT NULL default '0', - `post_subject` varchar(60) NOT NULL default '', - `post_text` text NOT NULL -) TYPE=InnoDB; - --- --- Table structure for table `tmp_topics` --- - -DROP TABLE IF EXISTS `tmp_topics`; -CREATE TABLE `tmp_topics` ( - `topic_id` mediumint(8) unsigned NOT NULL default '0', - `forum_id` smallint(8) unsigned default NULL, - `topic_title` char(60) NOT NULL default '', - `topic_poster` mediumint(11) default NULL, - `topic_time` datetime NOT NULL default '0000-00-00 00:00:00', - `topic_views` mediumint(8) unsigned NOT NULL default '0', - `topic_replies` mediumint(8) unsigned NOT NULL default '0', - `topic_status` tinyint(3) NOT NULL default '0', - `topic_vote` tinyint(1) NOT NULL default '0', - `topic_type` tinyint(3) NOT NULL default '0', - `topic_first_post_id` mediumint(8) unsigned default NULL, - `topic_last_post_id` mediumint(8) unsigned default NULL, - `topic_last_post_time` datetime NOT NULL default '0000-00-00 00:00:00', - `topic_moved_id` mediumint(8) unsigned default NULL -) TYPE=InnoDB; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - Copied: prod/forge/portal-extensions/forge-forums/scripts/nukes3.sql (from rev 1025, qa/forge/portal-extensions/forge-forums/scripts/nukes3.sql) Deleted: prod/forge/portal-extensions/forge-forums/scripts/portal-keys.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-30 22:23:01 UTC (rev 1025) +++ prod/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-30 22:57:05 UTC (rev 1026) @@ -1,113 +0,0 @@ --- ADDING KEYS AND INDEXES TO EXISITING PORTAL TABLES - AFTER A DATA IMPORT - --- --- Table structure for table `jbp_forums_categories` --- - -ALTER TABLE jbp_forums_categories - MODIFY jbp_id int(11) NOT NULL auto_increment, - ADD PRIMARY KEY (jbp_id); - --- --- Table structure for table `jbp_forums_forums` --- - -ALTER TABLE jbp_forums_forums MODIFY jbp_id int(11) NOT NULL auto_increment, - ADD PRIMARY KEY (jbp_id), - ADD INDEX (jbp_category_id), - ADD INDEX (jbp_last_post_id), - ADD FOREIGN KEY (jbp_category_id) REFERENCES jbp_forums_categories (jbp_id), - ADD FOREIGN KEY (jbp_last_post_id) REFERENCES jbp_forums_posts (jbp_id); - --- --- Table structure for table `jbp_forums_forumswatch` --- - -ALTER TABLE jbp_forums_forumswatch - ADD PRIMARY KEY (jbp_id), - ADD INDEX (jbp_forum_id), - ADD FOREIGN KEY (jbp_forum_id) REFERENCES jbp_forums_forums (jbp_id), - ADD FOREIGN KEY (jbp_id) REFERENCES jbp_forums_watch (jbp_id); - --- --- Table structure for table `jbp_forums_poll_option` --- - -ALTER TABLE jbp_forums_poll_option - ADD PRIMARY KEY (jbp_poll_id, jbp_poll_option_position), - ADD INDEX (jbp_poll_id), - ADD FOREIGN KEY (jbp_poll_id) REFERENCES jbp_forums_polls (jbp_id); - --- --- Table structure for table `jbp_forums_poll_voted` --- - -ALTER TABLE jbp_forums_poll_voted - ADD PRIMARY KEY (jbp_poll_id, jbp_poll_voted), - ADD INDEX (jbp_poll_id), - ADD FOREIGN KEY (jbp_poll_id) REFERENCES jbp_forums_polls (jbp_id); - --- --- Table structure for table `jbp_forums_polls` --- - -ALTER TABLE jbp_forums_polls - MODIFY jbp_poll_id int(11) NOT NULL auto_increment, - ADD PRIMARY KEY (jbp_poll_id); - --- --- Table structure for table `jbp_forums_posters` --- - -ALTER TABLE jbp_forums_posters - MODIFY jbp_id int(11) NOT NULL auto_increment, - ADD PRIMARY KEY (jbp_id), - ADD UNIQUE (jbp_user_id); - --- --- Table structure for table `jbp_forums_posts` --- - -ALTER TABLE jbp_forums_posts - MODIFY jbp_id int(11) NOT NULL auto_increment, - ADD PRIMARY KEY (jbp_id), - ADD INDEX (jbp_topic_id), - ADD INDEX (jbp_poster_id), - ADD FOREIGN KEY (jbp_topic_id) REFERENCES jbp_forums_topics (jbp_id), - ADD FOREIGN KEY (jbp_poster_id) REFERENCES jbp_forums_posters (jbp_id); - --- --- Table structure for table `jbp_forums_topics` --- - -ALTER TABLE jbp_forums_topics - MODIFY jbp_id int(11) NOT NULL auto_increment, - ADD PRIMARY KEY (jbp_id), - ADD INDEX (jbp_forum_id), - ADD INDEX (jbp_poll), - ADD INDEX (jbp_last_post_id), - ADD INDEX (jbp_first_post_id), - ADD INDEX (jbp_poster), - ADD FOREIGN KEY (jbp_forum_id) REFERENCES jbp_forums_forums (jbp_id), - ADD FOREIGN KEY (jbp_poll) REFERENCES jbp_forums_polls (jbp_id), - ADD FOREIGN KEY (jbp_last_post_id) REFERENCES jbp_forums_posts (jbp_id), - ADD FOREIGN KEY (jbp_first_post_id) REFERENCES jbp_forums_posts (jbp_id), - ADD FOREIGN KEY (jbp_poster) REFERENCES jbp_forums_posters (jbp_id); - --- --- Table structure for table `jbp_forums_topicswatch` --- - --- AS THIS FEATURE IS NOT YET IMPLEMENTED, LEAVING IT OUT. - --- --- Table structure for table `jbp_forums_watch` --- - -ALTER TABLE jbp_forums_watch - MODIFY jbp_id int(11) NOT NULL auto_increment, - ADD PRIMARY KEY (jbp_id), - ADD INDEX (jbp_poster_id), - ADD FOREIGN KEY (jbp_poster_id) REFERENCES jbp_forums_posters (jbp_id); - --- REST OF THE TABLES ALREADY HAVE KEY INFO. Copied: prod/forge/portal-extensions/forge-forums/scripts/portal-keys.sql (from rev 1025, qa/forge/portal-extensions/forge-forums/scripts/portal-keys.sql) Deleted: prod/forge/portal-extensions/forge-forums/scripts/portal-pure.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-30 22:23:01 UTC (rev 1025) +++ prod/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-30 22:57:05 UTC (rev 1026) @@ -1,249 +0,0 @@ --- PORTAL DB STRUCTURE WITHOUT KEY INFORMATION (FOR A PAINLESS DATA IMPORT) - --- --- Table structure for table `jbp_forums_categories` --- - -DROP TABLE IF EXISTS `jbp_forums_categories`; -CREATE TABLE `jbp_forums_categories` ( - `jbp_id` int(11) NOT NULL, - `jbp_order` int(11) default NULL, - `jbp_title` varchar(255) default NULL -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_forums` --- - -DROP TABLE IF EXISTS `jbp_forums_forums`; -CREATE TABLE `jbp_forums_forums` ( - `jbp_id` int(11) NOT NULL, - `jbp_category_id` int(11) default NULL, - `jbp_description` varchar(255) default NULL, - `jbp_last_post_id` int(11) default NULL, - `jbp_name` varchar(255) default NULL, - `jbp_order` int(11) default NULL, - `jbp_topic_count` int(11) default NULL, - `jbp_post_count` int(11) default NULL, - `jbp_prune_enable` tinyint(1) default NULL, - `jbp_prune_next` int(11) default NULL, - `jbp_status` int(11) default NULL, - `jbp_type` int(11) default NULL -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_forumswatch` --- - -DROP TABLE IF EXISTS `jbp_forums_forumswatch`; -CREATE TABLE `jbp_forums_forumswatch` ( - `jbp_id` int(11) NOT NULL default '0', - `jbp_forum_id` int(11) default NULL -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_poll_option` --- - -DROP TABLE IF EXISTS `jbp_forums_poll_option`; -CREATE TABLE `jbp_forums_poll_option` ( - `jbp_poll_id` int(11) NOT NULL default '0', - `jbp_votes` int(11) NOT NULL default '0', - `jbp_question` varchar(255) NOT NULL default '', - `jbp_poll_option_position` int(11) NOT NULL default '0' -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_poll_voted` --- - -DROP TABLE IF EXISTS `jbp_forums_poll_voted`; -CREATE TABLE `jbp_forums_poll_voted` ( - `jbp_poll_id` int(11) NOT NULL default '0', - `jbp_poll_voted` int(11) NOT NULL default '0' -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_polls` --- -DROP TABLE IF EXISTS `jbp_forums_polls`; -CREATE TABLE `jbp_forums_polls` ( - `jbp_poll_id` int(11) NOT NULL, - `jbp_title` varchar(255) default NULL, - `jbp_length` int(11) default NULL, - `jbp_creation_date` datetime NOT NULL default '0000-00-00 00:00:00' -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_posters` --- - -DROP TABLE IF EXISTS `jbp_forums_posters`; -CREATE TABLE `jbp_forums_posters` ( - `jbp_id` int(11) NOT NULL, - `jbp_user_id` int(11) default NULL, - `jbp_post_count` int(11) default NULL -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_posts` --- - -DROP TABLE IF EXISTS `jbp_forums_posts`; -CREATE TABLE `jbp_forums_posts` ( - `jbp_id` int(11) NOT NULL, - `jbp_topic_id` int(11) default NULL, - `jbp_edit_count` int(11) default NULL, - `jbp_edit_date` datetime default NULL, - `jbp_create_date` datetime default NULL, - `jbp_subject` varchar(255) default NULL, - `jbp_text` text, - `jbp_htmlenabled` tinyint(1) default NULL, - `jbp_poster_id` int(11) default NULL -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_topics` --- - -DROP TABLE IF EXISTS `jbp_forums_topics`; -CREATE TABLE `jbp_forums_topics` ( - `jbp_id` int(11) NOT NULL, - `jbp_forum_id` int(11) default NULL, - `jbp_view_count` int(11) default NULL, - `jbp_replies` int(11) default NULL, - `jbp_first_post_id` int(11) default NULL, - `jbp_last_post_id` int(11) default NULL, - `jbp_last_post_date` datetime default NULL, - `jbp_poster` int(11) default NULL, - `jbp_type` int(11) default NULL, - `jbp_status` int(11) default NULL, - `jbp_subject` varchar(255) default NULL, - `jbp_poll` int(11) default NULL -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_topicswatch` --- - -DROP TABLE IF EXISTS `jbp_forums_topicswatch`; -CREATE TABLE `jbp_forums_topicswatch` ( - `jbp_id` int(11) NOT NULL default '0', - `jbp_topic_id` int(11) default NULL -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_forums_watch` --- - -DROP TABLE IF EXISTS `jbp_forums_watch`; -CREATE TABLE `jbp_forums_watch` ( - `jbp_id` int(11) NOT NULL, - `jbp_poster_id` int(11) default NULL, - `jbp_mode` int(11) default NULL -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- FROM NOW ON, KEY INFORMATION IS PRESENT - IT DOES NOT CONFILCT WITH DATA --- IMPORT. - --- --- Table structure for table `jbp_role_membership` --- - -DROP TABLE IF EXISTS `jbp_role_membership`; -CREATE TABLE `jbp_role_membership` ( - `jbp_rid` int(11) NOT NULL default '0', - `jbp_uid` int(11) NOT NULL default '0', - PRIMARY KEY (`jbp_uid`,`jbp_rid`), - KEY `FKF4101738A7430374` (`jbp_rid`), - KEY `FKF4101738E70E4BD7` (`jbp_uid`) -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_roles` --- - -DROP TABLE IF EXISTS `jbp_roles`; -CREATE TABLE `jbp_roles` ( - `jbp_rid` int(11) NOT NULL auto_increment, - `jbp_name` varchar(255) default NULL, - `jbp_displayname` varchar(255) default NULL, - PRIMARY KEY (`jbp_rid`), - UNIQUE KEY `jbp_name` (`jbp_name`), - UNIQUE KEY `jbp_displayname` (`jbp_displayname`) -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_user_pref` --- - -DROP TABLE IF EXISTS `jbp_user_pref`; -CREATE TABLE `jbp_user_pref` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_name` varchar(255) NOT NULL default '', - `jbp_type` int(11) default NULL, - `jbp_set_id` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - KEY `FK93CC44D0AF499A90` (`jbp_set_id`) -) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_user_pref_prop_value` --- - -DROP TABLE IF EXISTS `jbp_user_pref_prop_value`; -CREATE TABLE `jbp_user_pref_prop_value` ( - `jbp_prop_id` int(11) NOT NULL default '0', - `jbp_value` varchar(255) defau... [truncated message content] |
550 messages has been excluded from this view by a project administrator.
