gatein SVN: r8797 - epp/docs/branches/5.2/Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-07-25 00:43:08 -0400 (Wed, 25 Jul 2012)
New Revision: 8797
Added:
epp/docs/branches/5.2/Installation_Guide/en-US/JON_Installation.xml
Modified:
epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Installation_Guide.ent
epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
Log:
BZ#803567 - Added JON Installation section to the guide, to cover the Admin and Monitoring section now in the Admin Guide
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-07-25 04:24:46 UTC (rev 8796)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-07-25 04:43:08 UTC (rev 8797)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
<edition>5.2.2</edition>
- <pubsnumber>2</pubsnumber>
+ <pubsnumber>3</pubsnumber>
<abstract>
<para>This book provides information about obtaining, installing and running JBoss Enterprise Portal Platform and its add-ons. It forms part of the complete document suite along with the <citetitle>User Guide</citetitle> and <citetitle>Reference Guide</citetitle> available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>.
</para>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-07-25 04:24:46 UTC (rev 8796)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-07-25 04:43:08 UTC (rev 8797)
@@ -37,7 +37,7 @@
You can change this directory location by editing the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/conf/gatein/configuration.properties</filename> file, the name of the property being: <literal>gatein.jcr.storage.data.dir</literal></para>
</warning>
<task id="task-Create_Production_Database">
- <title><remark>BZ#794386</remark>Task: Provision JCR and IDM Production Databases</title>
+ <title>Task: Provision JCR and IDM Production Databases</title>
<tasksummary>
<para>Read and understand the guideline steps in this task to prepare production databases for JBoss Enterprise Portal Platform. </para>
</tasksummary>
@@ -93,7 +93,7 @@
<para>For production instances that use a single portal container, you can configure a single JCR and IDM database. If you run JBoss Enterprise Portal Platform with the default configuration from a clean install, without Site Publisher, you meet this requirement.</para>
<para>For customers installing Site Publisher, or customers that require multiple portal containers in their JBoss Enterprise Portal Platform, follow the tasks in <xref linkend="Multiple_Portal_JRC_IDM"/> to ensure you configure the JNDI requirements for multiple platforms correctly.</para>
<task id="task-Configure_JCR_Database_Datasource">
- <title><remark>BZ#794386</remark>Task: Configure the JCR Database Datasource</title>
+ <title>Task: Configure the JCR Database Datasource</title>
<tasksummary>
<para>Complete this task to configure the JCR datasource descriptor for instances that have one portal container (the default when you install the platform for the first time, without Site Publisher).</para>
</tasksummary>
@@ -196,7 +196,7 @@
<para>If you run Site Publisher with JBoss Enterprise Portal Platform, or need to configure multiple portal containers in your installation of JBoss Enterprise Portal Platform, JNDI requires a separate JCR and IDM datasource definition for <emphasis role="italic">each portal container</emphasis> in <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename>. </para>
<para>This requirement also means a separate JCR and IDM database is required for <emphasis role="italic">each portal container</emphasis>. </para>
<task id="task-Configure_Multiple_JCR_Database_Datasource">
- <title><remark>BZ#794386</remark>Task: Configure Multiple JCR Database Datasources</title>
+ <title>Task: Configure Multiple JCR Database Datasources</title>
<tasksummary>
<para>Complete this task to configure the JCR datasource descriptors for two portal containers.</para>
<note>
@@ -270,7 +270,7 @@
</procedure>
</task>
<task id="task-Configure_Multiple_IDM_Database_Datasource">
- <title><remark>BZ#794386</remark>Task: Configure Multiple IDM Database Datasource</title>
+ <title>Task: Configure Multiple IDM Database Datasource</title>
<tasksummary>
<para>Complete this task to configure multiple IDM datasource descriptors. </para>
<note>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Installation_Guide.ent
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Installation_Guide.ent 2012-07-25 04:24:46 UTC (rev 8796)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Installation_Guide.ent 2012-07-25 04:43:08 UTC (rev 8797)
@@ -16,4 +16,4 @@
<!-- Version Specifcs: -->
<!ENTITY VX "5">
<!ENTITY VY "5.2">
-<!ENTITY VZ "5.2.0">
\ No newline at end of file
+<!ENTITY VZ "5.2.2">
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml 2012-07-25 04:24:46 UTC (rev 8796)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml 2012-07-25 04:43:08 UTC (rev 8797)
@@ -25,7 +25,8 @@
</para>
</listitem>
<listitem>
- <para>You have a valid JBoss Enterprise Portal Platform subscription.</para>
+ <remark>BZ#803567 - added this in for the benefit of the JON Plugin section.</remark>
+ <para>You have an entitlement to <literal>EPP with Management</literal> in the Customer Portal. If you do not have this entitlement, you will not be able to benefit from JBoss Operations Network management of the portal.</para>
</listitem>
</itemizedlist>
</taskprerequisites>
@@ -83,6 +84,24 @@
</step>
</substeps>
</step>
+ <step>
+ <title>Optional: Download the JBoss Operations Network plug-in</title>
+ <para>If you intend to use the JBoss Operations Network EPP plug-in to manage the production server, select <literal>JBoss ON for EPP</literal>
+ from either the Software Downloads drop-down box, or the menu on the left.</para>
+ <substeps>
+ <step>
+ <para>Click the
+ <filename>JBoss Operations Network <replaceable>VERSION</replaceable> Base Distribution</filename>
+ download link.</para>
+ </step>
+ <step>
+ <para>Click the <guibutton>Download</guibutton> link to start the Base Distribution download.</para>
+ </step>
+ <step>
+ <para>Repeat the steps to download the <filename>EPP Plugin Pack for JBoss ON <replaceable>VERSION</replaceable></filename></para>
+ </step>
+ </substeps>
+ </step>
</procedure>
</task>
<para>Now you have downloaded the required Zip archives, you can install the platform.</para>
@@ -117,6 +136,10 @@
<para>If you need to install Site Publisher, complete the tasks in to <xref linkend="Site_Publisher_Installation"/>.</para>
</step>
<step>
+ <title>Optional: JBoss ON </title>
+ <para>If you need to install JBoss ON for EPP, complete the tasks in <xref linkend="JBoss_ON_Installation"/> to download the additional files. Configuring JBoss ON is done after other key configuration has been implemented.</para>
+ </step>
+ <step>
<title>Perform post-installation configuration</title>
<para>Refer to <xref linkend="Post_Installation_Configuration"/> for post-installation configuration instructions.</para>
</step>
Added: epp/docs/branches/5.2/Installation_Guide/en-US/JON_Installation.xml
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/5.2/Installation_Guide/en-US/JON_Installation.xml
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml 2012-07-25 04:24:46 UTC (rev 8796)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml 2012-07-25 04:43:08 UTC (rev 8797)
@@ -2,8 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
]>
<chapter id="Install_Native_Components">
- <title><remark>BZ#798839 </remark>Install Native Components</title>
- <remark>BZ#798839 - 20120307 - Converted this chapter from the EAP Installation Guide.</remark>
+ <title>Install Native Components</title>
<para/>
<para>The Native Components package is an optional JBoss Enterprise Application Platform package that incorporates
native operating system components and connectors for web servers including:</para>
@@ -33,7 +32,6 @@
<para>Installing JBoss Native can result in higher server performance, as native operating system
code becomes available for the server to optimize tasks.
<xref linkend="exam-Native_Web_vs_Java_IO"/> describes a scenario where Native Components perform better over standard components.</para>
- <remark>BZ#798839 - 20120307 - Added this example based on peformance info from Andrig Miller, as recorded in the bug.</remark>
<example id="exam-Native_Web_vs_Java_IO">
<title>Native Web Connector vs Java I/O</title>
<para>If your implementation has many thousands of users, all with active sessions, but only 20% of all active users are making concurrent requests, the native web connector is the correct choice. </para>
@@ -87,7 +85,6 @@
</para>
</listitem>
<listitem>
- <remark>BZ#798839 - 20120307 - Added this as part of the manifest, as it wasn't declared in the EAP version (NSAPI is now covered in the HTTP Connectors Guide for EAP).</remark>
<para><literal>NSAPI</literal> is a connector for the Netscape web server.</para>
</listitem>
<listitem>
@@ -126,7 +123,6 @@
</section>
<section id="Native_Components_Download">
<title>Download</title>
- <remark>BZ#798839 - 20120307 - Adapted the EAP instructions to cater for the fact no native binaries are currently included in EPP.</remark>
<para>Read this section to learn how to download the required native libraries for JBoss Enterprise Portal Platform.</para>
<task id="task-Download_Native_Files">
<title>Task: Download Native Files</title>
@@ -190,7 +186,6 @@
</section>
<section id="Native_Components_Install">
<title>Install</title>
- <remark>BZ#798839 - 20120307 - Converted this chapter from the EAP Installation Guide to cover EPP installation of EAP native binaries.</remark>
<para>Read this section to learn how to install the native libraries for JBoss Enterprise Portal Platform.</para>
<task>
<title>Install Native Components</title>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml 2012-07-25 04:24:46 UTC (rev 8796)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Post_Installation.xml 2012-07-25 04:43:08 UTC (rev 8797)
@@ -172,9 +172,10 @@
</task>
</section>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="DatabaseConfiguration.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="JON_Installation.xml" encoding="UTF-8"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="EMailServiceConfiguration.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ClusteringConfiguration.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="HTTPSConfiguration.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GadgetProxyConfig.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ValidatorConfiguration.xml" encoding="UTF-8"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ValidatorConfiguration.xml" encoding="UTF-8"/>
</chapter>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-07-25 04:24:46 UTC (rev 8796)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-07-25 04:43:08 UTC (rev 8797)
@@ -9,6 +9,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.2-3</revnumber>
+ <date>Wed Jul 25 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>BZ#803567 - Added JBoss ON installation instructions.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.2-2</revnumber>
<date>Thu Jul 5 2012</date>
<author>
12 years, 5 months
gatein SVN: r8796 - in epp/docs/branches/5.2/Admin_Guide: en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-07-25 00:24:46 -0400 (Wed, 25 Jul 2012)
New Revision: 8796
Modified:
epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml
epp/docs/branches/5.2/Admin_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/Admin_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/Admin_Guide/publican.cfg
Log:
BZ#803567 - Added draft and watermark for review purposes
Modified: epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml
===================================================================
--- epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml 2012-07-25 02:17:48 UTC (rev 8795)
+++ epp/docs/branches/5.2/Admin_Guide/en-US/Administration_Guide.xml 2012-07-25 04:24:46 UTC (rev 8796)
@@ -3,7 +3,7 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Administration_Guide.ent">
%BOOK_ENTITIES;
]>
-<book>
+<book status="draft">
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Preface.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter-1-Introduction.xml"/>
Modified: epp/docs/branches/5.2/Admin_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/Admin_Guide/en-US/Book_Info.xml 2012-07-25 02:17:48 UTC (rev 8795)
+++ epp/docs/branches/5.2/Admin_Guide/en-US/Book_Info.xml 2012-07-25 04:24:46 UTC (rev 8796)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
<edition>5.2.2</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>4</pubsnumber>
<abstract>
<para>
This document is a guide to administering an implementation of JBoss Enterprise Portal Platform. It is intended for System Administrators and assumes a high level of technical knowledge.
Modified: epp/docs/branches/5.2/Admin_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/Admin_Guide/en-US/Revision_History.xml 2012-07-25 02:17:48 UTC (rev 8795)
+++ epp/docs/branches/5.2/Admin_Guide/en-US/Revision_History.xml 2012-07-25 04:24:46 UTC (rev 8796)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.2-4</revnumber>
+ <date>Wed Jul 25 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>BZ#803567 - Incorporated JON plug-in documentation from Confluence. Added draft watermark to document to reveal BZ comments.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.2-3</revnumber>
<date>Tue Jun 19 2012</date>
<author>
Modified: epp/docs/branches/5.2/Admin_Guide/publican.cfg
===================================================================
--- epp/docs/branches/5.2/Admin_Guide/publican.cfg 2012-07-25 02:17:48 UTC (rev 8795)
+++ epp/docs/branches/5.2/Admin_Guide/publican.cfg 2012-07-25 04:24:46 UTC (rev 8796)
@@ -4,5 +4,5 @@
debug: 1
type: Book
git_branch: docs-rhel-6
-#show_remarks: 1
+show_remarks: 1
12 years, 5 months
gatein SVN: r8795 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-07-24 22:17:48 -0400 (Tue, 24 Jul 2012)
New Revision: 8795
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml
Log:
CVE-2011-4605
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2012-07-24 13:45:30 UTC (rev 8794)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2012-07-25 02:17:48 UTC (rev 8795)
@@ -181,6 +181,7 @@
<copy overwrite="true" file="${basedir}/src/main/resources/eap/CVE-2011-4605/jboss-ha-legacy-client.jar" tofile="${epp.path}/jboss-as/client/jboss-ha-legacy-client.jar"/>
<copy overwrite="true" file="${basedir}/src/main/resources/eap/CVE-2011-4605/jbossha.jar" tofile="${epp.path}/jboss-as/common/lib/jbossha.jar"/>
<copy overwrite="true" file="${basedir}/src/main/resources/eap/CVE-2011-4605/jnpserver.jar" tofile="${epp.path}/jboss-as/common/lib/jnpserver.jar"/>
+ <copy overwrite="true" file="${basedir}/src/main/resources/eap/CVE-2011-4605/jnpserver.jar" tofile="${epp.path}/jboss-as/server/minimal/lib/jnpserver.jar"/>
</target>
</project>
\ No newline at end of file
12 years, 5 months
gatein SVN: r8794 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-07-24 09:45:30 -0400 (Tue, 24 Jul 2012)
New Revision: 8794
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
Bug 842678 - Update WSRP to 2.1.7-EPP522-GA
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-07-24 13:44:13 UTC (rev 8793)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-07-24 13:45:30 UTC (rev 8794)
@@ -53,7 +53,7 @@
<org.gatein.wci.version>2.1.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.1-GA</org.gatein.pc.version>
<org.picketlink.idm>1.3.2.CR01</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.6-EPP522-GA</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.1.7-EPP522-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.2-GA</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.1-GA</org.gatein.mgmt.version>
<org.slf4j.version>1.5.8</org.slf4j.version>
12 years, 5 months
gatein SVN: r8793 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-07-24 09:44:13 -0400 (Tue, 24 Jul 2012)
New Revision: 8793
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
Bug 842735 - JCR Update to 1.14.8-CR02
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-07-19 04:00:16 UTC (rev 8792)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-07-24 13:44:13 UTC (rev 8793)
@@ -42,7 +42,7 @@
<org.exoplatform.kernel.junit.version>1.2.1-GA</org.exoplatform.kernel.junit.version> <!-- from exo.kernel -->
<org.exoplatform.core.version>2.4.8-CR01</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.2.8-CR01</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.14.8-CR01</org.exoplatform.jcr.version>
+ <org.exoplatform.jcr.version>1.14.8-CR02</org.exoplatform.jcr.version>
<org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>2.0.2-CP01</org.shindig.version>
12 years, 5 months
gatein SVN: r8791 - in epp/docs/branches/5.2/API_Documentation: en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-07-18 23:50:07 -0400 (Wed, 18 Jul 2012)
New Revision: 8791
Removed:
epp/docs/branches/5.2/API_Documentation/Makefile
epp/docs/branches/5.2/API_Documentation/spec.in
Modified:
epp/docs/branches/5.2/API_Documentation/en-US/API_Documentation.xml
epp/docs/branches/5.2/API_Documentation/en-US/Article_Info.xml
epp/docs/branches/5.2/API_Documentation/en-US/Revision_History.xml
epp/docs/branches/5.2/API_Documentation/publican.cfg
Log:
Latest version staged, and added to BZ#832856 for GSS to take a look at.
Deleted: epp/docs/branches/5.2/API_Documentation/Makefile
===================================================================
--- epp/docs/branches/5.2/API_Documentation/Makefile 2012-07-19 01:34:58 UTC (rev 8790)
+++ epp/docs/branches/5.2/API_Documentation/Makefile 2012-07-19 03:50:07 UTC (rev 8791)
@@ -1,52 +0,0 @@
-### START CHANGES ###
-PRODUCT = JBoss_Enterprise_Portal_Platform
-PROD_VERSION = 5.2
-LANG = en-US
-BOOKS = API_Documentation
-VERSION = 5.2.2
-RELEASE = 10
-
-#### END CHANGES ###
-
-NAME = $(PRODUCT)-$(PROD_VERSION)-web-$(LANG)
-TAR_NAME = $(NAME)-$(VERSION)
-DIST = .el6eng
-
-PWD = $(shell pwd)
-RPMDIR = $(PWD)/tmp/rpm
-
-#### TARGETS ###
-tar::
- @echo "Start $@"
- @tar --exclude '.svn' -czf $(TAR_NAME).tgz $(BOOKS)
- @echo "End $@"
-
-spec::
- @echo "Start $@"
- @mkdir -p $(RPMDIR)
- @cd $(RPMDIR) && mkdir -p SPECS SRPMS BUILD SOURCES RPMS/noarch
- @cp spec.in $(RPMDIR)/SPECS/$(NAME).spec
- @sed -i -e 's/@PRODUCT@/$(PRODUCT)/' $(RPMDIR)/SPECS/$(NAME).spec
- @sed -i -e 's/@PROD_VERSION@/$(PROD_VERSION)/' $(RPMDIR)/SPECS/$(NAME).spec
- @sed -i -e 's/@VERSION@/$(VERSION)/' $(RPMDIR)/SPECS/$(NAME).spec
- @sed -i -e 's/@RELEASE@/$(RELEASE)/' $(RPMDIR)/SPECS/$(NAME).spec
- @sed -i -e 's/@LANG@/$(LANG)/' $(RPMDIR)/SPECS/$(NAME).spec
- @sed -i -e 's/@BOOKS@/$(BOOKS)/' $(RPMDIR)/SPECS/$(NAME).spec
- @echo "End $@"
-
-srpm:: clean tar spec
- @echo "Start $@"
- @cp $(TAR_NAME).tgz $(RPMDIR)/SOURCES/.
- @rpmbuild --define "dist $(DIST)" --define "_topdir $(RPMDIR)" -bs $(RPMDIR)/SPECS/$(NAME).spec
- @echo "End $@"
-
-rpm:: srpm
- @echo "Start $@"
- @rpmbuild --define "dist $(DIST)" --define "_topdir $(RPMDIR)" -bb $(RPMDIR)/SPECS/$(NAME).spec
- @echo "End $@"
-
-clean::
- @echo "Start $@"
- @rm -rf tmp $(TAR_NAME).tgz
- @echo "End $@"
-
Modified: epp/docs/branches/5.2/API_Documentation/en-US/API_Documentation.xml
===================================================================
(Binary files differ)
Modified: epp/docs/branches/5.2/API_Documentation/en-US/Article_Info.xml
===================================================================
(Binary files differ)
Modified: epp/docs/branches/5.2/API_Documentation/en-US/Revision_History.xml
===================================================================
(Binary files differ)
Modified: epp/docs/branches/5.2/API_Documentation/publican.cfg
===================================================================
--- epp/docs/branches/5.2/API_Documentation/publican.cfg 2012-07-19 01:34:58 UTC (rev 8790)
+++ epp/docs/branches/5.2/API_Documentation/publican.cfg 2012-07-19 03:50:07 UTC (rev 8791)
@@ -2,5 +2,6 @@
type: Article
brand: JBoss
git_branch: docs-rhel-6
-web_formats: "html"
+web_formats: "html,html-single"
+chunk_section_depth: 0
Deleted: epp/docs/branches/5.2/API_Documentation/spec.in
===================================================================
--- epp/docs/branches/5.2/API_Documentation/spec.in 2012-07-19 01:34:58 UTC (rev 8790)
+++ epp/docs/branches/5.2/API_Documentation/spec.in 2012-07-19 03:50:07 UTC (rev 8791)
@@ -1,55 +0,0 @@
-#Documentation Specfile
-%define doc_product @PRODUCT@
-%define doc_version @PROD_VERSION@
-%define doc_lang @LANG@
-%define doc_books @BOOKS@
-
-Name: %{doc_product}-%{doc_version}-web-%{doc_lang}
-Version: @VERSION@
-Release: @RELEASE@%{?dist}
-Summary: API docs for %{doc_product} %{doc_version}
-Group: Documentation
-License: GFDL
-URL: http://docs.redhat.com
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{version}.tgz
-
-
-Requires: publican >= 2.5
-Prefix: /var/www/html/docs
-
-%description
-This package is a wrapper script for all the %{doc_product} %{doc_version}
-documentation not ported to Publican.
-
-%prep
-%setup -q -c %{doc_product}-%{doc_version}-web-%{doc_lang}
-
-%build
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/%{doc_lang}/%{doc_product}/%{doc_version}/html/
-cp -rf * $RPM_BUILD_ROOT/%{prefix}/%{doc_lang}/%{doc_product}/%{doc_version}/html/.
-
-
-%preun
-if [ "$1" = "0" ] ; then # last uninstall
-%{__perl} -e 'if (eval {require Publican::WebSite}) { my @books = split(/ /, "%{doc_books}"); my $ws = Publican::WebSite->new(); foreach my $book (@books) { $ws->del_entry({ language => "%{doc_lang}", product => "%{doc_product}", version => "%{doc_version}", name => "$book", format => "html" }); } $ws->regen_all_toc();}';
-fi
-
-%post
-%{__perl} -e 'use Publican::WebSite; my @books = split(/ /, "%{doc_books}"); my $ws = Publican::WebSite->new(); foreach my $book (@books) { $ws->update_or_add_entry( { language => "%{doc_lang}", product => "%{doc_product}", version => "%{doc_version}", name => "$book", format => "html", abstract => "" }); } $ws->regen_all_toc();'
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{prefix}/en-US
-
-%changelog
-* Wed Jul 18 2012 Jared Morgan jmorgan(a)redhat.com 5.2.2-10
-- Draft content with API Docs embedded.
-
12 years, 5 months
gatein SVN: r8789 - epp/docs/branches/5.2/API_Documentation.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-07-18 21:27:34 -0400 (Wed, 18 Jul 2012)
New Revision: 8789
Removed:
epp/docs/branches/5.2/API_Documentation/API_Documentation/
Modified:
epp/docs/branches/5.2/API_Documentation/Makefile
Log:
Removing the API_Docs folder because it is not required with the new publican method
Modified: epp/docs/branches/5.2/API_Documentation/Makefile
===================================================================
--- epp/docs/branches/5.2/API_Documentation/Makefile 2012-07-18 23:48:19 UTC (rev 8788)
+++ epp/docs/branches/5.2/API_Documentation/Makefile 2012-07-19 01:27:34 UTC (rev 8789)
@@ -10,7 +10,7 @@
NAME = $(PRODUCT)-$(PROD_VERSION)-web-$(LANG)
TAR_NAME = $(NAME)-$(VERSION)
-DIST = .el5
+DIST = .el6eng
PWD = $(shell pwd)
RPMDIR = $(PWD)/tmp/rpm
12 years, 5 months
gatein SVN: r8787 - in epp/docs/branches/5.2: API_Documentation and 1 other directories.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-07-18 02:35:48 -0400 (Wed, 18 Jul 2012)
New Revision: 8787
Modified:
epp/docs/branches/5.2/API_Documentation/en-US/Article_Info.xml
epp/docs/branches/5.2/API_Documentation/en-US/Revision_History.xml
epp/docs/branches/5.2/API_Documentation/publican.cfg
epp/docs/branches/5.2/Makefile
epp/docs/branches/5.2/What_Are_Makefile_Specin_Files_For
epp/docs/branches/5.2/spec.in
Log:
Adding all files relating to the API Documentation guide to the repo
Modified: epp/docs/branches/5.2/API_Documentation/en-US/Article_Info.xml
===================================================================
(Binary files differ)
Modified: epp/docs/branches/5.2/API_Documentation/en-US/Revision_History.xml
===================================================================
(Binary files differ)
Modified: epp/docs/branches/5.2/API_Documentation/publican.cfg
===================================================================
--- epp/docs/branches/5.2/API_Documentation/publican.cfg 2012-07-18 01:25:55 UTC (rev 8786)
+++ epp/docs/branches/5.2/API_Documentation/publican.cfg 2012-07-18 06:35:48 UTC (rev 8787)
@@ -2,11 +2,5 @@
type: Article
brand: JBoss
git_branch: docs-rhel-6
+web_formats: "html"
-# The condition tags below correspond to the links to the API documentation in the XML.
-# * "DocsStage" points to the links in the documentation-stage.bne.redhat.com domain.
-# * "Public" will point to links in the docs.redhat.com domain.
-
-condition: DocsStage
-#condition: Public
-
Modified: epp/docs/branches/5.2/Makefile
===================================================================
--- epp/docs/branches/5.2/Makefile 2012-07-18 01:25:55 UTC (rev 8786)
+++ epp/docs/branches/5.2/Makefile 2012-07-18 06:35:48 UTC (rev 8787)
@@ -1,10 +1,10 @@
### START CHANGES ###
-PRODUCT = JBoss_Enterprise_Portal_Platform
+PRODUCT = JBoss_Enterprise_Portal_Platform-API_Documentation
PROD_VERSION = 5.2
LANG = en-US
BOOKS = API_Documentation
VERSION = 5.2.2
-RELEASE = 3
+RELEASE = 6
#### END CHANGES ###
Modified: epp/docs/branches/5.2/What_Are_Makefile_Specin_Files_For
===================================================================
--- epp/docs/branches/5.2/What_Are_Makefile_Specin_Files_For 2012-07-18 01:25:55 UTC (rev 8786)
+++ epp/docs/branches/5.2/What_Are_Makefile_Specin_Files_For 2012-07-18 06:35:48 UTC (rev 8787)
@@ -1,3 +1,3 @@
-These files enable the API Documentation Guide to be produced.
+These files enable the API Documentation Guide to be produced. Don't delete them!!!
-Details about how to do this can be found in PROCEDURE NAME AND LINK TO DOCSPACE
+Details about how to produce this document can be found in https://docspace.corp.redhat.com/docs/DOC-109558
Modified: epp/docs/branches/5.2/spec.in
===================================================================
--- epp/docs/branches/5.2/spec.in 2012-07-18 01:25:55 UTC (rev 8786)
+++ epp/docs/branches/5.2/spec.in 2012-07-18 06:35:48 UTC (rev 8787)
@@ -20,7 +20,7 @@
Prefix: /var/www/html/docs
%description
-This package contains API documentation for %{doc_product} %{doc_version}, and is manually assembled so API Javadocs are embedded in the package.
+This package contains API documentation for %{doc_product} %{doc_version}.
%prep
%setup -q -c %{doc_product}-%{doc_version}-web-%{doc_lang}
@@ -49,6 +49,6 @@
%{prefix}/en-US
%changelog
-* Wed Jul 18 2012 Jared Morgan jmorgan(a)redhat.com 5.2.2-2
+* Wed Jul 18 2012 Jared Morgan jmorgan(a)redhat.com 5.2.2-7
- Draft content with API Docs embedded.
12 years, 5 months
gatein SVN: r8786 - in epp/docs/branches/5.2: API_Documentation/en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-07-17 21:25:55 -0400 (Tue, 17 Jul 2012)
New Revision: 8786
Added:
epp/docs/branches/5.2/Makefile
epp/docs/branches/5.2/What_Are_Makefile_Specin_Files_For
epp/docs/branches/5.2/spec.in
Modified:
epp/docs/branches/5.2/API_Documentation/en-US/API_Documentation.xml
epp/docs/branches/5.2/API_Documentation/en-US/Article_Info.xml
epp/docs/branches/5.2/API_Documentation/en-US/Revision_History.xml
Log:
Adding Makefile and spec.in files for the API Documentation guide so it can be built hand-roll style
Modified: epp/docs/branches/5.2/API_Documentation/en-US/API_Documentation.xml
===================================================================
(Binary files differ)
Modified: epp/docs/branches/5.2/API_Documentation/en-US/Article_Info.xml
===================================================================
(Binary files differ)
Modified: epp/docs/branches/5.2/API_Documentation/en-US/Revision_History.xml
===================================================================
(Binary files differ)
Added: epp/docs/branches/5.2/Makefile
===================================================================
--- epp/docs/branches/5.2/Makefile (rev 0)
+++ epp/docs/branches/5.2/Makefile 2012-07-18 01:25:55 UTC (rev 8786)
@@ -0,0 +1,51 @@
+### START CHANGES ###
+PRODUCT = JBoss_Enterprise_Portal_Platform
+PROD_VERSION = 5.2
+LANG = en-US
+BOOKS = API_Documentation
+VERSION = 5.2.2
+RELEASE = 3
+
+#### END CHANGES ###
+
+NAME = $(PRODUCT)-$(PROD_VERSION)-web-$(LANG)
+TAR_NAME = $(NAME)-$(VERSION)
+DIST = .el6eng
+
+PWD = $(shell pwd)
+RPMDIR = $(PWD)/tmp/rpm
+
+#### TARGETS ###
+tar::
+ @echo "Start $@"
+ @tar --exclude '.svn' -czf $(TAR_NAME).tgz $(BOOKS)
+ @echo "End $@"
+
+spec::
+ @echo "Start $@"
+ @mkdir -p $(RPMDIR)
+ @cd $(RPMDIR) && mkdir -p SPECS SRPMS BUILD SOURCES RPMS/noarch
+ @cp spec.in $(RPMDIR)/SPECS/$(NAME).spec
+ @sed -i -e 's/@PRODUCT@/$(PRODUCT)/' $(RPMDIR)/SPECS/$(NAME).spec
+ @sed -i -e 's/@PROD_VERSION@/$(PROD_VERSION)/' $(RPMDIR)/SPECS/$(NAME).spec
+ @sed -i -e 's/@VERSION@/$(VERSION)/' $(RPMDIR)/SPECS/$(NAME).spec
+ @sed -i -e 's/@RELEASE@/$(RELEASE)/' $(RPMDIR)/SPECS/$(NAME).spec
+ @sed -i -e 's/@LANG@/$(LANG)/' $(RPMDIR)/SPECS/$(NAME).spec
+ @sed -i -e 's/@BOOKS@/$(BOOKS)/' $(RPMDIR)/SPECS/$(NAME).spec
+ @echo "End $@"
+
+srpm:: clean tar spec
+ @echo "Start $@"
+ @cp $(TAR_NAME).tgz $(RPMDIR)/SOURCES/.
+ @rpmbuild --define "dist $(DIST)" --define "_topdir $(RPMDIR)" -bs $(RPMDIR)/SPECS/$(NAME).spec
+ @echo "End $@"
+
+rpm:: srpm
+ @echo "Start $@"
+ @rpmbuild --define "dist $(DIST)" --define "_topdir $(RPMDIR)" -bb $(RPMDIR)/SPECS/$(NAME).spec
+ @echo "End $@"
+
+clean::
+ @echo "Start $@"
+ @rm -rf tmp $(TAR_NAME).tgz
+ @echo "End $@"
Added: epp/docs/branches/5.2/What_Are_Makefile_Specin_Files_For
===================================================================
--- epp/docs/branches/5.2/What_Are_Makefile_Specin_Files_For (rev 0)
+++ epp/docs/branches/5.2/What_Are_Makefile_Specin_Files_For 2012-07-18 01:25:55 UTC (rev 8786)
@@ -0,0 +1,3 @@
+These files enable the API Documentation Guide to be produced.
+
+Details about how to do this can be found in PROCEDURE NAME AND LINK TO DOCSPACE
Added: epp/docs/branches/5.2/spec.in
===================================================================
--- epp/docs/branches/5.2/spec.in (rev 0)
+++ epp/docs/branches/5.2/spec.in 2012-07-18 01:25:55 UTC (rev 8786)
@@ -0,0 +1,54 @@
+#Documentation Specfile
+%define doc_product @PRODUCT@
+%define doc_version @PROD_VERSION@
+%define doc_lang @LANG@
+%define doc_books @BOOKS@
+
+Name: %{doc_product}-%{doc_version}-web-%{doc_lang}
+Version: @VERSION@
+Release: @RELEASE@%{?dist}
+Summary: API Documentation for %{doc_product} %{doc_version}
+Group: Documentation
+License: GFDL
+URL: http://docs.redhat.com/docs
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: %{name}-%{version}.tgz
+
+
+Requires: publican >= 2.6
+Prefix: /var/www/html/docs
+
+%description
+This package contains API documentation for %{doc_product} %{doc_version}, and is manually assembled so API Javadocs are embedded in the package.
+
+%prep
+%setup -q -c %{doc_product}-%{doc_version}-web-%{doc_lang}
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/%{doc_lang}/%{doc_product}/%{doc_version}/html/
+cp -rf * $RPM_BUILD_ROOT/%{prefix}/%{doc_lang}/%{doc_product}/%{doc_version}/html/.
+
+
+%preun -n %{doc_product}-%{doc_version}-web-%{doc_lang}
+if [ "$1" = "0" ] ; then # last uninstall
+%{__perl} -e 'foreach my $book (@books) { system(q|publican update_db --del --lang="%{doc_lang}" --formats=html --product="%{doc_product}" --version="%{doc_version}" --name="$book"|);}'
+fi
+
+%post -n %{doc_product}-%{doc_version}-web-%{doc_lang}
+%{__perl} -e 'foreach my $book (@books) { system(q|publican update_db --add --lang="%{doc_lang}" --formats="html" --product="%{doc_product}" --version="%{doc_version}" --name="$book" --subtitle="%{doc_product} %{doc_version} documentation" --abstract="Unported %{doc_product} %{doc_version} HTML documentation."|);}'
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{prefix}/en-US
+
+%changelog
+* Wed Jul 18 2012 Jared Morgan jmorgan(a)redhat.com 5.2.2-2
+- Draft content with API Docs embedded.
+
12 years, 5 months