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
|
Author: dam...@jb... Date: 2005-08-30 17:59:37 -0400 (Tue, 30 Aug 2005) New Revision: 1024 Removed: prod/forge/portal-extensions/jboss-as-binaries/to-copy/ Modified: prod/forge/doc/en/modules/administration.xml prod/forge/doc/en/modules/building.xml prod/forge/doc/en/modules/creation.xml prod/forge/doc/en/modules/introduction.xml prod/forge/doc/en/modules/theforge.xml prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java prod/forge/portal-extensions/forge-portal-attr/maven.xml prod/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 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/fileaccess/WikiFileAccessFilter.java prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java Log: MERGED: r 987:1019 https://svn.labs.jboss.com/qa/forge into prod forge. This REMOVES the RC2 AS. About to do another merge.. to bring in the RC1 again. Modified: prod/forge/doc/en/modules/administration.xml =================================================================== --- prod/forge/doc/en/modules/administration.xml 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/doc/en/modules/administration.xml 2005-08-30 21:59:37 UTC (rev 1024) @@ -7,7 +7,7 @@ communication between developers.Managing the contents of a project should be as simple as the management of your own local files. The Forge CMS Subversion Repository can be mounted as an external network drive on most systems. It is refered throughout this document - as the Forge File System Drive and can be accessed at . + as the Forge File System Drive and can be accessed at <ulink url="https://cms.labs.jboss.com"></ulink>. </para> <para> The strucure of the repository is shown in <xref linkend="repo.fig"/>. @@ -50,7 +50,7 @@ <ulink url="http://tortoisesvn.tigris.org/"></ulink> </listitem> <listitem> - <command>Command line Subversion client</command> + <command>Command line Subversion client </command> <ulink url="http://subversion.tigris.org/project_packages.html"></ulink> </listitem> @@ -162,7 +162,7 @@ </programlisting> </listitem> <listitem> - Create and put a downloads.xml, which has the following structure: + Create and put in the downloads directory you created a downloads.xml, which has the following structure: <programlisting> <downloads> <categories> @@ -211,8 +211,17 @@ </sect1> <sect1 id="blog-comp"><title>Blog</title> <para> - Something on Blojsom and the component Blog - in general, then explain - what the other sections are about. + Blojsom, while simple in design, provides features such as: </para> + <simplelist> + <member> - multiple blogs on a single installation of the software</member> + <member> - generation of HTML, RDF, RSS 0.92, RSS 2.0, RSS 2.0 (with comments and trackbacks) + and Atom syndication feeds</member> + <member> - support of any number of users per blog</member> + <member> - configuration of the types of files that can be treated as blog entries</member> + </simplelist> + <para> + The following sections will direct you through the steps from configuring your own blog + to editing your blog entries. </para> <sect2 id="admin-blog"><title>Project Administrators - Creating the Blog For Your Project</title> <para> @@ -266,30 +275,30 @@ Before the blog entries can be displayed on JBoss Labs, the administrator has to create a blog under blojsom, that will be accessed through the project. Follow these steps to do so: </para> - <simplelist> - <member> + <orderedlist numeration="arabic"> + <listitem> Log in as administrator on the blojsom console, located at <literal>{portalhome}/blojsom/blog/?flavor=admin</literal> - </member> - <member> + </listitem> + <listitem> Select <command>Weblog Settings</command> and <command>Users</command> where you need to create a new user of the blog for your project - </member> - <member> + </listitem> + <listitem> For <command>Blog User ID</command> enter the exact id of your project - </member> - <member> + </listitem> + <listitem> For <command>Blog User password</command> enter a password - </member> - <member> + </listitem> + <listitem> For <command>Blog base URL</command> enter the base URL of the JBoss Labs - </member> - <member> + </listitem> + <listitem> For <command>Blog URL</command> enter the id of your project at the end of this URL: - </member> - </simplelist> + </listitem> + </orderedlist> <programlisting> - http://forge.jboss.com/portal/index.html?ctrl:id=page.default.info&project={project-id} +http://forge.jboss.com/portal/index.html?ctrl:id=page.default.info&project=sampleid </programlisting> </sect2> <sect2 id="dev-blog"> @@ -339,6 +348,6 @@ Note: <literal>{portal-name}</literal> is <literal>default</literal> for Forge and <literal>federation</literal> for JOSF - all paths are relative to the Forge FileSystem Drive which is described in the Repository chapter. + all paths are relative to the Forge FileSystem Drive which is described in <xref linkend="repo"/>. </sect2></sect1> </chapter> \ No newline at end of file Modified: prod/forge/doc/en/modules/building.xml =================================================================== --- prod/forge/doc/en/modules/building.xml 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/doc/en/modules/building.xml 2005-08-30 21:59:37 UTC (rev 1024) @@ -8,24 +8,33 @@ <listitem>JBoss Portal 2.0 (<ulink url="http://www.jboss.org/products/jbossportal#files"></ulink>, with the forums portlet) </listitem> - <listitem>Blojsom's blog (<ulink url="http://wiki.blojsom.com/wiki/display/blojsom/About+blojsom"> + <listitem>Blojsom's blog (<ulink url="http://wiki.blojsom.com/wiki/display/blojsom/"> </ulink>) </listitem> <listitem>Maven (<ulink url="http://maven.apache.org/"></ulink>) </listitem> - </itemizedlist> + <listitem>Database and Database connector (MySQL, Hypersonic DB, PostGreSQL, Oracle 10g) + You must make sure that your JDBC connector for your database is under + <literal>JBOSS_HOME/server/default/lib</literal>. MySQL and PostGre connectors can be found here: + </listitem> + </itemizedlist> + <simplelist> + <member><ulink url="http://dev.mysql.com/downloads/connector/j/3.1.html"></ulink></member> + <member><ulink url="http://jdbc.postgresql.org/download.html"></ulink></member> + </simplelist> + </sect1> <sect1 id="install"> <title>Installing JBoss AS integrated with JBoss Portal 2.0</title> <para> The JBoss application server is available as a free download from the JBoss website. - (http://www.jboss.org/downloads/index) We provide both a binary and source distribution, + We provide both a binary and source distribution, but if you are just getting started with JBoss, stick to the binary distribution, which can be run straight out of the box. </para> <para> The binary versions are available as either .zip, .tar.gz, .bz2 files. The contents are the same - so grab whichever flavor is most convenient for the platform you’re running on. Once it's downloaded, + so grab whichever flavor is most convenient for the platform you’e running on. Once it's downloaded, unpack the archive to a suitable location on your machine. It should all unpack into a single directory named jboss-4.0.2. Of course the version number suffix will be different if you are running a later release. Make sure you don't use a directory which has any spaces in the path @@ -38,11 +47,22 @@ JDK installation. </para> <para> - When you have all these files, unpack the application server and deploy both the portal and - the blog into it (normally this means copying jboss-portal.sar, portal-forums.ear and blojsom.war to - $JBOSS_HOME/server/default/deploy). More detailed instructions on the server and portal installation - can be found here: + All databases supported by hibernate are supported by JBoss Portal. The JBoss Portal Guide has a + list of steps that should be followed on any DB, + refer to </para> + <simplelist><member><ulink url="http://docs.jboss.com/jbportal/v2.0Final/user-guide/en/html/installation.html#d0e410"></ulink> + </member> + </simplelist> + <para> + When you have all these files, and have successfully installed the application server, you are + ready to deploy the portal and the blog into it - simply copy <literal>jboss-portal.sar</literal>, + <literal>portal-forums.ear</literal> and <literal>blojsom.war</literal> to</para> + <programlisting>$JBOSS_HOME/server/default/deploy</programlisting> + <para> + which is the deploy directory of the portal. More detailed instructions on the server and portal + installation can be found here: + </para> <simplelist> <member>JBoss Portal - <ulink url="http://docs.jboss.com/jbportal/v2.0Final/user-guide/en/html/"></ulink> </member> @@ -53,7 +73,7 @@ <sect1 id="checkout"><title>Checking Out Forge From Subversion</title> After you have installed Maven (instructions for doing so can be obtained from the Maven website <ulink url="http://maven.apache.org/start/install.html"></ulink>) and a Subversion - client (please refer to <xref linkend="admin"/> for more information on Subversion), + client (please refer to <xref linkend="subversion"/> for more information on Subversion), you can check out the forge from svn. To do so, type: <programlisting> svn checkout svn+ssh://use...@fo.../usr/local/forge/svn @@ -71,24 +91,24 @@ $WC/trunk/forge subdirectory, where $WC is your working copy directory. There are a few <literal>.properties</literal> files you need to fill out for your own configuration. - <simplelist> - <member><literal>build.properties</literal> + <itemizedlist> + <listitem><literal>build.properties</literal> You have to make your own build.properties file in ./forge/portal-extensions/. Just copy <literal>buil.properties.sample</literal> and fill it with the data corresponding to your machine. - </member> - <member><literal>jspwiki.properties</literal> + </listitem> + <listitem><literal>jspwiki.properties</literal> To get your wiki working you have to point jspwiki.fileSystemProvider.pageDir and jspwiki.basicAttachmentProvider.storageDir in <programlisting> - ./forge/portal-extensions/jspwiki/etc/jspwiki.properties to your machine-dependent place. - </programlisting> + ./forge/portal-extensions/jspwiki/etc/jspwiki.properties</programlisting> to your machine-dependent place. + Maven copies the base jspwiki structure to the server folder. So it may be for example ../jboss-4.0.2/server/jspwiki-pages. - </member> - <member><literal>blojsom.properties</literal> + </listitem> + <listitem><literal>blojsom.properties</literal> To be able to use the Blog, you need to create a blojsom.properties file in - </member> + <programlisting> ./forge/portal-extensions/blojsom/to-copy/blojsom.war/WEB-INF/ </programlisting> and set the following values: @@ -105,28 +125,29 @@ blojsom-templates-directory=/templates/ blojsom-resource-directory=/resources/ </programlisting> +</listitem> - <member><literal>forge.properties</literal> + <listitem><literal>forge.properties</literal> To be able to read files from the content repository you need to set in ./forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties file the following values relative to your system: <literal>svnpath, svnusername, svnpassword, localpath, blogpath</literal> - </member> - </simplelist> + </listitem> + </itemizedlist> <para> Here's a list of the available build targets: </para> <itemizedlist> <listitem><command>clean-all</command> - cleans all projects - normally, this means deleting the "target" directory</listitem> - <listitem>build-all - executes the build goal of all projects - but it doesn't do any cleaning before</listitem> - <listitem>deploy-all - deployes all extensions, that is, calls the deploy goal of every project - note that it doesn't do a build</listitem> - <listitem>prepare-repo - prepares the repository before building: copies libraries from the binaries directory; compiles and copies the forge-common.jar file</listitem> - <listitem>all = prepare-repo, clean-all, build-all, deploy-all, in that order. </listitem> - <listitem>all-redeploy = all, redeploy the portal using jmx - you need to specify the jmx + <listitem><command>build-all</command> - executes the build goal of all projects - but it doesn't do any cleaning before</listitem> + <listitem><command>deploy-all</command> - deployes all extensions, that is, calls the deploy goal of every project - note that it doesn't do a build</listitem> + <listitem><command>prepare-repo</command> - prepares the repository before building: copies libraries from the binaries directory; compiles and copies the forge-common.jar file</listitem> + <listitem><command>all</command> = prepare-repo, clean-all, build-all, deploy-all, in that order. </listitem> + <listitem><command>all-redeploy</command> = all, redeploy the portal using jmx - you need to specify the jmx properties for this to work.</listitem> </itemizedlist> <para> - So to begin with, it's best to call <literal>maven all-nojmx</literal> target, which will + So to begin with, it's best to call <literal><command>maven all-nojmx</command></literal> target, which will compile and deploy everything. After compleating these steps, you can start the portal. If everything goes well, you will be able to see an "empty" forge installation under the address: http://localhost:8080/portal. Modified: prod/forge/doc/en/modules/creation.xml =================================================================== --- prod/forge/doc/en/modules/creation.xml 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/doc/en/modules/creation.xml 2005-08-30 21:59:37 UTC (rev 1024) @@ -1,6 +1,6 @@ <chapter id="creation"> <title>Developing Forge Components</title> - <section> + <sect1 id="components"> <title>Introduction</title> <para> After we have already presented the different components of the Forge infrastructure @@ -11,8 +11,8 @@ this is a chapter that will help you manage the files in your repository, acquaint you with the cache we use and how to write your own portlets. </para> - </section> - <section><title>Storing Files in the Repository</title> + </sect1> + <sect1 id="storing-repo"><title>Storing Files in the Repository</title> <para> The Forge relies on a content managment systems from which files can be read. Among others, JSP and html pages are stored there. The classes resposible for reading and managing the content @@ -53,9 +53,9 @@ <para> And, of course don't forget to add the jsp pages to your repository. </para> - </section> + </sect1> - <section> + <sect1 id="cache"> <title>Cache</title> <para> The content reader class provides a simple cache. The basic methods to acces it are: @@ -67,14 +67,14 @@ by the get method if the content expires and no watched files have changed. Instead, the content's time stamp will be renewed. </para> - </section> + </sect1> - <section> + <sect1 id="portlets"> <title>Writing Your Own Content-Based Portlets</title> <para> The easiest way to do this is to extend the <literal>ContentPortlet</literal> class and implement some abstract methods for generating and displaying the content. You can find their purpose and descriptions in the JavaDocs. </para> - </section> + </sect1> </chapter> Modified: prod/forge/doc/en/modules/introduction.xml =================================================================== --- prod/forge/doc/en/modules/introduction.xml 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/doc/en/modules/introduction.xml 2005-08-30 21:59:37 UTC (rev 1024) @@ -1,27 +1,25 @@ <chapter id="introduction"> <title>Introduction</title> - <section> - <title>Preface</title> + <sect1 id="preface"> + <title>Preface</title> <para> JBoss Labs was created to give JBoss and other open source projects a place to call home. JBoss Labs relies on an infrastructure, called JBoss Forge which has everything an open source project needs to enable a community of developers to communicate and distribute their ideas. </para> - </section> - <section> + </sect1> + <sect1 id="welcome"> <title>Welcome to JBoss Labs</title> <para> JBoss Labs is a Professional Open Source community where Professional Open Source programmers around the world come to collaborate and create software for everyone.It is also the culmination of the efforts of developers (listed below as well as of all contributors to the JBoss Enterprise Middleware System (JEMS)) to bring about a set of processes and infrastructure that enable the - communication of ideas between the open source developers and their community. + communication of ideas between the open source developers and their community. JBoss is helping + to nurture that communication with its JEMS offering a commitment to Professional Open Source + developers around the world. JBoss Labs is an essential element of this System. Its base layers + are shown in <xref linkend="layers.fig"/>. </para> - <para> - JBoss is helping to nurture communication in open source communities with its JEMS offering a - commitment to Professional Open Source developers around the world. JBoss Labs is an essential element - of this System. Its base layers are shown in <xref linkend="layers.fig"/>. - </para> <figure id="layers.fig"> <title>The Layers of Jboss Labs</title> <mediaobject> @@ -33,31 +31,31 @@ <para> Development team: </para> - <itemizedlist> - <listitem>Damon Sicore</listitem> - <listitem>Adam Warski</listitem> - <listitem>Tomasz Szymanski</listitem> - <listitem>Rali Genova</listitem> - </itemizedlist> + <simplelist> + <member>Damon Sicore</member> + <member>Adam Warski</member> + <member>Tomasz Szymanski</member> + <member>Rali Genova</member> + </simplelist> <para> This tutorial is for everyone who wants to contribute to JBoss Labs or make use of the project. It is divided in a few major sections as follows: </para> <itemizedlist> <listitem> - <xref linkend="theforge"/> presents the structure and major components of the Forge Project. + <command><xref linkend="theforge"/></command> presents the structure and major components of the Forge Project. </listitem> <listitem> - <xref linkend="build"/> describes the process of downloading and installing the necessary + <command><xref linkend="build"/></command> describes the process of downloading and installing the necessary software for JBoss Forge Project, as well as build details. </listitem> <listitem> - <xref linkend="admin"/> is a detailed description on project creation, repository, Subversion, + <command><xref linkend="admin"/></command> is a detailed description on project creation, repository, Subversion, anything you need to know as a project administrator. </listitem> <listitem> - <xref linkend="creation"/> is a guide on how to develop Forge components. + <command><xref linkend="creation"/></command> is a guide on how to develop Forge components. </listitem> </itemizedlist> - </section> + </sect1> </chapter> Modified: prod/forge/doc/en/modules/theforge.xml =================================================================== --- prod/forge/doc/en/modules/theforge.xml 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/doc/en/modules/theforge.xml 2005-08-30 21:59:37 UTC (rev 1024) @@ -1,6 +1,6 @@ <chapter id="theforge"> <title>The Forge</title> - <section> + <sect1 id="infrastructure"> <title>JBoss Forge Infrastructure</title> <para> JBoss Forge is an infrastructure designed to be a hosting platform for general purpose open souce @@ -12,39 +12,40 @@ </para> <itemizedlist> <listitem> - A general purpose project management system based on XML Project Descriptors + general purpose project management system based on XML Project Descriptors </listitem> <listitem> - A content management system that uses WebDAV as the primary access mechanism + content management system that uses WebDAV as the primary access mechanism </listitem> <listitem> - A revision control system tightly integrated with the content management system - </listitem> + revision control system tightly integrated with the content management system + </listitem> <listitem> - A fast and simple wiki mechanism + fast and simple blogging tool set that is integrated with CMS and revision control </listitem> <listitem> - A simple and fast blogging tool set that is integrated with CMS and revision control + integrated Forums </listitem> <listitem> - Integrated Forums + fast and simple wiki mechanism </listitem> <listitem> - Simple user authentication and authorization + simple user authentication and authorization </listitem> <listitem> - Easily add components as new open source development tools become available (e.g., RCS integration tools, documentation and authoring tools, etc.) + easy to add components as new open source development tools become available (e.g., RCS integration tools, documentation and authoring tools, etc.) </listitem> <listitem> - An integrated Download Center so that open source projects can quickly distribute source and binaries + integrated Download Center so that open source projects can quickly distribute source and binaries </listitem> <listitem> - An integrated Documentation Center enabling rapid dissemination of knowledge to users and other developers + integrated Documentation Center enabling rapid dissemination of knowledge to users and other developers </listitem> - <listitem> - Everything, including the Forge itself, is open source and open to the public for public review and contribution. - </listitem> </itemizedlist> + <para> + Everything, including the Forge itself, is open source and open to the public for review and contribution. + </para> + <figure id="infrastructure.fig"> <title>The Forge Infrastructure</title> <mediaobject> @@ -53,16 +54,16 @@ </imageobject> </mediaobject> </figure> - </section> - <section> + </sect1> + <sect1 id="forge-comp"> <title>Forge Components</title> - <formalpara><title>XML Project Descriptors</title> - Projects on the Forge are created by simply adding an entry into a <literal>projects.xml</literal> + <sect2 id="xml-descr"><title>XML Project Descriptors</title> + <para>Projects on the Forge are created by simply adding an entry into a <literal>projects.xml</literal> file. This will create a whole new top level project on the Forge. An example of such a project is JRUnit. Its project was created by adding an entry into the <literal>projects.xml</literal> Forge Project Descriptor file. You can read more on the use of descriptors and how to create them - on the descriptor page in <xref linkend="admin"/>. - </formalpara> + on the descriptor page in <xref linkend="xml"/>. + </para> <para> All descriptors for projects are stored in the content management system for the Forge. In fact, almost everything is stored in the CMS. There are a few types of descriptors that are required to @@ -77,8 +78,9 @@ hardware component. Since the user can define what their project consists of, it can be used for creating a community site for any organized topic. </para> - <formalpara><title>WebDAV Content Management System (CMS)</title> - When you have many people with a lot of different ideas, you want to make it easy for them to + </sect2> + <sect2 id="webdav"><title>WebDAV Content Management System (CMS)</title> + <para>When you have many people with a lot of different ideas, you want to make it easy for them to communicate those ideas among each other. The ideas are materialized as content in a project. Managing that content should be as easy as managing the content on your own disk or filesystem. You are used to doing that every day. You probably have dozens, if not hundreds, of Word files @@ -87,13 +89,13 @@ the embodiment of your good ideas, and publish it to a community portal as easily as simply dragging it to a folder, we believe that is much easier than using an extra fancy web interface or learning a new piece of software or publishing framework to do so. - </formalpara> + </para> <para> The goal of the Forge is to make it that easy. We have chosen to use WebDAV as the primary mechanism for publishing content to the portal, and providing a simple structure to your content filesystem that enables you to easily publish your ideas. Also, since the Forge is primarily aimed at programmers and communicating ideas through source code, revision control is absolutely essential. So, we have chosen - Subversion as our content repository - more on that could be found in <xref linkend="admin"/>. + Subversion as our content repository - more on that could be found in <xref linkend="repo"/>. </para> <para> Subversion supports WebDAV access to the repository--and just in the nick of time. While previous @@ -101,14 +103,15 @@ as Dreamweaver and other WebDAV enabled publishing tools to access the repository directly. This type of access is critical for quickly collaborating and publishing content. </para> - <formalpara><title>Revision Control System</title> - As mentioned above, Subversion is our source code repository and revision control system. Forge + </sect2> + <sect2 id="rev-control"><title>Revision Control System</title> + <para>As mentioned above, Subversion is our source code repository and revision control system. Forge projects have the option to use it for their source code revision control system. This repository is publicly accessible for, at a minimum, read-only access, and for project administrators and committers there is read-write access. While the Forge encourages open communication and contributions, it is essential to control access to Professional Open Source project source code in order to guarantee that malicious or proprietary code is not added to a project's product(s). - </formalpara> + </para> <para> In order to implement authorization and authentication, we again use WebDAV and directory level controls to limit or grant access to certain locations in the source code/content repository. @@ -120,45 +123,49 @@ which is currently a separate application. Future versions of the Forge will attempt to place the wiki in the repository as to eliminate heterogeneous content management methods. </para> - <formalpara><title>Wiki</title> - Wiki is the place where we create and document the processes for Professional Open Source development. + </sect2> + <sect2 id="wiki"><title>Wiki</title> + <para>Wiki is the place where we create and document the processes for Professional Open Source development. Main goal of Wiki is to provide an easy environment for POS communities to provide access to the products of their ideas. The JBoss Forge Development Team has chosen JSPWiki as the simplest and easiest to integrate solution. Adding and modifying files is fairly easy and open to everyone. - </formalpara> + </para> <para> - More on Wiki could be found on the JBoss Labs website <ulink url="http://forge.jboss.com/"></ulink> + More on Wiki could be found on the JBoss Labs website <ulink url="http://labs.jboss.com/"></ulink> </para> - <formalpara><title>Blog</title> - Blogging is a great way to distribute news and content. People can easily subscribe to content. + </sect2> + <sect2 id="blog"><title>Blog</title> + <para>Blogging is a great way to distribute news and content. People can easily subscribe to content. The Forge includes integrated blogging via Blojsom (at the moment). Blojosm was a logical choice as it provides the RSS and XML feeds we need to syndicate content. To facilitate the publishing of content, again, the WebDAV CMS mechanism was chosen. To publish a blog entry, you simply place a text or HTML file in a directory on your Forge Filesystem Drive under the proper directory - (see <xref linkend="admin"/>). A few minutes later, the content will be published automatically to + (see <xref linkend="repo"/>). A few minutes later, the content will be published automatically to your blog feed. To remove or update content, you just remove or update the file from your Forge Filesystem Drive. Again, a few minutes later, your entry will be removed or updated. - </formalpara> - <formalpara><title>Forums</title> - We currently use the same forums as the JBoss, Inc. forums. These forums enable the community + </para> + </sect2> + <sect2 id="forums"><title>Forums</title> + <para>We currently use the same forums as the JBoss, Inc. forums. These forums enable the community to collaborate by subscribing to forum posts that are made by anyone interested in a particular topic. The Forge project has integrated forums portlet, that is ready for deployment. - </formalpara> + </para> <itemizedlist> <listitem>JBoss Forums - <ulink url="http://www.jboss.com/index.html?module=bb"></ulink></listitem> <listitem>JBoss Labs Forums - <ulink url="http://www.jboss.com/index.html?module=bb&op=main&c=17"></ulink></listitem> <listitem>Forge Forums - <ulink url="http://forge.jboss.com/portal/index.html?ctrl:id=page.default.forgeforums"></ulink></listitem> </itemizedlist> - <formalpara><title>Downloads</title> - One of the components available to every project hosted + </sect2> + <sect2 id="d-d"><title>Downloads and Documentation</title> + <para>One of the components available to every project hosted on JBoss Labs is <literal>downloads</literal>. It enables project administrators to add files that users can freely download. For a detail description on how this is done, see - <xref linkend="admin"/>. - </formalpara> - <formalpara><title>Documentation</title> + <xref linkend="xml"/>. + </para> + <para> Similar to the Downloads component, every project in Labs can specify its own documentation. - The descriptors and how to publish your documents can also be found in <xref linkend="admin"/>. - </formalpara> - - </section> + The descriptors and how to publish your documents can also be found in <xref linkend="xml"/>. + </para> + </sect2> + </sect1> </chapter> Modified: prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java =================================================================== --- prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-08-30 21:59:37 UTC (rev 1024) @@ -93,7 +93,10 @@ .getServerName()); feedAddress = replaceProperty(feedAddress, "${host.port}", Integer .toString(request.getServerPort())); - feedAddress = replaceProperty(feedAddress, "${project.name}", projectId); + if (projectId != null) + feedAddress = replaceProperty(feedAddress, "${project.name}", projectId); + else + feedAddress = replaceProperty(feedAddress, "${project.name}", "default"); feedAddress = replaceProperty(feedAddress, "${portal.name}", portalName); feedAddress = replaceProperty(feedAddress, "${feed.type}", "atom"); @@ -133,13 +136,15 @@ // Now we are sure that fromEntryString has the value that was given to // us in the address int fromEntry = Integer.parseInt(fromEntryString); - + + String cacheKey = AbstractBlog.class.getName()+"/"+projectId; + SyndFeed feed = (SyndFeed) forgeHelper.getForgeManagement().getFromCache( - portalName, AbstractBlog.class.getName()); + portalName, cacheKey); if (feed == null) { feed = (SyndFeed) forgeHelper.getForgeManagement(). - addNodeWatcher(portalName, AbstractBlog.class.getName(), + addNodeWatcher(portalName, cacheKey, new BlogNodeWatcher(feedAddress)); } @@ -308,27 +313,4 @@ return found; } - - /** - * Item of the cache - */ - class CacheItem { - private long time; - - private SyndFeed feed; - - CacheItem(long time, SyndFeed feed) { - this.time = time; - this.feed = feed; - } - - long getTime() { - return time; - } - - SyndFeed getFeed() { - return feed; - } - - } } \ No newline at end of file Modified: prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java =================================================================== --- prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-30 21:59:37 UTC (rev 1024) @@ -91,7 +91,8 @@ SVNRevision.HEAD, SVNRevision.HEAD, true); } } catch (SVNException e) { - try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); } + e.printStackTrace(); + try { cleanup(); } catch (SVNException e1) { } } } @@ -108,7 +109,7 @@ ourClientManager.getCommitClient().doCommit(files, false, "Forge service commit.", true, true); } catch (SVNException e) { - try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); } + try { cleanup(); } catch (SVNException e1) { } e.printStackTrace(); throw new IOException(e.getMessage()); @@ -154,7 +155,8 @@ try { ourClientManager.getWCClient().doAdd(file, true, false, false, false); } catch (SVNException e) { - try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); } + e.printStackTrace(); + try { cleanup(); } catch (SVNException e1) { } throw new IOException("SVN error while adding the new file"); } } Modified: prod/forge/portal-extensions/forge-portal-attr/maven.xml =================================================================== --- prod/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-30 21:59:37 UTC (rev 1024) @@ -15,7 +15,7 @@ </goal> <goal name="deploy"> - <ant:copy todir="${local.deploy.dir}"> + <ant:copy todir="${local.deploy.dir}" overwrite="true"> <ant:fileset dir="to-copy" /> </ant:copy> <ant:copy Modified: prod/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java =================================================================== --- prod/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java 2005-08-30 21:59:37 UTC (rev 1024) @@ -42,7 +42,7 @@ fm.update(); // Avoiding WARN. - timer.cancel(); + //timer.cancel(); -- Maybe this caused the TX exception. // Scheduling next timer to timeout after the amount of time that // is set in forgeManagement. Modified: prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java =================================================================== --- prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-30 21:59:37 UTC (rev 1024) @@ -300,8 +300,8 @@ } public WikiType getWikiType(String wikiTypeName) { - System.out - .println("[WIKITYPE REQUEST]: " + wikiTypes.get(wikiTypeName)); + //System.out + // .println("[WIKITYPE REQUEST]: " + wikiTypes.get(wikiTypeName)); return wikiTypes.get(wikiTypeName); } @@ -340,7 +340,7 @@ } public Set<String> findPages(String searchQuery) { - System.out.println("Starting search: " + searchQuery); + //System.out.println("Starting search: " + searchQuery); WikiSearch wikiSearch = new WikiSearch(searchQuery); Set<String> resPages = new TreeSet<String>(); @@ -356,7 +356,7 @@ } } - System.out.println("Search completed"); + //System.out.println("Search completed"); return resPages; } Modified: prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-30 21:59:37 UTC (rev 1024) @@ -304,7 +304,7 @@ if (rReq.getParameter("type") != null) { type = rReq.getParameter("type"); - System.out.println("Getting type: " + type); + //System.out.println("Getting type: " + type); } wikiContext = new WikiContext(rReq.getUser(), wikiEngine Modified: prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java =================================================================== --- prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-30 21:59:37 UTC (rev 1024) @@ -88,7 +88,7 @@ // execute the plugins for (int i = 0; i < plugins.size(); i++) { - System.out.println("Executing plugin: "+plugins.get(i).getName()); + //System.out.println("Executing plugin: "+plugins.get(i).getName()); newPage = (plugins.get(i)).process(newPage, wikiSession); } Modified: prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java =================================================================== --- prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-30 21:59:37 UTC (rev 1024) @@ -98,7 +98,7 @@ // Parse URI to get filename and page name String[] tokens = requestURI.split("[/]"); - System.out.println("length " + tokens.length); + //System.out.println("length " + tokens.length); if (tokens.length == 3) { String hostURL = ((request.isSecure()) ? "https" : "http") + "://"+request.getServerName()+((request.getServerPort() == 80) ? "" : ":"+ request.getServerPort()); @@ -110,8 +110,8 @@ String fileName = tokens[tokens.length - 1]; String pageName = tokens[tokens.length - 2]; - System.out.println("[WikiFileAccess]Getting file: " + fileName - + " of page: " + pageName); + //System.out.println("[WikiFileAccess]Getting file: " + fileName + // + " of page: " + pageName); Properties props = new Properties(); Modified: prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java =================================================================== --- prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-30 21:44:52 UTC (rev 1023) +++ prod/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-30 21:59:37 UTC (rev 1024) @@ -41,7 +41,7 @@ pattern = "<a href=\""+(((String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">"; - System.out.println(pattern); + //System.out.println(pattern); WikiPage newPage = null; |
From: <jbo...@li...> - 2005-08-30 21:44:57
|
Author: dam...@jb... Date: 2005-08-30 17:44:52 -0400 (Tue, 30 Aug 2005) New Revision: 1023 Added: prod/jira-extensions/ Removed: prod/forge/jira-extensions/ Log: Moving jira-extensions up a level. Copied: prod/jira-extensions (from rev 1022, prod/forge/jira-extensions) |
From: <jbo...@li...> - 2005-08-30 20:37:21
|
Author: dam...@jb... Date: 2005-08-30 16:37:18 -0400 (Tue, 30 Aug 2005) New Revision: 1022 Removed: qa/forge/portal-content/ Log: MERGED: Everything up to 1010 of trunk/forge merged into qa. |
Author: dam...@jb... Date: 2005-08-30 16:35:31 -0400 (Tue, 30 Aug 2005) New Revision: 1021 Added: qa/forge/portal-extensions/forge-forums/scripts/ qa/forge/portal-extensions/forge-forums/scripts/all.sql qa/forge/portal-extensions/forge-forums/scripts/conv.sql qa/forge/portal-extensions/forge-forums/scripts/diff.sql qa/forge/portal-extensions/forge-forums/scripts/nukes3.sql qa/forge/portal-extensions/forge-forums/scripts/portal-keys.sql qa/forge/portal-extensions/forge-forums/scripts/portal-pure.sql qa/forge/portal-extensions/forge-forums/scripts/test.sql qa/forge/portal-extensions/forge-wiki/docs/wiki-reversed.zuml qa/forge/portal-extensions/forge-wiki/lib/ qa/forge/portal-extensions/forge-wiki/lib/cglib2.jar qa/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar qa/forge/portal-extensions/forge-wiki/lib/commons-collections.jar qa/forge/portal-extensions/forge-wiki/lib/commons-lang.jar qa/forge/portal-extensions/forge-wiki/lib/commons-logging.jar qa/forge/portal-extensions/forge-wiki/lib/dom4j.jar qa/forge/portal-extensions/forge-wiki/lib/ehcache.jar qa/forge/portal-extensions/forge-wiki/lib/hibernate2.jar qa/forge/portal-extensions/forge-wiki/lib/hsqldb.jar qa/forge/portal-extensions/forge-wiki/lib/informa.jar qa/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar qa/forge/portal-extensions/forge-wiki/lib/jdom.jar qa/forge/portal-extensions/forge-wiki/lib/jta.jar qa/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar qa/forge/portal-extensions/forge-wiki/lib/lucene.jar qa/forge/portal-extensions/forge-wiki/lib/odmg.jar qa/forge/portal-extensions/forge-wiki/lib/xalan.jar qa/forge/portal-extensions/forge-wiki/lib/xml-apis.jar qa/forge/portal-extensions/forge-wiki/src/etc/application.xml qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java Removed: qa/forge/portal-extensions/forge-forums/scripts/all.sql qa/forge/portal-extensions/forge-forums/scripts/conv.sql qa/forge/portal-extensions/forge-forums/scripts/diff.sql qa/forge/portal-extensions/forge-forums/scripts/nukes3.sql qa/forge/portal-extensions/forge-forums/scripts/portal-keys.sql qa/forge/portal-extensions/forge-forums/scripts/portal-pure.sql qa/forge/portal-extensions/forge-forums/scripts/test.sql qa/forge/portal-extensions/forge-wiki/lib/cglib2.jar qa/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar qa/forge/portal-extensions/forge-wiki/lib/commons-collections.jar qa/forge/portal-extensions/forge-wiki/lib/commons-lang.jar qa/forge/portal-extensions/forge-wiki/lib/commons-logging.jar qa/forge/portal-extensions/forge-wiki/lib/dom4j.jar qa/forge/portal-extensions/forge-wiki/lib/ehcache.jar qa/forge/portal-extensions/forge-wiki/lib/hibernate2.jar qa/forge/portal-extensions/forge-wiki/lib/hsqldb.jar qa/forge/portal-extensions/forge-wiki/lib/informa.jar qa/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar qa/forge/portal-extensions/forge-wiki/lib/jdom.jar qa/forge/portal-extensions/forge-wiki/lib/jta.jar qa/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar qa/forge/portal-extensions/forge-wiki/lib/lucene.jar qa/forge/portal-extensions/forge-wiki/lib/odmg.jar qa/forge/portal-extensions/forge-wiki/lib/xalan.jar qa/forge/portal-extensions/forge-wiki/lib/xml-apis.jar qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java Modified: qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java qa/forge/portal-extensions/forge-wiki/maven.xml qa/forge/portal-extensions/forge-wiki/project.properties qa/forge/portal-extensions/forge-wiki/project.xml qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld Log: MERGED: -r 1001:1010 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Picking up slack... after rollback from RC2. Copied: qa/forge/portal-extensions/forge-forums/scripts (from rev 1010, trunk/forge/portal-extensions/forge-forums/scripts) Deleted: qa/forge/portal-extensions/forge-forums/scripts/all.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 15:59:01 UTC (rev 1010) +++ qa/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 20:35:31 UTC (rev 1021) @@ -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: qa/forge/portal-extensions/forge-forums/scripts/all.sql (from rev 1010, trunk/forge/portal-extensions/forge-forums/scripts/all.sql) Deleted: qa/forge/portal-extensions/forge-forums/scripts/conv.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 15:59:01 UTC (rev 1010) +++ qa/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 20:35:31 UTC (rev 1021) @@ -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: qa/forge/portal-extensions/forge-forums/scripts/conv.sql (from rev 1010, trunk/forge/portal-extensions/forge-forums/scripts/conv.sql) Deleted: qa/forge/portal-extensions/forge-forums/scripts/diff.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-30 15:59:01 UTC (rev 1010) +++ qa/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-30 20:35:31 UTC (rev 1021) @@ -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: qa/forge/portal-extensions/forge-forums/scripts/diff.sql (from rev 1010, trunk/forge/portal-extensions/forge-forums/scripts/diff.sql) Deleted: qa/forge/portal-extensions/forge-forums/scripts/nukes3.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/nukes3.sql 2005-08-30 15:59:01 UTC (rev 1010) +++ qa/forge/portal-extensions/forge-forums/scripts/nukes3.sql 2005-08-30 20:35:31 UTC (rev 1021) @@ -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: qa/forge/portal-extensions/forge-forums/scripts/nukes3.sql (from rev 1010, trunk/forge/portal-extensions/forge-forums/scripts/nukes3.sql) Deleted: qa/forge/portal-extensions/forge-forums/scripts/portal-keys.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-30 15:59:01 UTC (rev 1010) +++ qa/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-30 20:35:31 UTC (rev 1021) @@ -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: qa/forge/portal-extensions/forge-forums/scripts/portal-keys.sql (from rev 1010, trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql) Deleted: qa/forge/portal-extensions/forge-forums/scripts/portal-pure.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-30 15:59:01 UTC (rev 1010) +++ qa/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-30 20:35:31 UTC (rev 1021) @@ -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) default NULL, - `jbp_idx` int(11) NOT NULL default '0', - PRIMARY KEY (`jbp_prop_id`,`jbp_idx`), - KEY `FKC4963064D50D5281` (`jbp_prop_id`) -) ENGINE=M... [truncated message content] |
Author: dam...@jb... Date: 2005-08-30 16:16:03 -0400 (Tue, 30 Aug 2005) New Revision: 1019 Removed: qa/forge/portal-extensions/jboss-as-binaries/to-copy/ Modified: qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java Log: MERGED: -r 976:1000 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Modified: qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java =================================================================== --- qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-08-30 20:12:06 UTC (rev 1018) +++ qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-08-30 20:16:03 UTC (rev 1019) @@ -93,7 +93,10 @@ .getServerName()); feedAddress = replaceProperty(feedAddress, "${host.port}", Integer .toString(request.getServerPort())); - feedAddress = replaceProperty(feedAddress, "${project.name}", projectId); + if (projectId != null) + feedAddress = replaceProperty(feedAddress, "${project.name}", projectId); + else + feedAddress = replaceProperty(feedAddress, "${project.name}", "default"); feedAddress = replaceProperty(feedAddress, "${portal.name}", portalName); feedAddress = replaceProperty(feedAddress, "${feed.type}", "atom"); @@ -133,13 +136,15 @@ // Now we are sure that fromEntryString has the value that was given to // us in the address int fromEntry = Integer.parseInt(fromEntryString); - + + String cacheKey = AbstractBlog.class.getName()+"/"+projectId; + SyndFeed feed = (SyndFeed) forgeHelper.getForgeManagement().getFromCache( - portalName, AbstractBlog.class.getName()); + portalName, cacheKey); if (feed == null) { feed = (SyndFeed) forgeHelper.getForgeManagement(). - addNodeWatcher(portalName, AbstractBlog.class.getName(), + addNodeWatcher(portalName, cacheKey, new BlogNodeWatcher(feedAddress)); } @@ -308,27 +313,4 @@ return found; } - - /** - * Item of the cache - */ - class CacheItem { - private long time; - - private SyndFeed feed; - - CacheItem(long time, SyndFeed feed) { - this.time = time; - this.feed = feed; - } - - long getTime() { - return time; - } - - SyndFeed getFeed() { - return feed; - } - - } } \ No newline at end of file Modified: qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java =================================================================== --- qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java 2005-08-30 20:12:06 UTC (rev 1018) +++ qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java 2005-08-30 20:16:03 UTC (rev 1019) @@ -42,7 +42,7 @@ fm.update(); // Avoiding WARN. - timer.cancel(); + //timer.cancel(); -- Maybe this caused the TX exception. // Scheduling next timer to timeout after the amount of time that // is set in forgeManagement. |
From: <jbo...@li...> - 2005-08-30 20:12:12
|
Author: adamw Date: 2005-08-30 16:12:06 -0400 (Tue, 30 Aug 2005) New Revision: 1018 Modified: trunk/forge/portal-extensions/forge-forums/scripts/all.sql trunk/forge/portal-extensions/forge-forums/scripts/conv.sql Log: Newer scripts for forums migration Modified: trunk/forge/portal-extensions/forge-forums/scripts/all.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 19:40:45 UTC (rev 1017) +++ trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 20:12:06 UTC (rev 1018) @@ -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: trunk/forge/portal-extensions/forge-forums/scripts/conv.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 19:40:45 UTC (rev 1017) +++ trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 20:12:06 UTC (rev 1018) @@ -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. |
From: <jbo...@li...> - 2005-08-30 19:57:12
|
Author: aron.gombas Date: 2005-08-30 15:40:45 -0400 (Tue, 30 Aug 2005) New Revision: 1017 Added: branches/forge/aron/portal-extensions/forge-kosmos/ branches/forge/aron/portal-extensions/forge-kosmos/conf/ branches/forge/aron/portal-extensions/forge-kosmos/conf/jboss-app.xml branches/forge/aron/portal-extensions/forge-kosmos/conf/kosmos-pages.xml branches/forge/aron/portal-extensions/forge-kosmos/conf/portlet-instances.xml branches/forge/aron/portal-extensions/forge-kosmos/conf/portlet.xml branches/forge/aron/portal-extensions/forge-kosmos/maven.xml branches/forge/aron/portal-extensions/forge-kosmos/project.xml branches/forge/aron/portal-extensions/forge-kosmos/to-copy/ branches/forge/aron/portal-extensions/forge-kosmos/to-copy/kosmos-portlet.war branches/forge/aron/portal-extensions/forge-kosmos/to-copy/kosmos-server.war branches/forge/aron/portal-extensions/forge-kosmos/to-copy/slide.war Log: Initial checking for Kosmos Added: branches/forge/aron/portal-extensions/forge-kosmos/conf/jboss-app.xml =================================================================== --- branches/forge/aron/portal-extensions/forge-kosmos/conf/jboss-app.xml 2005-08-30 19:36:26 UTC (rev 1016) +++ branches/forge/aron/portal-extensions/forge-kosmos/conf/jboss-app.xml 2005-08-30 19:40:45 UTC (rev 1017) @@ -0,0 +1,3 @@ +<jboss-app> + <app-name>kosmos-portal</app-name> +</jboss-app> \ No newline at end of file Added: branches/forge/aron/portal-extensions/forge-kosmos/conf/kosmos-pages.xml =================================================================== --- branches/forge/aron/portal-extensions/forge-kosmos/conf/kosmos-pages.xml 2005-08-30 19:36:26 UTC (rev 1016) +++ branches/forge/aron/portal-extensions/forge-kosmos/conf/kosmos-pages.xml 2005-08-30 19:40:45 UTC (rev 1017) @@ -0,0 +1,23 @@ +<pages> + <portal-name>default</portal-name> + <page> + <page-name>Kosmos</page-name> + + <window> + <window-name>JBossWikiSvnMonitoringPortlet</window-name> + <instance-ref>kosmos-portal.JBossWikiSvnMonitoringPortlet.JBossWikiSvnMonitoringPortletInstance</instance-ref> + <default>false</default> + <region>center</region> + <height>0</height> + </window> + + <window> + <window-name>JBossWikiJiraMonitoringPortlet</window-name> + <instance-ref>kosmos-portal.JBossWikiJiraMonitoringPortlet.JBossWikiJiraMonitoringPortletInstance</instance-ref> + <default>false</default> + <region>center</region> + <height>1</height> + </window> + + </page> +</pages> Added: branches/forge/aron/portal-extensions/forge-kosmos/conf/portlet-instances.xml =================================================================== --- branches/forge/aron/portal-extensions/forge-kosmos/conf/portlet-instances.xml 2005-08-30 19:36:26 UTC (rev 1016) +++ branches/forge/aron/portal-extensions/forge-kosmos/conf/portlet-instances.xml 2005-08-30 19:40:45 UTC (rev 1017) @@ -0,0 +1,11 @@ +<?xml version="1.0" standalone="yes"?> +<instances> + <instance> + <instance-name>JBossWikiJiraMonitoringPortletInstance</instance-name> + <component-ref>JBossWikiJiraMonitoringPortlet</component-ref> + </instance> + <instance> + <instance-name>JBossWikiSvnMonitoringPortletInstance</instance-name> + <component-ref>JBossWikiSvnMonitoringPortlet</component-ref> + </instance> +</instances> Added: branches/forge/aron/portal-extensions/forge-kosmos/conf/portlet.xml =================================================================== --- branches/forge/aron/portal-extensions/forge-kosmos/conf/portlet.xml 2005-08-30 19:36:26 UTC (rev 1016) +++ branches/forge/aron/portal-extensions/forge-kosmos/conf/portlet.xml 2005-08-30 19:40:45 UTC (rev 1017) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"> + <portlet> + <portlet-name>JBossWikiJiraMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>JBoss Wiki JIRA</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://forge.sicore.org:8080/kosmos-server/kosmos-services/jira-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://jira.jboss.com/jira/browse/JBWIKI + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.jira.jiramonitoringportlet</resource-bundle> + <portlet-info> + <title>JBoss Wiki JIRA Monitoring</title> + </portlet-info> + </portlet> + + <portlet> + <portlet-name>JBossWikiSvnMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.svn.SvnMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>JBoss Wiki Subversion</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://forge.sicore.org:8080/kosmos-server/kosmos-services/svn-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://anonsvn.labs.jboss.com/trunk/forge/portal-extensions/forge-wiki + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.svn.svnmonitoringportlet</resource-bundle> + <portlet-info> + <title>Subversion Monitoring</title> + </portlet-info> + </portlet> +</portlet-app> Added: branches/forge/aron/portal-extensions/forge-kosmos/maven.xml =================================================================== --- branches/forge/aron/portal-extensions/forge-kosmos/maven.xml 2005-08-30 19:36:26 UTC (rev 1016) +++ branches/forge/aron/portal-extensions/forge-kosmos/maven.xml 2005-08-30 19:40:45 UTC (rev 1017) @@ -0,0 +1,30 @@ +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> + <goal name="build"> + + </goal> + + <goal name="deploy"> + + </goal> + + <goal name="prj-install"> + <!-- deploy Slide by copying the WAR --> + <ant:copy file="to-copy/slide.war" todir="${local.deploy.dir}"/> + + <!-- deploy server component by extracting the WAR --> + <ant:unzip src="to-copy/kosmos-server.war" dest="${local.deploy.dir}/kosmos-server.war"/> + + <!-- deploy portlets by extracting the WAR and overwriting the config files --> + <ant:unzip src="to-copy/kosmos-portlet.war" dest="${local.deploy.dir}/kosmos-portlet.war"/> + <ant:copy todir="${local.deploy.dir}/kosmos-portlet.war/WEB-INF"> + <ant:fileset dir="conf"> + <ant:include name="**"/> + </ant:fileset> + </ant:copy> + </goal> +</project> \ No newline at end of file Added: branches/forge/aron/portal-extensions/forge-kosmos/project.xml =================================================================== --- branches/forge/aron/portal-extensions/forge-kosmos/project.xml 2005-08-30 19:36:26 UTC (rev 1016) +++ branches/forge/aron/portal-extensions/forge-kosmos/project.xml 2005-08-30 19:40:45 UTC (rev 1017) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<project> + <pomVersion>3</pomVersion> + <id>forge-kosmos</id> + <name>Kosmos on Forge</name> + <organization> + <name>Aron Gombas</name> + <url>http://www.midori.hu</url> + </organization> +</project> Added: branches/forge/aron/portal-extensions/forge-kosmos/to-copy/kosmos-portlet.war =================================================================== (Binary files differ) Property changes on: branches/forge/aron/portal-extensions/forge-kosmos/to-copy/kosmos-portlet.war ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/forge/aron/portal-extensions/forge-kosmos/to-copy/kosmos-server.war =================================================================== (Binary files differ) Property changes on: branches/forge/aron/portal-extensions/forge-kosmos/to-copy/kosmos-server.war ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/forge/aron/portal-extensions/forge-kosmos/to-copy/slide.war =================================================================== (Binary files differ) Property changes on: branches/forge/aron/portal-extensions/forge-kosmos/to-copy/slide.war ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
From: <jbo...@li...> - 2005-08-30 19:07:37
|
Author: dam...@jb... Date: 2005-08-30 15:07:30 -0400 (Tue, 30 Aug 2005) New Revision: 1014 Modified: qa/forge/doc/en/modules/administration.xml qa/forge/doc/en/modules/building.xml qa/forge/doc/en/modules/creation.xml qa/forge/doc/en/modules/introduction.xml qa/forge/doc/en/modules/theforge.xml Log: MERGED: -r 653:1010 https://svn.labs.jboss.com/trunk/forge/doc into qa forge/doc. Modified: qa/forge/doc/en/modules/administration.xml =================================================================== --- qa/forge/doc/en/modules/administration.xml 2005-08-30 18:58:51 UTC (rev 1013) +++ qa/forge/doc/en/modules/administration.xml 2005-08-30 19:07:30 UTC (rev 1014) @@ -7,7 +7,7 @@ communication between developers.Managing the contents of a project should be as simple as the management of your own local files. The Forge CMS Subversion Repository can be mounted as an external network drive on most systems. It is refered throughout this document - as the Forge File System Drive and can be accessed at . + as the Forge File System Drive and can be accessed at <ulink url="https://cms.labs.jboss.com"></ulink>. </para> <para> The strucure of the repository is shown in <xref linkend="repo.fig"/>. @@ -50,7 +50,7 @@ <ulink url="http://tortoisesvn.tigris.org/"></ulink> </listitem> <listitem> - <command>Command line Subversion client</command> + <command>Command line Subversion client </command> <ulink url="http://subversion.tigris.org/project_packages.html"></ulink> </listitem> @@ -162,7 +162,7 @@ </programlisting> </listitem> <listitem> - Create and put a downloads.xml, which has the following structure: + Create and put in the downloads directory you created a downloads.xml, which has the following structure: <programlisting> <downloads> <categories> @@ -211,8 +211,17 @@ </sect1> <sect1 id="blog-comp"><title>Blog</title> <para> - Something on Blojsom and the component Blog - in general, then explain - what the other sections are about. + Blojsom, while simple in design, provides features such as: </para> + <simplelist> + <member> - multiple blogs on a single installation of the software</member> + <member> - generation of HTML, RDF, RSS 0.92, RSS 2.0, RSS 2.0 (with comments and trackbacks) + and Atom syndication feeds</member> + <member> - support of any number of users per blog</member> + <member> - configuration of the types of files that can be treated as blog entries</member> + </simplelist> + <para> + The following sections will direct you through the steps from configuring your own blog + to editing your blog entries. </para> <sect2 id="admin-blog"><title>Project Administrators - Creating the Blog For Your Project</title> <para> @@ -266,30 +275,30 @@ Before the blog entries can be displayed on JBoss Labs, the administrator has to create a blog under blojsom, that will be accessed through the project. Follow these steps to do so: </para> - <simplelist> - <member> + <orderedlist numeration="arabic"> + <listitem> Log in as administrator on the blojsom console, located at <literal>{portalhome}/blojsom/blog/?flavor=admin</literal> - </member> - <member> + </listitem> + <listitem> Select <command>Weblog Settings</command> and <command>Users</command> where you need to create a new user of the blog for your project - </member> - <member> + </listitem> + <listitem> For <command>Blog User ID</command> enter the exact id of your project - </member> - <member> + </listitem> + <listitem> For <command>Blog User password</command> enter a password - </member> - <member> + </listitem> + <listitem> For <command>Blog base URL</command> enter the base URL of the JBoss Labs - </member> - <member> + </listitem> + <listitem> For <command>Blog URL</command> enter the id of your project at the end of this URL: - </member> - </simplelist> + </listitem> + </orderedlist> <programlisting> - http://forge.jboss.com/portal/index.html?ctrl:id=page.default.info&project={project-id} +http://forge.jboss.com/portal/index.html?ctrl:id=page.default.info&project=sampleid </programlisting> </sect2> <sect2 id="dev-blog"> @@ -339,6 +348,6 @@ Note: <literal>{portal-name}</literal> is <literal>default</literal> for Forge and <literal>federation</literal> for JOSF - all paths are relative to the Forge FileSystem Drive which is described in the Repository chapter. + all paths are relative to the Forge FileSystem Drive which is described in <xref linkend="repo"/>. </sect2></sect1> </chapter> \ No newline at end of file Modified: qa/forge/doc/en/modules/building.xml =================================================================== --- qa/forge/doc/en/modules/building.xml 2005-08-30 18:58:51 UTC (rev 1013) +++ qa/forge/doc/en/modules/building.xml 2005-08-30 19:07:30 UTC (rev 1014) @@ -8,24 +8,33 @@ <listitem>JBoss Portal 2.0 (<ulink url="http://www.jboss.org/products/jbossportal#files"></ulink>, with the forums portlet) </listitem> - <listitem>Blojsom's blog (<ulink url="http://wiki.blojsom.com/wiki/display/blojsom/About+blojsom"> + <listitem>Blojsom's blog (<ulink url="http://wiki.blojsom.com/wiki/display/blojsom/"> </ulink>) </listitem> <listitem>Maven (<ulink url="http://maven.apache.org/"></ulink>) </listitem> - </itemizedlist> + <listitem>Database and Database connector (MySQL, Hypersonic DB, PostGreSQL, Oracle 10g) + You must make sure that your JDBC connector for your database is under + <literal>JBOSS_HOME/server/default/lib</literal>. MySQL and PostGre connectors can be found here: + </listitem> + </itemizedlist> + <simplelist> + <member><ulink url="http://dev.mysql.com/downloads/connector/j/3.1.html"></ulink></member> + <member><ulink url="http://jdbc.postgresql.org/download.html"></ulink></member> + </simplelist> + </sect1> <sect1 id="install"> <title>Installing JBoss AS integrated with JBoss Portal 2.0</title> <para> The JBoss application server is available as a free download from the JBoss website. - (http://www.jboss.org/downloads/index) We provide both a binary and source distribution, + We provide both a binary and source distribution, but if you are just getting started with JBoss, stick to the binary distribution, which can be run straight out of the box. </para> <para> The binary versions are available as either .zip, .tar.gz, .bz2 files. The contents are the same - so grab whichever flavor is most convenient for the platform you’re running on. Once it's downloaded, + so grab whichever flavor is most convenient for the platform you’e running on. Once it's downloaded, unpack the archive to a suitable location on your machine. It should all unpack into a single directory named jboss-4.0.2. Of course the version number suffix will be different if you are running a later release. Make sure you don't use a directory which has any spaces in the path @@ -38,11 +47,22 @@ JDK installation. </para> <para> - When you have all these files, unpack the application server and deploy both the portal and - the blog into it (normally this means copying jboss-portal.sar, portal-forums.ear and blojsom.war to - $JBOSS_HOME/server/default/deploy). More detailed instructions on the server and portal installation - can be found here: + All databases supported by hibernate are supported by JBoss Portal. The JBoss Portal Guide has a + list of steps that should be followed on any DB, + refer to </para> + <simplelist><member><ulink url="http://docs.jboss.com/jbportal/v2.0Final/user-guide/en/html/installation.html#d0e410"></ulink> + </member> + </simplelist> + <para> + When you have all these files, and have successfully installed the application server, you are + ready to deploy the portal and the blog into it - simply copy <literal>jboss-portal.sar</literal>, + <literal>portal-forums.ear</literal> and <literal>blojsom.war</literal> to</para> + <programlisting>$JBOSS_HOME/server/default/deploy</programlisting> + <para> + which is the deploy directory of the portal. More detailed instructions on the server and portal + installation can be found here: + </para> <simplelist> <member>JBoss Portal - <ulink url="http://docs.jboss.com/jbportal/v2.0Final/user-guide/en/html/"></ulink> </member> @@ -53,7 +73,7 @@ <sect1 id="checkout"><title>Checking Out Forge From Subversion</title> After you have installed Maven (instructions for doing so can be obtained from the Maven website <ulink url="http://maven.apache.org/start/install.html"></ulink>) and a Subversion - client (please refer to <xref linkend="admin"/> for more information on Subversion), + client (please refer to <xref linkend="subversion"/> for more information on Subversion), you can check out the forge from svn. To do so, type: <programlisting> svn checkout svn+ssh://use...@fo.../usr/local/forge/svn @@ -71,24 +91,24 @@ $WC/trunk/forge subdirectory, where $WC is your working copy directory. There are a few <literal>.properties</literal> files you need to fill out for your own configuration. - <simplelist> - <member><literal>build.properties</literal> + <itemizedlist> + <listitem><literal>build.properties</literal> You have to make your own build.properties file in ./forge/portal-extensions/. Just copy <literal>buil.properties.sample</literal> and fill it with the data corresponding to your machine. - </member> - <member><literal>jspwiki.properties</literal> + </listitem> + <listitem><literal>jspwiki.properties</literal> To get your wiki working you have to point jspwiki.fileSystemProvider.pageDir and jspwiki.basicAttachmentProvider.storageDir in <programlisting> - ./forge/portal-extensions/jspwiki/etc/jspwiki.properties to your machine-dependent place. - </programlisting> + ./forge/portal-extensions/jspwiki/etc/jspwiki.properties</programlisting> to your machine-dependent place. + Maven copies the base jspwiki structure to the server folder. So it may be for example ../jboss-4.0.2/server/jspwiki-pages. - </member> - <member><literal>blojsom.properties</literal> + </listitem> + <listitem><literal>blojsom.properties</literal> To be able to use the Blog, you need to create a blojsom.properties file in - </member> + <programlisting> ./forge/portal-extensions/blojsom/to-copy/blojsom.war/WEB-INF/ </programlisting> and set the following values: @@ -105,28 +125,29 @@ blojsom-templates-directory=/templates/ blojsom-resource-directory=/resources/ </programlisting> +</listitem> - <member><literal>forge.properties</literal> + <listitem><literal>forge.properties</literal> To be able to read files from the content repository you need to set in ./forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties file the following values relative to your system: <literal>svnpath, svnusername, svnpassword, localpath, blogpath</literal> - </member> - </simplelist> + </listitem> + </itemizedlist> <para> Here's a list of the available build targets: </para> <itemizedlist> <listitem><command>clean-all</command> - cleans all projects - normally, this means deleting the "target" directory</listitem> - <listitem>build-all - executes the build goal of all projects - but it doesn't do any cleaning before</listitem> - <listitem>deploy-all - deployes all extensions, that is, calls the deploy goal of every project - note that it doesn't do a build</listitem> - <listitem>prepare-repo - prepares the repository before building: copies libraries from the binaries directory; compiles and copies the forge-common.jar file</listitem> - <listitem>all = prepare-repo, clean-all, build-all, deploy-all, in that order. </listitem> - <listitem>all-redeploy = all, redeploy the portal using jmx - you need to specify the jmx + <listitem><command>build-all</command> - executes the build goal of all projects - but it doesn't do any cleaning before</listitem> + <listitem><command>deploy-all</command> - deployes all extensions, that is, calls the deploy goal of every project - note that it doesn't do a build</listitem> + <listitem><command>prepare-repo</command> - prepares the repository before building: copies libraries from the binaries directory; compiles and copies the forge-common.jar file</listitem> + <listitem><command>all</command> = prepare-repo, clean-all, build-all, deploy-all, in that order. </listitem> + <listitem><command>all-redeploy</command> = all, redeploy the portal using jmx - you need to specify the jmx properties for this to work.</listitem> </itemizedlist> <para> - So to begin with, it's best to call <literal>maven all-nojmx</literal> target, which will + So to begin with, it's best to call <literal><command>maven all-nojmx</command></literal> target, which will compile and deploy everything. After compleating these steps, you can start the portal. If everything goes well, you will be able to see an "empty" forge installation under the address: http://localhost:8080/portal. Modified: qa/forge/doc/en/modules/creation.xml =================================================================== --- qa/forge/doc/en/modules/creation.xml 2005-08-30 18:58:51 UTC (rev 1013) +++ qa/forge/doc/en/modules/creation.xml 2005-08-30 19:07:30 UTC (rev 1014) @@ -1,6 +1,6 @@ <chapter id="creation"> <title>Developing Forge Components</title> - <section> + <sect1 id="components"> <title>Introduction</title> <para> After we have already presented the different components of the Forge infrastructure @@ -11,8 +11,8 @@ this is a chapter that will help you manage the files in your repository, acquaint you with the cache we use and how to write your own portlets. </para> - </section> - <section><title>Storing Files in the Repository</title> + </sect1> + <sect1 id="storing-repo"><title>Storing Files in the Repository</title> <para> The Forge relies on a content managment systems from which files can be read. Among others, JSP and html pages are stored there. The classes resposible for reading and managing the content @@ -53,9 +53,9 @@ <para> And, of course don't forget to add the jsp pages to your repository. </para> - </section> + </sect1> - <section> + <sect1 id="cache"> <title>Cache</title> <para> The content reader class provides a simple cache. The basic methods to acces it are: @@ -67,14 +67,14 @@ by the get method if the content expires and no watched files have changed. Instead, the content's time stamp will be renewed. </para> - </section> + </sect1> - <section> + <sect1 id="portlets"> <title>Writing Your Own Content-Based Portlets</title> <para> The easiest way to do this is to extend the <literal>ContentPortlet</literal> class and implement some abstract methods for generating and displaying the content. You can find their purpose and descriptions in the JavaDocs. </para> - </section> + </sect1> </chapter> Modified: qa/forge/doc/en/modules/introduction.xml =================================================================== --- qa/forge/doc/en/modules/introduction.xml 2005-08-30 18:58:51 UTC (rev 1013) +++ qa/forge/doc/en/modules/introduction.xml 2005-08-30 19:07:30 UTC (rev 1014) @@ -1,27 +1,25 @@ <chapter id="introduction"> <title>Introduction</title> - <section> - <title>Preface</title> + <sect1 id="preface"> + <title>Preface</title> <para> JBoss Labs was created to give JBoss and other open source projects a place to call home. JBoss Labs relies on an infrastructure, called JBoss Forge which has everything an open source project needs to enable a community of developers to communicate and distribute their ideas. </para> - </section> - <section> + </sect1> + <sect1 id="welcome"> <title>Welcome to JBoss Labs</title> <para> JBoss Labs is a Professional Open Source community where Professional Open Source programmers around the world come to collaborate and create software for everyone.It is also the culmination of the efforts of developers (listed below as well as of all contributors to the JBoss Enterprise Middleware System (JEMS)) to bring about a set of processes and infrastructure that enable the - communication of ideas between the open source developers and their community. + communication of ideas between the open source developers and their community. JBoss is helping + to nurture that communication with its JEMS offering a commitment to Professional Open Source + developers around the world. JBoss Labs is an essential element of this System. Its base layers + are shown in <xref linkend="layers.fig"/>. </para> - <para> - JBoss is helping to nurture communication in open source communities with its JEMS offering a - commitment to Professional Open Source developers around the world. JBoss Labs is an essential element - of this System. Its base layers are shown in <xref linkend="layers.fig"/>. - </para> <figure id="layers.fig"> <title>The Layers of Jboss Labs</title> <mediaobject> @@ -33,31 +31,31 @@ <para> Development team: </para> - <itemizedlist> - <listitem>Damon Sicore</listitem> - <listitem>Adam Warski</listitem> - <listitem>Tomasz Szymanski</listitem> - <listitem>Rali Genova</listitem> - </itemizedlist> + <simplelist> + <member>Damon Sicore</member> + <member>Adam Warski</member> + <member>Tomasz Szymanski</member> + <member>Rali Genova</member> + </simplelist> <para> This tutorial is for everyone who wants to contribute to JBoss Labs or make use of the project. It is divided in a few major sections as follows: </para> <itemizedlist> <listitem> - <xref linkend="theforge"/> presents the structure and major components of the Forge Project. + <command><xref linkend="theforge"/></command> presents the structure and major components of the Forge Project. </listitem> <listitem> - <xref linkend="build"/> describes the process of downloading and installing the necessary + <command><xref linkend="build"/></command> describes the process of downloading and installing the necessary software for JBoss Forge Project, as well as build details. </listitem> <listitem> - <xref linkend="admin"/> is a detailed description on project creation, repository, Subversion, + <command><xref linkend="admin"/></command> is a detailed description on project creation, repository, Subversion, anything you need to know as a project administrator. </listitem> <listitem> - <xref linkend="creation"/> is a guide on how to develop Forge components. + <command><xref linkend="creation"/></command> is a guide on how to develop Forge components. </listitem> </itemizedlist> - </section> + </sect1> </chapter> Modified: qa/forge/doc/en/modules/theforge.xml =================================================================== --- qa/forge/doc/en/modules/theforge.xml 2005-08-30 18:58:51 UTC (rev 1013) +++ qa/forge/doc/en/modules/theforge.xml 2005-08-30 19:07:30 UTC (rev 1014) @@ -1,6 +1,6 @@ <chapter id="theforge"> <title>The Forge</title> - <section> + <sect1 id="infrastructure"> <title>JBoss Forge Infrastructure</title> <para> JBoss Forge is an infrastructure designed to be a hosting platform for general purpose open souce @@ -12,39 +12,40 @@ </para> <itemizedlist> <listitem> - A general purpose project management system based on XML Project Descriptors + general purpose project management system based on XML Project Descriptors </listitem> <listitem> - A content management system that uses WebDAV as the primary access mechanism + content management system that uses WebDAV as the primary access mechanism </listitem> <listitem> - A revision control system tightly integrated with the content management system - </listitem> + revision control system tightly integrated with the content management system + </listitem> <listitem> - A fast and simple wiki mechanism + fast and simple blogging tool set that is integrated with CMS and revision control </listitem> <listitem> - A simple and fast blogging tool set that is integrated with CMS and revision control + integrated Forums </listitem> <listitem> - Integrated Forums + fast and simple wiki mechanism </listitem> <listitem> - Simple user authentication and authorization + simple user authentication and authorization </listitem> <listitem> - Easily add components as new open source development tools become available (e.g., RCS integration tools, documentation and authoring tools, etc.) + easy to add components as new open source development tools become available (e.g., RCS integration tools, documentation and authoring tools, etc.) </listitem> <listitem> - An integrated Download Center so that open source projects can quickly distribute source and binaries + integrated Download Center so that open source projects can quickly distribute source and binaries </listitem> <listitem> - An integrated Documentation Center enabling rapid dissemination of knowledge to users and other developers + integrated Documentation Center enabling rapid dissemination of knowledge to users and other developers </listitem> - <listitem> - Everything, including the Forge itself, is open source and open to the public for public review and contribution. - </listitem> </itemizedlist> + <para> + Everything, including the Forge itself, is open source and open to the public for review and contribution. + </para> + <figure id="infrastructure.fig"> <title>The Forge Infrastructure</title> <mediaobject> @@ -53,16 +54,16 @@ </imageobject> </mediaobject> </figure> - </section> - <section> + </sect1> + <sect1 id="forge-comp"> <title>Forge Components</title> - <formalpara><title>XML Project Descriptors</title> - Projects on the Forge are created by simply adding an entry into a <literal>projects.xml</literal> + <sect2 id="xml-descr"><title>XML Project Descriptors</title> + <para>Projects on the Forge are created by simply adding an entry into a <literal>projects.xml</literal> file. This will create a whole new top level project on the Forge. An example of such a project is JRUnit. Its project was created by adding an entry into the <literal>projects.xml</literal> Forge Project Descriptor file. You can read more on the use of descriptors and how to create them - on the descriptor page in <xref linkend="admin"/>. - </formalpara> + on the descriptor page in <xref linkend="xml"/>. + </para> <para> All descriptors for projects are stored in the content management system for the Forge. In fact, almost everything is stored in the CMS. There are a few types of descriptors that are required to @@ -77,8 +78,9 @@ hardware component. Since the user can define what their project consists of, it can be used for creating a community site for any organized topic. </para> - <formalpara><title>WebDAV Content Management System (CMS)</title> - When you have many people with a lot of different ideas, you want to make it easy for them to + </sect2> + <sect2 id="webdav"><title>WebDAV Content Management System (CMS)</title> + <para>When you have many people with a lot of different ideas, you want to make it easy for them to communicate those ideas among each other. The ideas are materialized as content in a project. Managing that content should be as easy as managing the content on your own disk or filesystem. You are used to doing that every day. You probably have dozens, if not hundreds, of Word files @@ -87,13 +89,13 @@ the embodiment of your good ideas, and publish it to a community portal as easily as simply dragging it to a folder, we believe that is much easier than using an extra fancy web interface or learning a new piece of software or publishing framework to do so. - </formalpara> + </para> <para> The goal of the Forge is to make it that easy. We have chosen to use WebDAV as the primary mechanism for publishing content to the portal, and providing a simple structure to your content filesystem that enables you to easily publish your ideas. Also, since the Forge is primarily aimed at programmers and communicating ideas through source code, revision control is absolutely essential. So, we have chosen - Subversion as our content repository - more on that could be found in <xref linkend="admin"/>. + Subversion as our content repository - more on that could be found in <xref linkend="repo"/>. </para> <para> Subversion supports WebDAV access to the repository--and just in the nick of time. While previous @@ -101,14 +103,15 @@ as Dreamweaver and other WebDAV enabled publishing tools to access the repository directly. This type of access is critical for quickly collaborating and publishing content. </para> - <formalpara><title>Revision Control System</title> - As mentioned above, Subversion is our source code repository and revision control system. Forge + </sect2> + <sect2 id="rev-control"><title>Revision Control System</title> + <para>As mentioned above, Subversion is our source code repository and revision control system. Forge projects have the option to use it for their source code revision control system. This repository is publicly accessible for, at a minimum, read-only access, and for project administrators and committers there is read-write access. While the Forge encourages open communication and contributions, it is essential to control access to Professional Open Source project source code in order to guarantee that malicious or proprietary code is not added to a project's product(s). - </formalpara> + </para> <para> In order to implement authorization and authentication, we again use WebDAV and directory level controls to limit or grant access to certain locations in the source code/content repository. @@ -120,45 +123,49 @@ which is currently a separate application. Future versions of the Forge will attempt to place the wiki in the repository as to eliminate heterogeneous content management methods. </para> - <formalpara><title>Wiki</title> - Wiki is the place where we create and document the processes for Professional Open Source development. + </sect2> + <sect2 id="wiki"><title>Wiki</title> + <para>Wiki is the place where we create and document the processes for Professional Open Source development. Main goal of Wiki is to provide an easy environment for POS communities to provide access to the products of their ideas. The JBoss Forge Development Team has chosen JSPWiki as the simplest and easiest to integrate solution. Adding and modifying files is fairly easy and open to everyone. - </formalpara> + </para> <para> - More on Wiki could be found on the JBoss Labs website <ulink url="http://forge.jboss.com/"></ulink> + More on Wiki could be found on the JBoss Labs website <ulink url="http://labs.jboss.com/"></ulink> </para> - <formalpara><title>Blog</title> - Blogging is a great way to distribute news and content. People can easily subscribe to content. + </sect2> + <sect2 id="blog"><title>Blog</title> + <para>Blogging is a great way to distribute news and content. People can easily subscribe to content. The Forge includes integrated blogging via Blojsom (at the moment). Blojosm was a logical choice as it provides the RSS and XML feeds we need to syndicate content. To facilitate the publishing of content, again, the WebDAV CMS mechanism was chosen. To publish a blog entry, you simply place a text or HTML file in a directory on your Forge Filesystem Drive under the proper directory - (see <xref linkend="admin"/>). A few minutes later, the content will be published automatically to + (see <xref linkend="repo"/>). A few minutes later, the content will be published automatically to your blog feed. To remove or update content, you just remove or update the file from your Forge Filesystem Drive. Again, a few minutes later, your entry will be removed or updated. - </formalpara> - <formalpara><title>Forums</title> - We currently use the same forums as the JBoss, Inc. forums. These forums enable the community + </para> + </sect2> + <sect2 id="forums"><title>Forums</title> + <para>We currently use the same forums as the JBoss, Inc. forums. These forums enable the community to collaborate by subscribing to forum posts that are made by anyone interested in a particular topic. The Forge project has integrated forums portlet, that is ready for deployment. - </formalpara> + </para> <itemizedlist> <listitem>JBoss Forums - <ulink url="http://www.jboss.com/index.html?module=bb"></ulink></listitem> <listitem>JBoss Labs Forums - <ulink url="http://www.jboss.com/index.html?module=bb&op=main&c=17"></ulink></listitem> <listitem>Forge Forums - <ulink url="http://forge.jboss.com/portal/index.html?ctrl:id=page.default.forgeforums"></ulink></listitem> </itemizedlist> - <formalpara><title>Downloads</title> - One of the components available to every project hosted + </sect2> + <sect2 id="d-d"><title>Downloads and Documentation</title> + <para>One of the components available to every project hosted on JBoss Labs is <literal>downloads</literal>. It enables project administrators to add files that users can freely download. For a detail description on how this is done, see - <xref linkend="admin"/>. - </formalpara> - <formalpara><title>Documentation</title> + <xref linkend="xml"/>. + </para> + <para> Similar to the Downloads component, every project in Labs can specify its own documentation. - The descriptors and how to publish your documents can also be found in <xref linkend="admin"/>. - </formalpara> - - </section> + The descriptors and how to publish your documents can also be found in <xref linkend="xml"/>. + </para> + </sect2> + </sect1> </chapter> |
From: <jbo...@li...> - 2005-08-30 18:59:02
|
Author: dam...@jb... Date: 2005-08-30 14:58:51 -0400 (Tue, 30 Aug 2005) New Revision: 1013 Added: branches/forge/aron/portal-extensions/ Log: Branching trunk portal-extensions so that Aron can add his Kosmos mods. Copied: branches/forge/aron/portal-extensions (from rev 1012, trunk/forge/portal-extensions) |
From: <jbo...@li...> - 2005-08-30 18:57:51
|
Author: dam...@jb... Date: 2005-08-30 14:57:42 -0400 (Tue, 30 Aug 2005) New Revision: 1012 Added: branches/forge/aron/ Log: Added a place for Aron's branches. |
From: <jbo...@li...> - 2005-08-30 18:57:22
|
Author: dam...@jb... Date: 2005-08-30 14:56:48 -0400 (Tue, 30 Aug 2005) New Revision: 1011 Added: branches/forge/ Log: Added a place to put forge branches. |
From: <jbo...@li...> - 2005-08-30 15:59:13
|
Author: ral...@jb... Date: 2005-08-30 11:59:01 -0400 (Tue, 30 Aug 2005) New Revision: 1010 Modified: trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java Log: fixed "./" issue in freezone html parser Modified: trunk/forge/portal-extensions/forge-prj-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-08-30 15:49:22 UTC (rev 1009) +++ trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-30 15:59:01 UTC (rev 1010) @@ -94,8 +94,6 @@ // modifies path to page/resource so folder structure can be supported private String modifyPath(String path, String element) { - // System.out.println("element is: "+ element); - // System.out.println("path is: "+ path); int start, end; String mainPath = ""; if (element.startsWith("#")) @@ -103,6 +101,11 @@ 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 @@ -115,10 +118,8 @@ if (element.startsWith("/")) - return element.substring(1); //base path, start with WEB-root - - if (element.startsWith("./")) - element = element.substring(1);//ignore ./ only clutters the code + 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 { @@ -180,6 +181,8 @@ 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="); @@ -196,10 +199,17 @@ { //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) + '"'); + projectId, nextRef2+'"')); } else { pageContent = forgeHelper.replace(pageContent, "href=" @@ -208,8 +218,6 @@ } // Replacing images - String imagePrepend = "/file-access/" + portalName + "/" - + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/"; while ((nextRef = findNextReference(pageContent, "image")) != null) { nextRef2 = modifyPath(pagePath, nextRef); @@ -217,6 +225,10 @@ + 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=" + '"' @@ -241,8 +253,7 @@ } catch (Exception e) { e.printStackTrace(); response.getWriter().write( - "The page you requested cannot be accessed due to " - + e.toString()); + "The page you requested cannot be accessed "); } } } |
From: <jbo...@li...> - 2005-08-30 15:49:30
|
Author: adamw Date: 2005-08-30 11:49:22 -0400 (Tue, 30 Aug 2005) New Revision: 1009 Modified: trunk/forge/portal-extensions/forge-forums/scripts/all.sql trunk/forge/portal-extensions/forge-forums/scripts/conv.sql trunk/forge/portal-extensions/forge-forums/scripts/diff.sql trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql Log: New scripts Modified: trunk/forge/portal-extensions/forge-forums/scripts/all.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -1,3 +1,13 @@ +-- 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); Modified: trunk/forge/portal-extensions/forge-forums/scripts/conv.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -22,8 +22,6 @@ 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; --- TODO: update the post count - -- 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 Modified: trunk/forge/portal-extensions/forge-forums/scripts/diff.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -90,8 +90,8 @@ -- 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 portelt, this - -- references the posters table, (which references the users table - + -- 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 @@ -209,7 +209,7 @@ -- 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: Unconsequently, this is a user id, not a poster id - in the portal DB. + -- 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 '', Modified: trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -1,305 +1,113 @@ --- MySQL dump 10.9 --- --- Host: localhost Database: jbossportal --- ------------------------------------------------------ --- Server version 4.1.11 +-- ADDING KEYS AND INDEXES TO EXISITING PORTAL TABLES - AFTER A DATA IMPORT -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!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: `jbossportal` --- - -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `jbossportal` /*!40100 DEFAULT CHARACTER SET latin1 */; - -USE `jbossportal`; - --- -- 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 auto_increment, - `jbp_order` int(11) default NULL, - `jbp_title` varchar(255) default NULL, - PRIMARY KEY (`jbp_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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` -- -DROP TABLE IF EXISTS `jbp_forums_forums`; -CREATE TABLE `jbp_forums_forums` ( - `jbp_id` int(11) NOT NULL auto_increment, - `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, - PRIMARY KEY (`jbp_id`), - KEY `FK543743187E1ECA5A` (`jbp_category_id`), - KEY `FK54374318C1B3E31F` (`jbp_last_post_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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` -- -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, - PRIMARY KEY (`jbp_id`), - KEY `FK3A89B0B776BE0BCA` (`jbp_id`), - KEY `FK3A89B0B77892A9BA` (`jbp_forum_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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` -- -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', - PRIMARY KEY (`jbp_poll_id`,`jbp_poll_option_position`), - KEY `FKFF2EB50F8050E3A` (`jbp_poll_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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` -- -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', - PRIMARY KEY (`jbp_poll_id`,`jbp_poll_voted`), - KEY `FK3A29E2E08050E3A` (`jbp_poll_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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` -- -DROP TABLE IF EXISTS `jbp_forums_polls`; -CREATE TABLE `jbp_forums_polls` ( - `jbp_poll_id` int(11) NOT NULL auto_increment, - `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', - PRIMARY KEY (`jbp_poll_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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` -- -DROP TABLE IF EXISTS `jbp_forums_posters`; -CREATE TABLE `jbp_forums_posters` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_user_id` int(11) default NULL, - `jbp_post_count` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - UNIQUE KEY `jbp_user_id` (`jbp_user_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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` -- -DROP TABLE IF EXISTS `jbp_forums_posts`; -CREATE TABLE `jbp_forums_posts` ( - `jbp_id` int(11) NOT NULL auto_increment, - `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, - PRIMARY KEY (`jbp_id`), - KEY `FKF2C0436DBFB64FFA` (`jbp_topic_id`), - KEY `FKF2C0436D499BFC7A` (`jbp_poster_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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` -- -DROP TABLE IF EXISTS `jbp_forums_topics`; -CREATE TABLE `jbp_forums_topics` ( - `jbp_id` int(11) NOT NULL auto_increment, - `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, - PRIMARY KEY (`jbp_id`), - KEY `FK6C1A04CA7892A9BA` (`jbp_forum_id`), - KEY `FK6C1A04CA925A910C` (`jbp_poll`), - KEY `FK6C1A04CAC1B3E31F` (`jbp_last_post_id`), - KEY `FK6C1A04CA577068CB` (`jbp_first_post_id`), - KEY `FK6C1A04CA145469A8` (`jbp_poster`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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` -- -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, - PRIMARY KEY (`jbp_id`), - KEY `FK46F62E4576BE0BCA` (`jbp_id`), - KEY `FK46F62E45BFB64FFA` (`jbp_topic_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +-- AS THIS FEATURE IS NOT YET IMPLEMENTED, LEAVING IT OUT. -- -- 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 auto_increment, - `jbp_poster_id` int(11) default NULL, - `jbp_mode` int(11) default NULL, - PRIMARY KEY (`jbp_id`), - KEY `FKF31C8C69499BFC7A` (`jbp_poster_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +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); --- --- 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) default NULL, - `jbp_idx` int(11) NOT NULL default '0', - PRIMARY KEY (`jbp_prop_id`,`jbp_idx`), - KEY `FKC4963064D50D5281` (`jbp_prop_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_user_pref_set` --- - -DROP TABLE IF EXISTS `jbp_user_pref_set`; -CREATE TABLE `jbp_user_pref_set` ( - `jbp_id` int(11) NOT NULL auto_increment, - `jbp_parent_id` int(11) default NULL, - `name` varchar(255) NOT NULL default '', - PRIMARY KEY (`jbp_id`), - KEY `FK97AA4873E3AFC41A` (`jbp_parent_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_user_prop` --- - -DROP TABLE IF EXISTS `jbp_user_prop`; -CREATE TABLE `jbp_user_prop` ( - `jbp_uid` int(11) NOT NULL default '0', - `jbp_value` varchar(255) default NULL, - `jbp_name` varchar(255) NOT NULL default '', - PRIMARY KEY (`jbp_uid`,`jbp_name`), - KEY `FK93CC4610E70E4BD7` (`jbp_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `jbp_users` --- - -DROP TABLE IF EXISTS `jbp_users`; -CREATE TABLE `jbp_users` ( - `jbp_uid` int(11) NOT NULL auto_increment, - `jbp_root_pref_set_id` int(11) default NULL, - `jbp_uname` varchar(255) default NULL, - `jbp_givenname` varchar(255) default NULL, - `jbp_familyname` varchar(255) default NULL, - `jbp_password` varchar(255) default NULL, - `jbp_realemail` varchar(255) default NULL, - `jbp_fakeemail` varchar(255) default NULL, - `jbp_regdate` datetime default NULL, - `jbp_viewrealemail` tinyint(1) default NULL, - `jbp_enabled` tinyint(1) default NULL, - PRIMARY KEY (`jbp_uid`), - UNIQUE KEY `jbp_uname` (`jbp_uname`), - KEY `FKF6060141FD4AFF8F` (`jbp_root_pref_set_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - +-- REST OF THE TABLES ALREADY HAVE KEY INFO. Modified: trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-30 13:14:09 UTC (rev 1008) +++ trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-30 15:49:22 UTC (rev 1009) @@ -1,9 +1,3 @@ --- MySQL dump 10.9 --- --- Host: localhost Database: jbossportal --- ------------------------------------------------------ --- Server version 4.1.11 - -- PORTAL DB STRUCTURE WITHOUT KEY INFORMATION (FOR A PAINLESS DATA IMPORT) -- @@ -144,12 +138,14 @@ DROP TABLE IF EXISTS `jbp_forums_watch`; CREATE TABLE `jbp_forums_watch` ( - `jbp_id` int(11) NOT NULL auto_increment, + `jbp_id` int(11) NOT NULL, `jbp_poster_id` int(11) default NULL, - `jbp_mode` int(11) default NULL, - PRIMARY KEY (`jbp_id`) + `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` -- @@ -157,7 +153,10 @@ 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' + `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; -- @@ -166,9 +165,12 @@ DROP TABLE IF EXISTS `jbp_roles`; CREATE TABLE `jbp_roles` ( - `jbp_rid` int(11) NOT NULL, + `jbp_rid` int(11) NOT NULL auto_increment, `jbp_name` varchar(255) default NULL, - `jbp_displayname` 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; -- @@ -177,10 +179,12 @@ DROP TABLE IF EXISTS `jbp_user_pref`; CREATE TABLE `jbp_user_pref` ( - `jbp_id` int(11) NOT NULL, + `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 + `jbp_set_id` int(11) default NULL, + PRIMARY KEY (`jbp_id`), + KEY `FK93CC44D0AF499A90` (`jbp_set_id`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -191,7 +195,9 @@ CREATE TABLE `jbp_user_pref_prop_value` ( `jbp_prop_id` int(11) NOT NULL default '0', `jbp_value` varchar(255) default NULL, - `jbp_idx` int(11) NOT NULL default '0' + `jbp_idx` int(11) NOT NULL default '0', + PRIMARY KEY (`jbp_prop_id`,`jbp_idx`), + KEY `FKC4963064D50D5281` (`jbp_prop_id`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -200,9 +206,11 @@ DROP TABLE IF EXISTS `jbp_user_pref_set`; CREATE TABLE `jbp_user_pref_set` ( - `jbp_id` int(11) NOT NULL, + `jbp_id` int(11) NOT NULL auto_increment, `jbp_parent_id` int(11) default NULL, - `name` varchar(255) NOT NULL default '' + `name` varchar(255) NOT NULL default '', + PRIMARY KEY (`jbp_id`), + KEY `FK97AA4873E3AFC41A` (`jbp_parent_id`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -213,7 +221,9 @@ CREATE TABLE `jbp_user_prop` ( `jbp_uid` int(11) NOT NULL default '0', `jbp_value` varchar(255) default NULL, - `jbp_name` varchar(255) NOT NULL default '' + `jbp_name` varchar(255) NOT NULL default '', + PRIMARY KEY (`jbp_uid`,`jbp_name`), + KEY `FK93CC4610E70E4BD7` (`jbp_uid`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; -- @@ -222,7 +232,7 @@ DROP TABLE IF EXISTS `jbp_users`; CREATE TABLE `jbp_users` ( - `jbp_uid` int(11) NOT NULL, + `jbp_uid` int(11) NOT NULL auto_increment, `jbp_root_pref_set_id` int(11) default NULL, `jbp_uname` varchar(255) default NULL, `jbp_givenname` varchar(255) default NULL, @@ -232,5 +242,8 @@ `jbp_fakeemail` varchar(255) default NULL, `jbp_regdate` datetime default NULL, `jbp_viewrealemail` tinyint(1) default NULL, - `jbp_enabled` tinyint(1) default NULL + `jbp_enabled` tinyint(1) default NULL, + PRIMARY KEY (`jbp_uid`), + UNIQUE KEY `jbp_uname` (`jbp_uname`), + KEY `FKF6060141FD4AFF8F` (`jbp_root_pref_set_id`) ) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; |
From: <jbo...@li...> - 2005-08-29 21:35:29
|
Author: szimano Date: 2005-08-29 17:30:05 -0400 (Mon, 29 Aug 2005) New Revision: 1007 Added: trunk/forge/portal-extensions/forge-wiki/docs/wiki-reversed.zuml trunk/forge/portal-extensions/forge-wiki/lib/ trunk/forge/portal-extensions/forge-wiki/lib/cglib2.jar trunk/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar trunk/forge/portal-extensions/forge-wiki/lib/commons-collections.jar trunk/forge/portal-extensions/forge-wiki/lib/commons-lang.jar trunk/forge/portal-extensions/forge-wiki/lib/commons-logging.jar trunk/forge/portal-extensions/forge-wiki/lib/dom4j.jar trunk/forge/portal-extensions/forge-wiki/lib/ehcache.jar trunk/forge/portal-extensions/forge-wiki/lib/hibernate2.jar trunk/forge/portal-extensions/forge-wiki/lib/hsqldb.jar trunk/forge/portal-extensions/forge-wiki/lib/informa.jar trunk/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar trunk/forge/portal-extensions/forge-wiki/lib/jdom.jar trunk/forge/portal-extensions/forge-wiki/lib/jta.jar trunk/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar trunk/forge/portal-extensions/forge-wiki/lib/lucene.jar trunk/forge/portal-extensions/forge-wiki/lib/odmg.jar trunk/forge/portal-extensions/forge-wiki/lib/xalan.jar trunk/forge/portal-extensions/forge-wiki/lib/xml-apis.jar trunk/forge/portal-extensions/forge-wiki/src/etc/application.xml trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml trunk/forge/portal-extensions/forge-wiki/project.properties trunk/forge/portal-extensions/forge-wiki/project.xml trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld Log: ejb3 service, borders, rss etc. Added: trunk/forge/portal-extensions/forge-wiki/docs/wiki-reversed.zuml =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/wiki-reversed.zuml ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/cglib2.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/cglib2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/commons-lang.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/commons-lang.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/dom4j.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/dom4j.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/ehcache.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/ehcache.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/hibernate2.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/hibernate2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/hsqldb.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/hsqldb.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/informa.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/informa.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/jdom.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/jdom.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/jta.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/jta.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/lucene.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/lucene.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/odmg.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/odmg.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/xalan.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/xalan.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/xml-apis.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/xml-apis.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-29 21:30:05 UTC (rev 1007) @@ -3,8 +3,9 @@ Distributable under LGPL license. See terms of license at gnu.org. --> -<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> +<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" > <goal name="build"> + <attainGoal name="copy-tld" /> <ant:copy todir="target/classes/org/jboss/wiki" flatten="true"> <ant:fileset dir="src/java/org/jboss/wiki"> @@ -14,16 +15,38 @@ <ant:filename name="*.xml" /> </ant:fileset> </ant:copy> + <ant:copy todir="target/wiki/WEB-INF/lib" flatten="true"> + <ant:fileset dir="lib"> + <ant:filename name="*.jar" /> + </ant:fileset> + </ant:copy> <attainGoal name="war" /> + <attainGoal name="ejb" /> + <ant:copy todir="target/ejb3/" flatten="true"> + <ant:fileset dir="target"> + <ant:filename name="*.jar" /> + </ant:fileset> + </ant:copy> + <attainGoal name="jar" /> + </goal> <goal name="deploy"> - <ant:copy todir="${local.deploy.dir}" flatten="true"> + <ant:copy + tofile="${local.deploy.dir}/wiki.ear/META-INF/application.xml" + file="src/etc/application.xml" /> + <!--<ant:copy + tofile="${local.deploy.dir}/wiki.ear/wiki-common.jar" + file="target/wiki-1.0.jar" />--> + <ant:copy todir="${local.deploy.dir}/wiki.ear" flatten="true"> <ant:fileset dir="."> <ant:filename name="target/*.war" /> </ant:fileset> </ant:copy> + <ant:copy + tofile="${local.deploy.dir}/wiki.ear/wiki.ejb3" + file="target/ejb3/wiki-1.0.jar" /> </goal> <goal name="all"> Modified: trunk/forge/portal-extensions/forge-wiki/project.properties =================================================================== --- trunk/forge/portal-extensions/forge-wiki/project.properties 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/project.properties 2005-08-29 21:30:05 UTC (rev 1007) @@ -1,3 +1,6 @@ maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ maven.junit.fork=yes maven.war.src=${basedir}/src/web +maven.jar.includes=**/WikiEngine.class +maven.ejb.includes=**/WikiService* + Modified: trunk/forge/portal-extensions/forge-wiki/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-29 21:30:05 UTC (rev 1007) @@ -83,5 +83,36 @@ <jar>commons-fileupload-1.0.jar</jar> </dependency> + <dependency> + <groupId>informa</groupId> + <artifactId>informa</artifactId> + <version>0.6.0</version> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6</version> + </dependency> + + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3x</artifactId> + <version>1.0</version> + <jar>jboss-ejb3x.jar</jar> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3</artifactId> + <version>1.0</version> + <jar>jboss-ejb3.jar</jar> + </dependency> </dependencies> </project> Added: trunk/forge/portal-extensions/forge-wiki/src/etc/application.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/etc/application.xml 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/etc/application.xml 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,11 @@ +<application> + <display-name>JBoss Labs - forge infrastructure</display-name> + <!--<module> + <ejb>wiki.ejb3</ejb> + </module>--> + <module> + <web> + <web-uri>wiki.war</web-uri> + </web> + </module> +</application> Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-29 21:30:05 UTC (rev 1007) @@ -49,4 +49,12 @@ <class>org.jboss.wiki.plugins.HTMLTranslator</class> </plugin> </wikiType> + <wikiType> + <name>RSS</name> + <class>org.jboss.wiki.plugins.DefaultWikiType</class> + <plugin> + <name>RSSPlugin</name> + <class>org.jboss.wiki.plugins.RSSPlugin</class> + </plugin> + </wikiType> </wikiTypes> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,28 @@ +package org.jboss.wiki; + +import javax.management.MalformedObjectNameException; + +import org.jboss.mx.util.MBeanProxyExt; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.wiki.management.WikiServiceMenagement; + +public class WikiCommon { + + public static final String WIKI_SERVICE_NAME = "wiki:service=wikiService"; + + private WikiServiceMenagement wikiServiceMenagement; + + public WikiServiceMenagement getWikiManagement() { + try { + if (wikiServiceMenagement == null) + wikiServiceMenagement = (WikiServiceMenagement) MBeanProxyExt.create( + WikiServiceMenagement.class, + WIKI_SERVICE_NAME, + MBeanServerLocator.locate()); + + return wikiServiceMenagement; + } catch (MalformedObjectNameException e) { + throw new RuntimeException(e); + } + } +} Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -18,6 +18,7 @@ import javax.portlet.*; import org.jboss.portlet.*; +import org.jboss.wiki.management.WikiServiceMenagement; import org.apache.commons.fileupload.PortletDiskFileUpload; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.FileItem; @@ -41,6 +42,12 @@ public void init() { wikiEngine = new WikiEngine(); + + //WikiCommon wikiCommon = new WikiCommon(); + + //WikiServiceMenagement wikiServiceMenagement = wikiCommon.getWikiManagement(); + + //wikiServiceMenagement.setWikiEngine(wikiEngine); } public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) { Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -88,7 +88,7 @@ // execute the plugins for (int i = 0; i < plugins.size(); i++) { - //System.out.println("Executing plugin: "+plugins.get(i).getName()); + System.out.println("Executing plugin: "+plugins.get(i).getName()); newPage = (plugins.get(i)).process(newPage, wikiSession); } Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,40 @@ +package org.jboss.wiki.management; + +import javax.ejb.Local; +import javax.ejb.Remote; +import org.jboss.annotation.ejb.Service; +import org.jboss.wiki.WikiCommon; +import org.jboss.wiki.WikiEngine; + +@Service (objectName = WikiCommon.WIKI_SERVICE_NAME) +@Local(WikiServiceLocal.class) +@Remote(WikiServiceRemote.class) +public class WikiService implements WikiServiceLocal, WikiServiceRemote, WikiServiceMenagement { + WikiEngine wikiEngine; + + public WikiEngine getWikiEngine() { + return wikiEngine; + } + + public void setWikiEngine(WikiEngine wikiEngine) { + this.wikiEngine = wikiEngine; + } + + public void create() throws Exception { + System.out.println("WikiService - Creating"); + } + + public void start() throws Exception { + System.out.println("WikiService - Starting"); + } + + public void stop() { + System.out.println("WikiService - Stoping"); + } + + public void destroy() { + System.out.println("WikiService - Destroying"); + } + + +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,9 @@ +package org.jboss.wiki.management; + +import org.jboss.wiki.WikiEngine; + +public interface WikiServiceLocal { + public WikiEngine getWikiEngine(); + + public void setWikiEngine(WikiEngine wikiEngine); +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,27 @@ +/* + * JBoss, the OpenSource EJB server + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.wiki.management; + +import org.jboss.annotation.ejb.Management; +import org.jboss.wiki.WikiEngine; + +@Management +public interface WikiServiceMenagement { + + public WikiEngine getWikiEngine(); + + public void setWikiEngine(WikiEngine wikiEngine); + + void create() throws Exception; + + void start() throws Exception; + + void stop(); + + void destroy(); + +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,5 @@ +package org.jboss.wiki.management; + +public interface WikiServiceRemote { + +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,65 @@ +package org.jboss.wiki.plugins; + +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.wiki.WikiPage; + +import de.nava.informa.core.ChannelExporterIF; +import de.nava.informa.core.ChannelIF; +import de.nava.informa.core.ItemIF; +import de.nava.informa.exporters.RSS_2_0_Exporter; +import de.nava.informa.impl.basic.ChannelBuilder; +import org.jboss.wiki.WikiPlugin; +import org.jboss.wiki.WikiSession; + +public class RSSPlugin extends WikiPlugin { + + @Override + public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) { + + String chanName = wikiPage.getName()+" change feed"; + Writer writer = new StringWriter(); + + ChannelBuilder builder = new ChannelBuilder(); + + ChannelIF channel = builder.createChannel(chanName); + channel.setDescription("Test Channel: " + chanName); + try { + ItemIF item1 = builder.createItem(channel, "Item 1 for " + chanName, + "First in line", new URL("http://sf.net/rss2_projnews.php?group_id=52620")); + ItemIF item2 = builder.createItem(channel, "Item 2 for " + chanName, + "Second in line", new URL("http://sf.net/export/rss2_projfiles.php?group_id=52620")); + + channel.addItem(item1); channel.addItem(item2); + + } + catch (MalformedURLException e) { + System.err.println(e); + } + + try { + ChannelExporterIF exporter = new RSS_2_0_Exporter(writer, "utf8"); +// assuming you have a ChannelIF object available as channel + exporter.write(channel); + } + catch (IOException e) { + System.err.println(e); + } + + wikiPage.setPageContent(((StringWriter)writer).toString()+wikiPage.getContent()); + + return wikiPage; + } + + @Override + public void init() { + // TODO Auto-generated method stub + + } + +} Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-29 21:30:05 UTC (rev 1007) @@ -34,7 +34,7 @@ <table style="width: 100%" border="0"> <tr style="vertical-align: bottom;"> <td style="vertical-align: bottom; align-bottom: 0px;"> -<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" border=\"0\"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div> +<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" border="0"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div> </td> <td style="text-align: right;vertical-align: bottom; align-bottom: 0px;"> Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld 2005-08-29 21:30:05 UTC (rev 1007) @@ -9,17 +9,20 @@ --> <tlib-version>1.1</tlib-version> <jsp-version>2.0</jsp-version> - <shortname>forge</shortname> - <info>Forge tags</info> + <shortname>wiki</shortname> + <info>JBoss Wiki tags</info> <tag> <name>wikiEditLink</name> - <tagclass>org.jboss.wiki.taglib.wikiEditLinkTag</tagclass> + <tagclass>org.jboss.wiki.taglib.WikiEditLinkTag</tagclass> <attribute> + <name>actionURL</name> + <required>true</required> + </attribute> + <attribute> <name>page</name> <required>true</required> - <rtexprvalue>true</rtexprvalue> - </attribute>s + </attribute> </tag> </taglib> |
From: <jbo...@li...> - 2005-08-29 20:36:02
|
Author: adamw Date: 2005-08-29 16:35:56 -0400 (Mon, 29 Aug 2005) New Revision: 1006 Added: trunk/forge/portal-extensions/forge-forums/scripts/ trunk/forge/portal-extensions/forge-forums/scripts/all.sql trunk/forge/portal-extensions/forge-forums/scripts/conv.sql trunk/forge/portal-extensions/forge-forums/scripts/diff.sql trunk/forge/portal-extensions/forge-forums/scripts/nukes3.sql trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql trunk/forge/portal-extensions/forge-forums/scripts/test.sql Log: First scripts Added: trunk/forge/portal-extensions/forge-forums/scripts/all.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-29 19:21:02 UTC (rev 1005) +++ trunk/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-29 20:35:56 UTC (rev 1006) @@ -0,0 +1,3 @@ +\. portal-pure.sql +\. conv.sql +\. portal-keys.sql Added: trunk/forge/portal-extensions/forge-forums/scripts/conv.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-29 19:21:02 UTC (rev 1005) +++ trunk/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-29 20:35:56 UTC (rev 1006) @@ -0,0 +1,99 @@ +-- 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; + +-- TODO: update the post count + +-- 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"; Added: trunk/forge/portal-extensions/forge-forums/scripts/diff.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-29 19:21:02 UTC (rev 1005) +++ trunk/forge/portal-extensions/forge-forums/scripts/diff.sql 2005-08-29 20:35:56 UTC (rev 1006) @@ -0,0 +1,263 @@ +-- 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 portelt, 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: Unconsequently, 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; + Added: trunk/forge/portal-extensions/forge-forums/scripts/nukes3.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/nukes3.sql 2005-08-29 19:21:02 UTC (rev 1005) +++ trunk/forge/portal-extensions/forge-forums/scripts/nukes3.sql 2005-08-29 20:35:56 UTC (rev 1006) @@ -0,0 +1,759 @@ +-- 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 */; + Added: trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-29 19:21:02 UTC (rev 1005) +++ trunk/forge/portal-extensions/forge-forums/scripts/portal-keys.sql 2005-08-29 20:35:56 UTC (rev 1006) @@ -0,0 +1,305 @@ +-- MySQL dump 10.9 +-- +-- Host: localhost Database: jbossportal +-- ------------------------------------------------------ +-- Server version 4.1.11 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!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: `jbossportal` +-- + +CREATE DATABASE /*!32312 IF NOT EXISTS*/ `jbossportal` /*!40100 DEFAULT CHARACTER SET latin1 */; + +USE `jbossportal`; + +-- +-- 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 auto_increment, + `jbp_order` int(11) default NULL, + `jbp_title` varchar(255) default NULL, + PRIMARY KEY (`jbp_id`) +) 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 auto_increment, + `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, + PRIMARY KEY (`jbp_id`), + KEY `FK543743187E1ECA5A` (`jbp_category_id`), + KEY `FK54374318C1B3E31F` (`jbp_last_post_id`) +) 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, + PRIMARY KEY (`jbp_id`), + KEY `FK3A89B0B776BE0BCA` (`jbp_id`), + KEY `FK3A89B0B77892A9BA` (`jbp_forum_id`) +) 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', + PRIMARY KEY (`jbp_poll_id`,`jbp_poll_option_position`), + KEY `FKFF2EB50F8050E3A` (`jbp_poll_id`) +) 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', + PRIMARY KEY (`jbp_poll_id`,`jbp_poll_voted`), + KEY `FK3A29E2E08050E3A` (`jbp_poll_id`) +) 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 auto_increment, + `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', + PRIMARY KEY (`jbp_poll_id`) +) 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 auto_increment, + `jbp_user_id` int(11) default NULL, + `jbp_post_count` int(11) default NULL, + PRIMARY KEY (`jbp_id`), + UNIQUE KEY `jbp_user_id` (`jbp_user_id`) +) 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 auto_increment, + `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, + PRIMARY KEY (`jbp_id`), + KEY `FKF2C0436DBFB64FFA` (`jbp_topic_id`), + KEY `FKF2C0436D499BFC7A` (`jbp_poster_id`) +) 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 auto_increment, + `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, + PRIMARY KEY (`jbp_id`), + KEY `FK6C1A04CA7892A9BA` (`jbp_forum_id`), + KEY `FK6C1A04CA925A910C` (`jbp_poll`), + KEY `FK6C1A04CAC1B3E31F` (`jbp_last_post_id`), + KEY `FK6C1A04CA577068CB` (`jbp_first_post_id`), + KEY `FK6C1A04CA145469A8` (`jbp_poster`) +) 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, + PRIMARY KEY (`jbp_id`), + KEY `FK46F62E4576BE0BCA` (`jbp_id`), + KEY `FK46F62E45BFB64FFA` (`jbp_topic_id`) +) 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 auto_increment, + `jbp_poster_id` int(11) default NULL, + `jbp_mode` int(11) default NULL, + PRIMARY KEY (`jbp_id`), + KEY `FKF31C8C69499BFC7A` (`jbp_poster_id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- 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) default NULL, + `jbp_idx` int(11) NOT NULL default '0', + PRIMARY KEY (`jbp_prop_id`,`jbp_idx`), + KEY `FKC4963064D50D5281` (`jbp_prop_id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Table structure for table `jbp_user_pref_set` +-- + +DROP TABLE IF EXISTS `jbp_user_pref_set`; +CREATE TABLE `jbp_user_pref_set` ( + `jbp_id` int(11) NOT NULL auto_increment, + `jbp_parent_id` int(11) default NULL, + `name` varchar(255) NOT NULL default '', + PRIMARY KEY (`jbp_id`), + KEY `FK97AA4873E3AFC41A` (`jbp_parent_id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Table structure for table `jbp_user_prop` +-- + +DROP TABLE IF EXISTS `jbp_user_prop`; +CREATE TABLE `jbp_user_prop` ( + `jbp_uid` int(11) NOT NULL default '0', + `jbp_value` varchar(255) default NULL, + `jbp_name` varchar(255) NOT NULL default '', + PRIMARY KEY (`jbp_uid`,`jbp_name`), + KEY `FK93CC4610E70E4BD7` (`jbp_uid`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Table structure for table `jbp_users` +-- + +DROP TABLE IF EXISTS `jbp_users`; +CREATE TABLE `jbp_users` ( + `jbp_uid` int(11) NOT NULL auto_increment, + `jbp_root_pref_set_id` int(11) default NULL, + `jbp_uname` varchar(255) default NULL, + `jbp_givenname` varchar(255) default NULL, + `jbp_familyname` varchar(255) default NULL, + `jbp_password` varchar(255) default NULL, + `jbp_realemail` varchar(255) default NULL, + `jbp_fakeemail` varchar(255) default NULL, + `jbp_regdate` datetime default NULL, + `jbp_viewrealemail` tinyint(1) default NULL, + `jbp_enabled` tinyint(1) default NULL, + PRIMARY KEY (`jbp_uid`), + UNIQUE KEY `jbp_uname` (`jbp_uname`), + KEY `FKF6060141FD4AFF8F` (`jbp_root_pref_set_id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + Added: trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql =================================================================== --- trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-29 19:21:02 UTC (rev 1005) +++ trunk/forge/portal-extensions/forge-forums/scripts/portal-pure.sql 2005-08-29 20:35:56 UTC (rev 1006) @@ -0,0 +1,236 @@ +-- MySQL dump 10.9 +-- +-- Host: localhost Database: jbossportal +-- ------------------------------------------------------ +-- Server version 4.1.11 + +-- 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 auto_increment, + `jbp_poster_id` int(11) default NULL, + `jbp_mode` int(11) default NULL, + PRIMARY KEY (`jbp_id`) +) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; + +-- +-- 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' +) 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, + `jbp_name` varchar(255) default NULL, + `jbp_displayname` varchar(255) default NULL +) ENGINE=MyISAM; -- DEFAULT CHARSET=latin1; + +-- +-- Table structure for table `jbp_user_pref` +-- + +DROP TABLE IF EXISTS `jbp_user_pref`... [truncated message content] |
From: <jbo...@li...> - 2005-08-29 19:21:08
|
Author: ral...@jb... Date: 2005-08-29 15:21:02 -0400 (Mon, 29 Aug 2005) New Revision: 1005 Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp Log: fixed blue borders around images Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-29 15:45:15 UTC (rev 1004) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-29 19:21:02 UTC (rev 1005) @@ -34,7 +34,7 @@ <table style="width: 100%" border="0"> <tr style="vertical-align: bottom;"> <td style="vertical-align: bottom; align-bottom: 0px;"> -<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div> +<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" border=\"0\"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div> </td> <td style="text-align: right;vertical-align: bottom; align-bottom: 0px;"> @@ -45,8 +45,8 @@ if ((type == null)||(type.equals("HTML"))) { if (logedIn.equals("true")) { - out.print("<a href=\""+actionURL+"&action=Edit&page="+wikiPage+"\"><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\" /></a>\n"+ - "<a href=\""+actionURL+"&action=Attach&page="+wikiPage+"\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\" /></a>"); + out.print("<a href=\""+actionURL+"&action=Edit&page="+wikiPage+"\"><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\" border=\"0\" /></a>\n"+ + "<a href=\""+actionURL+"&action=Attach&page="+wikiPage+"\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\" border=\"0\" /></a>"); } else { @@ -58,7 +58,7 @@ <% if ((type == null)||(type.equals("HTML"))) { - out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\" /></a><br />"); + out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\" border=\"0\" /></a><br />"); } %> <input type="text" name="searchQuery" /> |
From: <jbo...@li...> - 2005-08-29 15:45:21
|
Author: ral...@jb... Date: 2005-08-29 11:45:15 -0400 (Mon, 29 Aug 2005) New Revision: 1004 Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java Log: fixed bold tags mess Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-28 06:01:19 UTC (rev 1003) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-29 15:45:15 UTC (rev 1004) @@ -928,6 +928,18 @@ public WikiPage process(final WikiPage wikiPage, WikiSession wikiSession) { WikiPage newPage = null; + m_allowHTML = false; + m_isbold = false; + m_isitalic = false; + m_isTypedText = false; + m_istable = false; + m_isPre = false; + m_isdefinition = false; + m_listlevel = 0; + m_numlistlevel = 0; + m_camelCaseLinks = true; // camelCase enabled + /** Tag that gets closed at EOL. */ + m_closeTag = null; portalHome = (String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL"); wikiHome = ""; @@ -954,11 +966,9 @@ } @Override - public void init() { - //portalHome = getProperty("htmlTranslatorURL") + "portal/"; + public void init() { mediaPatterns = getProperty("imagePatterns"); - //imagePath = getProperty("htmlTranslatorURL") + "wiki"; - //wikiHome = getProperty("wikiHome"); + } } \ No newline at end of file |
From: <jbo...@li...> - 2005-08-28 06:01:25
|
Author: aron.gombas Date: 2005-08-28 02:01:19 -0400 (Sun, 28 Aug 2005) New Revision: 1003 Modified: trunk/labs/kosmos/xdocs/reference/reference-manual.xml Log: Slide URLs added Modified: trunk/labs/kosmos/xdocs/reference/reference-manual.xml =================================================================== --- trunk/labs/kosmos/xdocs/reference/reference-manual.xml 2005-08-27 22:30:13 UTC (rev 1002) +++ trunk/labs/kosmos/xdocs/reference/reference-manual.xml 2005-08-28 06:01:19 UTC (rev 1003) @@ -824,7 +824,7 @@ <listitem> - <para>Deploy Jakarta Slide to the Tomcat instance used by Gridsphere + <para>Deploy <ulink url="http://jakarta.apache.org/slide">Jakarta Slide</ulink> to the Tomcat instance used by Gridsphere as written in the JBoss AS step-by-step.</para> </listitem> @@ -911,7 +911,7 @@ <listitem> - <para>Deploy Jakarta Slide to JBoss AS and configure it as + <para>Deploy <ulink url="http://jakarta.apache.org/slide">Jakarta Slide</ulink> to JBoss AS and configure it as written in the appropriate manuals. Test if you can access the Slide repositories through a WebDAV navigator. If you use Windows XP, it is able to map a WebDAV repository as @@ -982,7 +982,7 @@ <listitem> - <para>Deploy Jakarta Slide to the Tomcat instance used by Liferay + <para>Deploy <ulink url="http://jakarta.apache.org/slide">Jakarta Slide</ulink> to the Tomcat instance used by Liferay as written in the JBoss AS step-by-step.</para> </listitem> @@ -1079,7 +1079,7 @@ <listitem> - <para>Deploy Jakarta Slide to the Tomcat instance used by Pluto + <para>Deploy <ulink url="http://jakarta.apache.org/slide">Jakarta Slide</ulink> to the Tomcat instance used by Pluto as written in the JBoss AS step-by-step.</para> </listitem> |
Author: dam...@jb... Date: 2005-08-27 18:30:13 -0400 (Sat, 27 Aug 2005) New Revision: 1002 Modified: qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.11.jar qa/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java qa/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java qa/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml qa/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm qa/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java Log: MERGED: -r 993:999 https://svn.labs.jboss.com/trunk/jira-extensions into qa/jira-extensions. Modified: qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml =================================================================== --- qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 22:30:13 UTC (rev 1002) @@ -69,6 +69,10 @@ <description>report.changelog.style.description</description> <type>select</type> <values> + <value> + <key>none</key> + <value>None</value> + </value> <value> <key>html</key> <value>HTML</value> Modified: qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm =================================================================== --- qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -1,7 +1,7 @@ <h3>HTML Source</h3> <br /> -<h3>Released project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> +<h3>Released project versions report (covering $covering)</h3> <br /> #foreach ($project in $prjVerIss.keySet()) <br /> @@ -17,7 +17,7 @@ <tr> <br /> <td colspan=4> <a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id"> - <b><u>$version.name</u></b></a> ($dateFormat.format($version.getReleaseDate())) + <b><u>$version.name</u></b></a> ($releasedDf.format($version.releaseDate)) </td> <br /> </tr> <br /> @@ -30,7 +30,7 @@ <td width="15%"> <b>$constantsManager.getStatus($issue.getString('status')).getString("name")</b> </td><br /> <td> - $issue.getString('summary') </td><br /> + $textUtils.htmlEncode($issue.getString('summary')) </td><br /> <td width="15%" align="right"> ($constantsManager.getPriority($issue.getString('priority')).getString("name")) </td><br /> </tr> <br /> Modified: qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm =================================================================== --- qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -1,7 +1,7 @@ <h3>Text source</h3> <br /> -Released project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate)) +Released project versions report (covering $covering) <br /><br /> @@ -12,13 +12,13 @@ #if ($prjVerIss.get($project).size() != 0) #foreach ($version in $prjVerIss.get($project).keySet()) - ** $version.name ($dateFormat.format($version.getReleaseDate())) + ** $version.name ($releasedDf.format($version.releaseDate)) <br /> #set ($issues = $prjVerIss.get($project).get($version)) #if ($issues.size() > 0) #foreach ($issue in $issues) * - [ $issue.getString('key') ] $issue.getString('summary') + [ $issue.getString('key') ] $textUtils.htmlEncode($issue.getString('summary')) ($constantsManager.getStatus($issue.getString('status')).getString("name"), $constantsManager.getPriority($issue.getString('priority')).getString("name")) <br /> Modified: qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm =================================================================== --- qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -2,7 +2,7 @@ <table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr class=rowHeader><td valign=top bgcolor=f0f0f0> <h3 class="formtitle">Released project versions report - (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> + (covering $covering)</h3> </td></tr></table> </td></tr></table> @@ -29,7 +29,7 @@ <font size=3><a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id" title="$action.getText("browseproject.getmoreinfo")"> <b><u>$version.name</u></b></a></font> (#if ($version.releaseDate) - #versionReleaseDate($action $version) + $releasedDf.format($version.releaseDate) #end) </td> </tr> Modified: qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java =================================================================== --- qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 22:30:13 UTC (rev 1002) @@ -29,9 +29,11 @@ import com.atlassian.jira.web.util.OutlookDate; import com.atlassian.jira.web.util.OutlookDateManager; import com.opensymphony.user.User; +import com.opensymphony.util.TextUtils; import java.sql.Timestamp; import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import org.ofbiz.core.entity.GenericValue; @@ -65,7 +67,7 @@ this.versionManager = versionManager; this.issueManager = issueManager; this.subTaskManager = subTaskManager; - this.issueSecurityLevelManager = issueSecurityLevelManager; + this.issueSecurityLevelManager = issueSecurityLevelManager; } /** @@ -268,8 +270,18 @@ prjVerIss.put(project, verIss); } - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG); + DateFormat dateFormat = new SimpleDateFormat("MMMM yyyy"); + DateFormat releasedDf = DateFormat.getDateInstance(DateFormat.LONG); + String beginDateMonth = dateFormat.format(beginDate); + String endDateMonth = dateFormat.format(endDate); + + String covering; + if (beginDateMonth.equals(endDateMonth)) + covering = beginDateMonth; + else + covering = beginDateMonth + " - " + endDateMonth; + velocityParams.put("prjVerIss", prjVerIss); velocityParams.put("action", action); velocityParams.put("endDate", endDate); @@ -277,9 +289,16 @@ velocityParams.put("dateFormat", dateFormat); velocityParams.put("constantsManager", constantsManager); velocityParams.put("appProps", appProps); + velocityParams.put("releasedDf", releasedDf); + velocityParams.put("covering", covering); + velocityParams.put("textUtils", new TextUtils()); /* Generating reeport source in the format demanded by the user */ - velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); + String style = (String)params.get("style"); + if ("none".equals(style)) + velocityParams.put("generated", ""); + else + velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); return descriptor.getHtml("view", velocityParams); } Modified: qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp =================================================================== --- qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 22:30:13 UTC (rev 1002) @@ -90,7 +90,8 @@ List allIssueTypes = constantsManager.getAllIssueTypes(); for (iter = allIssueTypes.iterator(); iter.hasNext();) { GenericValue issueType = (GenericValue)iter.next(); - issuesNamesMap.put(issueType.getString("id"), issueType.getString("name")); + if (!("Sub-task".equals(issueType.getString("name")))) + issuesNamesMap.put(issueType.getString("id"), issueType.getString("name")); } /* Preparing issueMap */ @@ -107,7 +108,8 @@ /* Filling sets in issueMap */ for (iter = issues.iterator(); iter.hasNext();) { Issue issue = (Issue) iter.next(); - ((Set)issuesMap.get(issue.getIssueType().getString("id"))).add(issue); + Set toAdd = (Set)issuesMap.get(issue.getIssueType().getString("id")); + if (toAdd != null) toAdd.add(issue); } for (iter = issuesMap.keySet().iterator(); iter.hasNext();) { Modified: qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.11.jar =================================================================== (Binary files differ) Modified: qa/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java =================================================================== --- qa/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 22:30:13 UTC (rev 1002) @@ -191,12 +191,24 @@ Iterator iter; /* Map: issue type id -> (Set of issue) */ - Map issuesMap = new TreeMap(); + Map issuesMap = new TreeMap(new Comparator() { + // Sorting issue types by the "sequence" field. + public int compare(Object arg0, Object arg1) { + String id1 = (String) arg0; + String id2 = (String) arg1; + + GenericValue gv1 = constantsManager.getIssueType(id1); + GenericValue gv2 = constantsManager.getIssueType(id2); + + return gv1.getLong("sequence").compareTo( + gv2.getLong("sequence")); + } + }); /* Map: issue type id -> issue name */ Map issuesNamesMap = new HashMap(); CustomField affects = customFieldManager.getCustomFieldObjectByName("Affects"); - + Map affectsValues = new HashMap(); Iterator it = issues.iterator(); @@ -205,23 +217,26 @@ if (affects != null) while (it.hasNext()) { Object key = it.next(); - String issueId = ((GenericValue)key).getString("id"); + String issueKey = ((GenericValue)key).getString("key"); String str = String.valueOf(affects.getValue( - issueManager.getIssueObject(issueId))); + issueManager.getIssueObject(issueKey))); if (!(str.equals("null"))) affectsValues.put(key, str.substring(1,str.length() - 1)); } /* Preparing issueMap */ - for (iter = sections.iterator(); iter.hasNext();) - issuesMap.put(iter.next(), new TreeSet()); + for (iter = sections.iterator(); iter.hasNext();) { + String typeId = (String) iter.next(); + issuesMap.put(typeId, new TreeSet()); + } + + /* Filling sets in issueMap */ + for (iter = issues.iterator(); iter.hasNext();) { + GenericValue issue = (GenericValue) iter.next(); + Set toAdd = (Set)issuesMap.get(issue.getString("type")); + if (toAdd != null) toAdd.add(issue); + } - /* Filling sets in issueMap */ - for (iter = issues.iterator(); iter.hasNext();) { - GenericValue issue = (GenericValue) iter.next(); - ((Set)issuesMap.get(issue.getString("type"))).add(issue); - } - /* Setting the issues' names */ for (iter = sections.iterator(); iter.hasNext();) { String issueId = (String)iter.next(); Modified: qa/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java =================================================================== --- qa/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 22:30:13 UTC (rev 1002) @@ -207,13 +207,16 @@ Map issuesNamesMap = new HashMap(); /* Preparing issueMap */ - for (iter = sections.iterator(); iter.hasNext();) - issuesMap.put(iter.next(), new TreeSet()); + for (iter = sections.iterator(); iter.hasNext();) { + String typeId = (String) iter.next(); + issuesMap.put(typeId, new TreeSet()); + } /* Filling sets in issueMap */ for (iter = issues.iterator(); iter.hasNext();) { GenericValue issue = (GenericValue) iter.next(); - ((Set)issuesMap.get(issue.getString("type"))).add(issue); + Set toAdd = (Set)issuesMap.get(issue.getString("type")); + if (toAdd != null) toAdd.add(issue); } /* Setting the issues' names */ Modified: qa/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 22:30:13 UTC (rev 1002) @@ -44,22 +44,6 @@ <type>date</type> </property> <property> - <key>datenow</key> - <name>report.roadmap.datenow.name</name> - <description>report.roadmap.datenow.description</description> - <type>select</type> - <values> - <value> - <key>no</key> - <value>No</value> - </value> - <value> - <key>yes</key> - <value>Yes</value> - </value> - </values> - </property> - <property> <key>period</key> <name>report.roadmap.period.name</name> <description>report.roadmap.period.description</description> @@ -86,6 +70,10 @@ <type>select</type> <values> <value> + <key>none</key> + <value>None</value> + </value> + <value> <key>html</key> <value>HTML</value> </value> Modified: qa/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 22:30:13 UTC (rev 1002) @@ -14,11 +14,8 @@ report.roadmap.period.description = Select the span of time that this report will cover report.roadmap.period.error = Please select one period. report.roadmap.datebegin.name = Begin date -report.roadmap.datebegin.description = Select the date that begins the period of time you chose. +report.roadmap.datebegin.description = Select the date that begins the period of time you chose. Leave blank for rolling date, i.e. current date at the time when the report is requested. report.roadmap.datebegin.error = Please select a date. -report.roadmap.datenow.name = Today -report.roadmap.datenow.description = Check this box if you want the report's starting date to be today. -report.roadmap.datenow.error = Please select either yes or no. report.roadmap.style.name = Style report.roadmap.style.description = Select the style in which to generate the report source. report.roadmap.style.error = Please select one style. \ No newline at end of file Modified: qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -1,7 +1,7 @@ <h3>HTML Source</h3> <br /> -<h3>Unreleased project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> +<h3>Unreleased project versions report (covering $covering)</h3> <br /> #foreach ($project in $prjVerIss.keySet()) <br /> @@ -17,7 +17,7 @@ <tr> <br /> <td colspan=4> <a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id"> - <b><u>$version.name</u></b></a> ($dateFormat.format($version.getReleaseDate())) + <b><u>$version.name</u></b></a> ($dateFormat.format($version.releaseDate) - $nextMonths.get($dateFormat.format($version.releaseDate))) </td> <br /> </tr> <br /> @@ -30,7 +30,7 @@ <td width="15%"> <b>$constantsManager.getStatus($issue.getString('status')).getString("name")</b> </td><br /> <td> - $issue.getString('summary') </td><br /> + $textUtils.htmlEncode($issue.getString('summary')) </td><br /> <td width="15%" align="right"> ($constantsManager.getPriority($issue.getString('priority')).getString("name")) </td><br /> </tr> <br /> Modified: qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -1,7 +1,7 @@ <h3>Text source</h3> <br /> -Unreleased project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate)) +Unreleased project versions report (covering $covering) <br /><br /> @@ -12,13 +12,13 @@ #if ($prjVerIss.get($project).size() != 0) #foreach ($version in $prjVerIss.get($project).keySet()) - ** $version.name ($dateFormat.format($version.getReleaseDate())) + ** $version.name ($dateFormat.format($version.releaseDate) - $nextMonths.get($dateFormat.format($version.releaseDate))) <br /> #set ($issues = $prjVerIss.get($project).get($version)) #if ($issues.size() > 0) #foreach ($issue in $issues) * - [ $issue.getString('key') ] $issue.getString('summary') + [ $issue.getString('key') ] $textUtils.htmlEncode($issue.getString('summary')) ($constantsManager.getStatus($issue.getString('status')).getString("name"), $constantsManager.getPriority($issue.getString('priority')).getString("name")) <br /> Modified: qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm =================================================================== --- qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm 2005-08-27 22:30:13 UTC (rev 1002) @@ -2,7 +2,7 @@ <table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr class=rowHeader><td valign=top bgcolor=f0f0f0> <h3 class="formtitle">Unreleased project versions report - (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> + (covering $covering)</h3> </td></tr></table> </td></tr></table> @@ -24,12 +24,12 @@ <table cellpadding=3 cellspacing=0 border=0 width=100% bgcolor="fffff0"> #foreach ($version in $prjVerIss.get($project).keySet()) <tr> - <td class="colHeaderLink" colspan=4> + <td class="colHeaderLink" colspan=7> #versionStatus($version 24) <font size=3><a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id" title="$action.getText("browseproject.getmoreinfo")"> <b><u>$version.name</u></b></a></font> (#if ($version.releaseDate) - #versionReleaseDate($action $version) + $dateFormat.format($version.releaseDate) - $nextMonths.get($dateFormat.format($version.releaseDate)) #end) </td> </tr> Modified: qa/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java =================================================================== --- qa/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 22:22:26 UTC (rev 1001) +++ qa/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 22:30:13 UTC (rev 1002) @@ -32,9 +32,11 @@ import com.atlassian.jira.web.util.OutlookDateManager; import com.atlassian.plugin.PluginManager; import com.opensymphony.user.User; +import com.opensymphony.util.TextUtils; import java.sql.Timestamp; import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import org.ofbiz.core.entity.GenericValue; @@ -74,7 +76,7 @@ this.pluginManager = pluginManager; this.issueManager = issueManager; this.subTaskManager = subTaskManager; - this.issueSecurityLevelManager = issueSecurityLevelManager; + this.issueSecurityLevelManager = issueSecurityLevelManager; } /** @@ -191,8 +193,12 @@ /* Geting the dates */ I18nHelper i18nBean = new I18nBean(remoteUser); Date beginDate; - if (("yes".equals((String) params.get("datenow")))) - beginDate = Calendar.getInstance().getTime(); + + // Empty begin-date --> make the report from the current date. + String datebegin = (String) params.get("datebegin"); + if ((datebegin == null) || ("".equals(datebegin.trim()))) + beginDate = new Date( + (Calendar.getInstance().getTimeInMillis() / 86400000) * 86400000 - 1); else beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale()); Date endDate = getEndDate((String)params.get("period"), beginDate); @@ -239,8 +245,42 @@ prjVerIss.put(project, verIss); } - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG); + DateFormat dateFormat = new SimpleDateFormat("MMMM yyyy"); + + String beginDateMonth = dateFormat.format(beginDate); + String endDateMonth = dateFormat.format(endDate); + String covering; + if (beginDateMonth.equals(endDateMonth)) + covering = beginDateMonth; + else + covering = beginDateMonth + " - " + endDateMonth; + + Map nextMonths = new HashMap(); + Date current = new Date(beginDate.getTime()); + Calendar cal = Calendar.getInstance(); + + for (int i=0; i<12; i++) { + String currMonth = dateFormat.format(current); + + // Pushing the current date one month forward. + cal.setTime(current); + + int month = cal.get(Calendar.MONTH); + int year = cal.get(Calendar.YEAR); + month += 1; + if (month > 11) { + month = 0; + year += 1; + } + cal.set(Calendar.MONTH, month); + cal.set(Calendar.YEAR, year); + + current = cal.getTime(); + + nextMonths.put(currMonth, dateFormat.format(current)); + } + velocityParams.put("prjVerIss", prjVerIss); velocityParams.put("action", action); velocityParams.put("browser", new Browser(projectManager, constantsManager, searchProvider, @@ -250,9 +290,16 @@ velocityParams.put("dateFormat", dateFormat); velocityParams.put("constantsManager", constantsManager); velocityParams.put("appProps", appProps); + velocityParams.put("nextMonths", nextMonths); + velocityParams.put("covering", covering); + velocityParams.put("textUtils", new TextUtils()); /* Generating reeport source in the format demanded by the user */ - velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); + String style = (String)params.get("style"); + if ("none".equals(style)) + velocityParams.put("generated", ""); + else + velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); return descriptor.getHtml("view", velocityParams); } @@ -330,19 +377,20 @@ if (!validateMultivalue(action, params, "priorities")) return; if (!validateSinglevalue(action, params, "period")) return; if (!validateSinglevalue(action, params, "style")) return; - if (!validateSinglevalue(action, params, "datenow")) return; - String dateNow = (String) params.get("datenow"); - if (!("yes".equals(dateNow))) { - Date beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale()); - OutlookDate outlookDate = outlookDateManager.getOutlookDate(i18nBean.getLocale()); - if (beginDate == null || outlookDate.isDatePickerDate(outlookDate.formatDMY(beginDate))) - { - action.addError("datebegin", action.getText("report.roadmap.datebegin.error")); - return; - } + // Allowing an empty date-begin. + String datebegin = (String) params.get("datebegin"); + if ((datebegin == null) || ("".equals(datebegin.trim()))) + return; + + Date beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale()); + OutlookDate outlookDate = outlookDateManager.getOutlookDate(i18nBean.getLocale()); + if (beginDate == null || outlookDate.isDatePickerDate(outlookDate.formatDMY(beginDate))) + { + action.addError("datebegin", action.getText("report.roadmap.datebegin.error")); + return; } } - + public void init(ReportModuleDescriptor arg0) { } } \ No newline at end of file |
From: <jbo...@li...> - 2005-08-27 22:22:31
|
Author: dam...@jb... Date: 2005-08-27 18:22:26 -0400 (Sat, 27 Aug 2005) New Revision: 1001 Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/ Log: Restoring JBoss AS 4.0.3RC1. Copied: trunk/forge/portal-extensions/jboss-as-binaries/to-copy (from rev 960, trunk/forge/portal-extensions/jboss-as-binaries/to-copy) |
From: <jbo...@li...> - 2005-08-27 22:18:33
|
Author: dam...@jb... Date: 2005-08-27 18:18:30 -0400 (Sat, 27 Aug 2005) New Revision: 1000 Removed: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/ Log: REMOVED: to-copy . Preparing to revert to JBoss AS 4.0.2RC1. The RC2 has issues. |
From: <jbo...@li...> - 2005-08-27 21:59:03
|
Author: adamw Date: 2005-08-27 17:58:59 -0400 (Sat, 27 Aug 2005) New Revision: 999 Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java Log: Temporary forge-timer warning back Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java =================================================================== --- trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java 2005-08-27 21:53:06 UTC (rev 998) +++ trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java 2005-08-27 21:58:59 UTC (rev 999) @@ -42,7 +42,7 @@ fm.update(); // Avoiding WARN. - timer.cancel(); + //timer.cancel(); -- Maybe this caused the TX exception. // Scheduling next timer to timeout after the amount of time that // is set in forgeManagement. |
From: <jbo...@li...> - 2005-08-27 21:53:19
|
Author: adamw Date: 2005-08-27 17:53:06 -0400 (Sat, 27 Aug 2005) New Revision: 998 Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java Log: Months in reports instead of full dates Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm =================================================================== --- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 21:53:06 UTC (rev 998) @@ -1,7 +1,7 @@ <h3>HTML Source</h3> <br /> -<h3>Released project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> +<h3>Released project versions report (covering $covering)</h3> <br /> #foreach ($project in $prjVerIss.keySet()) <br /> @@ -17,7 +17,7 @@ <tr> <br /> <td colspan=4> <a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id"> - <b><u>$version.name</u></b></a> ($dateFormat.format($version.getReleaseDate())) + <b><u>$version.name</u></b></a> ($releasedDf.format($version.releaseDate)) </td> <br /> </tr> <br /> Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm =================================================================== --- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 21:53:06 UTC (rev 998) @@ -1,7 +1,7 @@ <h3>Text source</h3> <br /> -Released project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate)) +Released project versions report (covering $covering) <br /><br /> @@ -12,7 +12,7 @@ #if ($prjVerIss.get($project).size() != 0) #foreach ($version in $prjVerIss.get($project).keySet()) - ** $version.name ($dateFormat.format($version.getReleaseDate())) + ** $version.name ($releasedDf.format($version.releaseDate)) <br /> #set ($issues = $prjVerIss.get($project).get($version)) #if ($issues.size() > 0) Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm =================================================================== --- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report.vm 2005-08-27 21:53:06 UTC (rev 998) @@ -2,7 +2,7 @@ <table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr class=rowHeader><td valign=top bgcolor=f0f0f0> <h3 class="formtitle">Released project versions report - (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> + (covering $covering)</h3> </td></tr></table> </td></tr></table> @@ -29,7 +29,7 @@ <font size=3><a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id" title="$action.getText("browseproject.getmoreinfo")"> <b><u>$version.name</u></b></a></font> (#if ($version.releaseDate) - #versionReleaseDate($action $version) + $releasedDf.format($version.releaseDate) #end) </td> </tr> Modified: trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java =================================================================== --- trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 21:53:06 UTC (rev 998) @@ -33,6 +33,7 @@ import java.sql.Timestamp; import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import org.ofbiz.core.entity.GenericValue; @@ -66,7 +67,7 @@ this.versionManager = versionManager; this.issueManager = issueManager; this.subTaskManager = subTaskManager; - this.issueSecurityLevelManager = issueSecurityLevelManager; + this.issueSecurityLevelManager = issueSecurityLevelManager; } /** @@ -269,8 +270,18 @@ prjVerIss.put(project, verIss); } - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG); + DateFormat dateFormat = new SimpleDateFormat("MMMM yyyy"); + DateFormat releasedDf = DateFormat.getDateInstance(DateFormat.LONG); + String beginDateMonth = dateFormat.format(beginDate); + String endDateMonth = dateFormat.format(endDate); + + String covering; + if (beginDateMonth.equals(endDateMonth)) + covering = beginDateMonth; + else + covering = beginDateMonth + " - " + endDateMonth; + velocityParams.put("prjVerIss", prjVerIss); velocityParams.put("action", action); velocityParams.put("endDate", endDate); @@ -278,6 +289,8 @@ velocityParams.put("dateFormat", dateFormat); velocityParams.put("constantsManager", constantsManager); velocityParams.put("appProps", appProps); + velocityParams.put("releasedDf", releasedDf); + velocityParams.put("covering", covering); velocityParams.put("textUtils", new TextUtils()); /* Generating reeport source in the format demanded by the user */ Modified: trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml =================================================================== --- trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 21:53:06 UTC (rev 998) @@ -44,22 +44,6 @@ <type>date</type> </property> <property> - <key>datenow</key> - <name>report.roadmap.datenow.name</name> - <description>report.roadmap.datenow.description</description> - <type>select</type> - <values> - <value> - <key>no</key> - <value>No</value> - </value> - <value> - <key>yes</key> - <value>Yes</value> - </value> - </values> - </property> - <property> <key>period</key> <name>report.roadmap.period.name</name> <description>report.roadmap.period.description</description> Modified: trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties =================================================================== --- trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 21:53:06 UTC (rev 998) @@ -14,11 +14,8 @@ report.roadmap.period.description = Select the span of time that this report will cover report.roadmap.period.error = Please select one period. report.roadmap.datebegin.name = Begin date -report.roadmap.datebegin.description = Select the date that begins the period of time you chose. +report.roadmap.datebegin.description = Select the date that begins the period of time you chose. Leave blank for rolling date, i.e. current date at the time when the report is requested. report.roadmap.datebegin.error = Please select a date. -report.roadmap.datenow.name = Today -report.roadmap.datenow.description = Check this box if you want the report's starting date to be today. -report.roadmap.datenow.error = Please select either yes or no. report.roadmap.style.name = Style report.roadmap.style.description = Select the style in which to generate the report source. report.roadmap.style.error = Please select one style. \ No newline at end of file Modified: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm =================================================================== --- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 21:53:06 UTC (rev 998) @@ -1,7 +1,7 @@ <h3>HTML Source</h3> <br /> -<h3>Unreleased project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> +<h3>Unreleased project versions report (covering $covering)</h3> <br /> #foreach ($project in $prjVerIss.keySet()) <br /> @@ -17,7 +17,7 @@ <tr> <br /> <td colspan=4> <a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id"> - <b><u>$version.name</u></b></a> ($dateFormat.format($version.getReleaseDate())) + <b><u>$version.name</u></b></a> ($dateFormat.format($version.releaseDate) - $nextMonths.get($dateFormat.format($version.releaseDate))) </td> <br /> </tr> <br /> Modified: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm =================================================================== --- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 21:53:06 UTC (rev 998) @@ -1,7 +1,7 @@ <h3>Text source</h3> <br /> -Unreleased project versions report (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate)) +Unreleased project versions report (covering $covering) <br /><br /> @@ -12,7 +12,7 @@ #if ($prjVerIss.get($project).size() != 0) #foreach ($version in $prjVerIss.get($project).keySet()) - ** $version.name ($dateFormat.format($version.getReleaseDate())) + ** $version.name ($dateFormat.format($version.releaseDate) - $nextMonths.get($dateFormat.format($version.releaseDate))) <br /> #set ($issues = $prjVerIss.get($project).get($version)) #if ($issues.size() > 0) Modified: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm =================================================================== --- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report.vm 2005-08-27 21:53:06 UTC (rev 998) @@ -2,7 +2,7 @@ <table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr class=rowHeader><td valign=top bgcolor=f0f0f0> <h3 class="formtitle">Unreleased project versions report - (covering $dateFormat.format($beginDate) - $dateFormat.format($endDate))</h3> + (covering $covering)</h3> </td></tr></table> </td></tr></table> @@ -24,12 +24,12 @@ <table cellpadding=3 cellspacing=0 border=0 width=100% bgcolor="fffff0"> #foreach ($version in $prjVerIss.get($project).keySet()) <tr> - <td class="colHeaderLink" colspan=4> + <td class="colHeaderLink" colspan=7> #versionStatus($version 24) <font size=3><a href="$!appProps.getString("jira.baseurl")/secure/IssueNavigator.jspa?reset=true&pid=$project.getLong("id")&fixfor=$version.id" title="$action.getText("browseproject.getmoreinfo")"> <b><u>$version.name</u></b></a></font> (#if ($version.releaseDate) - #versionReleaseDate($action $version) + $dateFormat.format($version.releaseDate) - $nextMonths.get($dateFormat.format($version.releaseDate)) #end) </td> </tr> Modified: trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java =================================================================== --- trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 20:07:47 UTC (rev 997) +++ trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 21:53:06 UTC (rev 998) @@ -36,6 +36,7 @@ import java.sql.Timestamp; import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import org.ofbiz.core.entity.GenericValue; @@ -75,7 +76,7 @@ this.pluginManager = pluginManager; this.issueManager = issueManager; this.subTaskManager = subTaskManager; - this.issueSecurityLevelManager = issueSecurityLevelManager; + this.issueSecurityLevelManager = issueSecurityLevelManager; } /** @@ -192,8 +193,12 @@ /* Geting the dates */ I18nHelper i18nBean = new I18nBean(remoteUser); Date beginDate; - if (("yes".equals((String) params.get("datenow")))) - beginDate = Calendar.getInstance().getTime(); + + // Empty begin-date --> make the report from the current date. + String datebegin = (String) params.get("datebegin"); + if ((datebegin == null) || ("".equals(datebegin.trim()))) + beginDate = new Date( + (Calendar.getInstance().getTimeInMillis() / 86400000) * 86400000 - 1); else beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale()); Date endDate = getEndDate((String)params.get("period"), beginDate); @@ -240,8 +245,42 @@ prjVerIss.put(project, verIss); } - DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG); + DateFormat dateFormat = new SimpleDateFormat("MMMM yyyy"); + + String beginDateMonth = dateFormat.format(beginDate); + String endDateMonth = dateFormat.format(endDate); + String covering; + if (beginDateMonth.equals(endDateMonth)) + covering = beginDateMonth; + else + covering = beginDateMonth + " - " + endDateMonth; + + Map nextMonths = new HashMap(); + Date current = new Date(beginDate.getTime()); + Calendar cal = Calendar.getInstance(); + + for (int i=0; i<12; i++) { + String currMonth = dateFormat.format(current); + + // Pushing the current date one month forward. + cal.setTime(current); + + int month = cal.get(Calendar.MONTH); + int year = cal.get(Calendar.YEAR); + month += 1; + if (month > 11) { + month = 0; + year += 1; + } + cal.set(Calendar.MONTH, month); + cal.set(Calendar.YEAR, year); + + current = cal.getTime(); + + nextMonths.put(currMonth, dateFormat.format(current)); + } + velocityParams.put("prjVerIss", prjVerIss); velocityParams.put("action", action); velocityParams.put("browser", new Browser(projectManager, constantsManager, searchProvider, @@ -251,6 +290,8 @@ velocityParams.put("dateFormat", dateFormat); velocityParams.put("constantsManager", constantsManager); velocityParams.put("appProps", appProps); + velocityParams.put("nextMonths", nextMonths); + velocityParams.put("covering", covering); velocityParams.put("textUtils", new TextUtils()); /* Generating reeport source in the format demanded by the user */ @@ -336,19 +377,20 @@ if (!validateMultivalue(action, params, "priorities")) return; if (!validateSinglevalue(action, params, "period")) return; if (!validateSinglevalue(action, params, "style")) return; - if (!validateSinglevalue(action, params, "datenow")) return; - String dateNow = (String) params.get("datenow"); - if (!("yes".equals(dateNow))) { - Date beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale()); - OutlookDate outlookDate = outlookDateManager.getOutlookDate(i18nBean.getLocale()); - if (beginDate == null || outlookDate.isDatePickerDate(outlookDate.formatDMY(beginDate))) - { - action.addError("datebegin", action.getText("report.roadmap.datebegin.error")); - return; - } + // Allowing an empty date-begin. + String datebegin = (String) params.get("datebegin"); + if ((datebegin == null) || ("".equals(datebegin.trim()))) + return; + + Date beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale()); + OutlookDate outlookDate = outlookDateManager.getOutlookDate(i18nBean.getLocale()); + if (beginDate == null || outlookDate.isDatePickerDate(outlookDate.formatDMY(beginDate))) + { + action.addError("datebegin", action.getText("report.roadmap.datebegin.error")); + return; } } - + public void init(ReportModuleDescriptor arg0) { } } \ No newline at end of file |
Author: adamw Date: 2005-08-27 16:07:47 -0400 (Sat, 27 Aug 2005) New Revision: 997 Modified: trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java Log: Some fixes Modified: trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml =================================================================== --- trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 20:07:47 UTC (rev 997) @@ -69,6 +69,10 @@ <description>report.changelog.style.description</description> <type>select</type> <values> + <value> + <key>none</key> + <value>None</value> + </value> <value> <key>html</key> <value>HTML</value> Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm =================================================================== --- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 20:07:47 UTC (rev 997) @@ -30,7 +30,7 @@ <td width="15%"> <b>$constantsManager.getStatus($issue.getString('status')).getString("name")</b> </td><br /> <td> - $issue.getString('summary') </td><br /> + $textUtils.htmlEncode($issue.getString('summary')) </td><br /> <td width="15%" align="right"> ($constantsManager.getPriority($issue.getString('priority')).getString("name")) </td><br /> </tr> <br /> Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm =================================================================== --- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 20:07:47 UTC (rev 997) @@ -18,7 +18,7 @@ #if ($issues.size() > 0) #foreach ($issue in $issues) * - [ $issue.getString('key') ] $issue.getString('summary') + [ $issue.getString('key') ] $textUtils.htmlEncode($issue.getString('summary')) ($constantsManager.getStatus($issue.getString('status')).getString("name"), $constantsManager.getPriority($issue.getString('priority')).getString("name")) <br /> Modified: trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java =================================================================== --- trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 20:07:47 UTC (rev 997) @@ -29,6 +29,7 @@ import com.atlassian.jira.web.util.OutlookDate; import com.atlassian.jira.web.util.OutlookDateManager; import com.opensymphony.user.User; +import com.opensymphony.util.TextUtils; import java.sql.Timestamp; import java.text.DateFormat; @@ -277,9 +278,14 @@ velocityParams.put("dateFormat", dateFormat); velocityParams.put("constantsManager", constantsManager); velocityParams.put("appProps", appProps); + velocityParams.put("textUtils", new TextUtils()); /* Generating reeport source in the format demanded by the user */ - velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); + String style = (String)params.get("style"); + if ("none".equals(style)) + velocityParams.put("generated", ""); + else + velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); return descriptor.getHtml("view", velocityParams); } Modified: trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp =================================================================== --- trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 20:07:47 UTC (rev 997) @@ -90,7 +90,8 @@ List allIssueTypes = constantsManager.getAllIssueTypes(); for (iter = allIssueTypes.iterator(); iter.hasNext();) { GenericValue issueType = (GenericValue)iter.next(); - issuesNamesMap.put(issueType.getString("id"), issueType.getString("name")); + if (!("Sub-task".equals(issueType.getString("name")))) + issuesNamesMap.put(issueType.getString("id"), issueType.getString("name")); } /* Preparing issueMap */ @@ -107,7 +108,8 @@ /* Filling sets in issueMap */ for (iter = issues.iterator(); iter.hasNext();) { Issue issue = (Issue) iter.next(); - ((Set)issuesMap.get(issue.getIssueType().getString("id"))).add(issue); + Set toAdd = (Set)issuesMap.get(issue.getIssueType().getString("id")); + if (toAdd != null) toAdd.add(issue); } for (iter = issuesMap.keySet().iterator(); iter.hasNext();) { Modified: trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java =================================================================== --- trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 20:07:47 UTC (rev 997) @@ -191,12 +191,24 @@ Iterator iter; /* Map: issue type id -> (Set of issue) */ - Map issuesMap = new TreeMap(); + Map issuesMap = new TreeMap(new Comparator() { + // Sorting issue types by the "sequence" field. + public int compare(Object arg0, Object arg1) { + String id1 = (String) arg0; + String id2 = (String) arg1; + + GenericValue gv1 = constantsManager.getIssueType(id1); + GenericValue gv2 = constantsManager.getIssueType(id2); + + return gv1.getLong("sequence").compareTo( + gv2.getLong("sequence")); + } + }); /* Map: issue type id -> issue name */ Map issuesNamesMap = new HashMap(); CustomField affects = customFieldManager.getCustomFieldObjectByName("Affects"); - + Map affectsValues = new HashMap(); Iterator it = issues.iterator(); @@ -205,23 +217,26 @@ if (affects != null) while (it.hasNext()) { Object key = it.next(); - String issueId = ((GenericValue)key).getString("id"); + String issueKey = ((GenericValue)key).getString("key"); String str = String.valueOf(affects.getValue( - issueManager.getIssueObject(issueId))); + issueManager.getIssueObject(issueKey))); if (!(str.equals("null"))) affectsValues.put(key, str.substring(1,str.length() - 1)); } /* Preparing issueMap */ - for (iter = sections.iterator(); iter.hasNext();) - issuesMap.put(iter.next(), new TreeSet()); + for (iter = sections.iterator(); iter.hasNext();) { + String typeId = (String) iter.next(); + issuesMap.put(typeId, new TreeSet()); + } + + /* Filling sets in issueMap */ + for (iter = issues.iterator(); iter.hasNext();) { + GenericValue issue = (GenericValue) iter.next(); + Set toAdd = (Set)issuesMap.get(issue.getString("type")); + if (toAdd != null) toAdd.add(issue); + } - /* Filling sets in issueMap */ - for (iter = issues.iterator(); iter.hasNext();) { - GenericValue issue = (GenericValue) iter.next(); - ((Set)issuesMap.get(issue.getString("type"))).add(issue); - } - /* Setting the issues' names */ for (iter = sections.iterator(); iter.hasNext();) { String issueId = (String)iter.next(); Modified: trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java =================================================================== --- trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 20:07:47 UTC (rev 997) @@ -207,13 +207,16 @@ Map issuesNamesMap = new HashMap(); /* Preparing issueMap */ - for (iter = sections.iterator(); iter.hasNext();) - issuesMap.put(iter.next(), new TreeSet()); + for (iter = sections.iterator(); iter.hasNext();) { + String typeId = (String) iter.next(); + issuesMap.put(typeId, new TreeSet()); + } /* Filling sets in issueMap */ for (iter = issues.iterator(); iter.hasNext();) { GenericValue issue = (GenericValue) iter.next(); - ((Set)issuesMap.get(issue.getString("type"))).add(issue); + Set toAdd = (Set)issuesMap.get(issue.getString("type")); + if (toAdd != null) toAdd.add(issue); } /* Setting the issues' names */ Modified: trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml =================================================================== --- trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 20:07:47 UTC (rev 997) @@ -86,6 +86,10 @@ <type>select</type> <values> <value> + <key>none</key> + <value>None</value> + </value> + <value> <key>html</key> <value>HTML</value> </value> Modified: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm =================================================================== --- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 20:07:47 UTC (rev 997) @@ -30,7 +30,7 @@ <td width="15%"> <b>$constantsManager.getStatus($issue.getString('status')).getString("name")</b> </td><br /> <td> - $issue.getString('summary') </td><br /> + $textUtils.htmlEncode($issue.getString('summary')) </td><br /> <td width="15%" align="right"> ($constantsManager.getPriority($issue.getString('priority')).getString("name")) </td><br /> </tr> <br /> Modified: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm =================================================================== --- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 20:07:47 UTC (rev 997) @@ -18,7 +18,7 @@ #if ($issues.size() > 0) #foreach ($issue in $issues) * - [ $issue.getString('key') ] $issue.getString('summary') + [ $issue.getString('key') ] $textUtils.htmlEncode($issue.getString('summary')) ($constantsManager.getStatus($issue.getString('status')).getString("name"), $constantsManager.getPriority($issue.getString('priority')).getString("name")) <br /> Modified: trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java =================================================================== --- trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 18:51:55 UTC (rev 996) +++ trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 20:07:47 UTC (rev 997) @@ -32,6 +32,7 @@ import com.atlassian.jira.web.util.OutlookDateManager; import com.atlassian.plugin.PluginManager; import com.opensymphony.user.User; +import com.opensymphony.util.TextUtils; import java.sql.Timestamp; import java.text.DateFormat; @@ -250,9 +251,14 @@ velocityParams.put("dateFormat", dateFormat); velocityParams.put("constantsManager", constantsManager); velocityParams.put("appProps", appProps); + velocityParams.put("textUtils", new TextUtils()); /* Generating reeport source in the format demanded by the user */ - velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); + String style = (String)params.get("style"); + if ("none".equals(style)) + velocityParams.put("generated", ""); + else + velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams)); return descriptor.getHtml("view", velocityParams); } |
From: <jbo...@li...> - 2005-08-27 18:51:59
|
Author: adamw Date: 2005-08-27 14:51:55 -0400 (Sat, 27 Aug 2005) New Revision: 996 Modified: trunk/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.11.jar Log: Compatibility with java 1.4 Modified: trunk/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.11.jar =================================================================== (Binary files differ) |