Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1024 - in prod/forge: doc/en/modules portal-extensions/forge-common/src/java/org/jboss/forge/common/blog portal-extensions/forge-common/src/java/org/jboss/forge/common/content portal-extensions/forge-portal-attr portal-extensions/forge-service/src/java/org/jboss/forge/service portal-extensions/forge-wiki/src/java/org/jboss/wiki portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins portal-extensions/jboss-as-binaries
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; |
