This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-site.git
commit 2c06918c6c5bdfd9940052a579eaccf564268d8e Author: Thomas Vandahl <[email protected]> AuthorDate: Fri Jul 24 14:29:52 2015 +0000 Include fulcrum-security in main navigation git-svn-id: https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/site@1692524 13f79535-47bb-0310-9956-ffa450edef68 --- src/changes/changes.xml | 3 ++ src/site/site.xml | 31 ++++------------ xdocs/building.xml | 34 ++---------------- xdocs/index.xml | 2 +- xdocs/navigation.xml | 94 ------------------------------------------------- 5 files changed, 14 insertions(+), 150 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index db4b55b..9e50f3e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -26,6 +26,9 @@ <body> <release version="2.0.0" date="SVN"> + <action dev="tv" type="update"> + Moved security site to proper + </action> <action dev="gk" type="update"> Changed to SCM-publish-plugin for site deployment (as provided by turbine parent v3) </action> diff --git a/src/site/site.xml b/src/site/site.xml index 13c810c..041896d 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -33,9 +33,8 @@ <body> <links> - <item name="Apache" href="http://www.apache.org"/> <item name="Turbine" href="http://turbine.apache.org/"; /> - <item name="Fulcrum" href="http://turbine.apache.org/fulcrum"; /> + <item name="Apache" href="http://www.apache.org"/> </links> <menu name="Fulcrum"> @@ -57,6 +56,12 @@ <item name="PBE" href="/fulcrum-pbe/"/> <item name="Pool" href="/fulcrum-pool/"/> <item name="Quartz" href="/fulcrum-quartz/"/> + <item name="Security" href="/fulcrum-security/" collapse="true"> + <item name="Security API" href="/fulcrum-security/fulcrum-security-api/"/> + <item name="Memory Impl" href="/fulcrum-security/fulcrum-security-memory/"/> + <item name="Hibernate Impl" href="/fulcrum-security/fulcrum-security-hibernate/"/> + <item name="Torque Impl" href="/fulcrum-security/fulcrum-security-torque/"/> + </item> <item name="Spring" href="/fulcrum-spring/"/> <item name="Test Container" href="/fulcrum-testcontainer/"/> <item name="Upload" href="/fulcrum-upload/"/> @@ -83,32 +88,10 @@ <item name="OSWorkflow" href="/fulcrum-osworkflow/"/> <item name="OSWorkflow Example" href="/fulcrum-osworkflow-example/"/> </item> - <item name="Security" href="/sites/security.html" collapse="true"> - <item name="Site" href="/fulcrum-security-site/"/> - <item name="Security API" href="/fulcrum-security-api/"/> - <item name="Security SPI" href="/fulcrum-security-spi/"/> - <item name="Memory Impl" href="/fulcrum-security-memory/"/> - <item name="Hibernate Impl" href="/fulcrum-security-hibernate/"/> - <item name="NT Impl" href="/fulcrum-security-nt/"/> - <item name="Torque Impl" href="/fulcrum-security-torque/"/> - <item name="Adapter Turbine" href="/fulcrum-security-adapter-turbine/"/> - <item name="Adapter OpenSymphony" href="/fulcrum-security-adapter-opensymphony/"/> - </item> <item name="XMLRPC" href="/fulcrum-xmlrpc/"/> </menu> - <menu name="Howtos (old)"> - <item name="JSP Service" href="/howto/jsp-service.html"/> - <item name="Template Service" href="/howto/template-service.html"/> - <item name="Velocity Service" href="/howto/velocity-service.html"/> - </menu> - <menu ref="reports" inherit="bottom" /> - <menu name="ASF" inherit="bottom"> - <item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html"; /> - <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"; /> - </menu> - </body> </project> diff --git a/xdocs/building.xml b/xdocs/building.xml index d011d37..979ddd9 100644 --- a/xdocs/building.xml +++ b/xdocs/building.xml @@ -22,9 +22,9 @@ <properties> <title>Building Fulcrum</title> - <author email="[email protected]">Pete Kazmier</author> + <!-- author email="[email protected]">Pete Kazmier</author> <author email="[email protected]">Quinton McCombs</author> - <author email="[email protected]">Eric Pugh</author> + <author email="[email protected]">Eric Pugh</author --> </properties> <body> @@ -56,23 +56,7 @@ This will build a local copy of the web site in the 'target/site' directory. Note, this uses a LOT of memory. If you can't build all of them, build them individually. </p> - <h4>Maven 1 Build</h4> - <p> - For Maven 1 modules please refer to the Maven 1 <a - href="http://maven.apache.org/maven-1.x/start/";>Getting - Started</a> documents. - Building a Maven 1 component is done inside the component folder using 'maven fulcrum:build'. - </p> - <subsection name="Current Build Issues"> - <p> - <strong>Missing JARS!</strong> There are some jar files that you must manually - install due to licensing restrictions. Javamail.jar will need to be downloaded. - Note, when you download it from Sun's site, you will need to rename it from mail.jar - to javamail-1.3.1.jar and place it in your MAVEN_REPO/javamail/jars/ directory. You - will also need to download jdbc-2.0.jar as well. Lastly, for the Hibernate security - provider, you need Sun's JTA jar file. Currently, the easiest place to go is <a href="http://www.hibernate.org";> - Hibernate</a> and download the jar from there by downloading the current distribution. - </p> + <subsection name="Current Build Issues"> <p> Depending on your version of Maven, you may have various problems with the reports being generated, or you may run out of memory when you do a @@ -85,18 +69,6 @@ <source><![CDATA[ $ maven -pl parser,crypto site' ]]></source> - <h4>Maven 1 Build</h4> -<source><![CDATA[ -$ maven multiproject:site -Dmaven.test.skip=true -Dmaven.multiproject.excludes=security/*.*,cache/*.*,scheduler/*.*' -]]></source> - </subsection> - <subsection name="Maven Repositories"> - <p> - If you are willing to build with an "unofficial" repository, you can uncomment - the <code>maven.repo</code> property in the project.properties file. This will - allow Maven to download from a Turbine repository the various jars that are not - currently in the main Maven repository. - </p> </subsection> </section> </body> diff --git a/xdocs/index.xml b/xdocs/index.xml index 54cfe99..100e414 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -52,7 +52,7 @@ Additionally, Fulcrum offers the Yaafi component. Yaafi (Yet Another Avalon Framework Implementation) is a very simple container that is meant to be used with singleton components. It is perfect for unit testing your components. You can then run them in - any other Avalon container like ECM, Phoenix, Excaliber, etc.. + any other Avalon container like ECM, Phoenix, Excalibur, etc.. </p> </section> diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml deleted file mode 100644 index 0ed1c2c..0000000 --- a/xdocs/navigation.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> - -<!DOCTYPE project [ -<!ENTITY site-nav SYSTEM "../../incl_site_nav.xml"> -]> - -<project name="Fulcrum" href="http://turbine.apache.org/fulcrum/";> - - <title>Fulcrum</title> - <logo href="/images/logo.gif">Fulcrum</logo> - - <body> - -&site-nav; - - <menu name="Fulcrum"> - <item name="Overview" href="/index.html"/> - <item name="Building" href="/building.html"/> - <item name="Changes" href="/changes-report.html"/> - </menu> - - <menu name="Released Components"> - - <item name="BSF" href="/fulcrum-bsf/index.html"/> - <item name="Cache" href="/fulcrum-cache/index.html"/> - <item name="Crypto" href="/fulcrum-crypto/index.html"/> - <item name="DVSL" href="/fulcrum-dvsl/index.html"/> - <item name="Factory" href="/fulcrum-factory/index.html"/> - <item name="JSON" href="/fulcrum-json/index.html"/> - <item name="Localization" href="/fulcrum-localization/index.html"/> - <item name="Mimetype" href="/fulcrum-mimetype/index.html"/> - <item name="Pool" href="/fulcrum-pool/index.html"/> - <item name="Naming" href="/fulcrum-naming/index.html"/> - <item name="OSWorkflow" href="/sites/osworkflow.html" collapse="true"> - <item name="OSWorkflow" href="/fulcrum-osworkflow/index.html"/> - <item name="OSWorkflow Example" href="/fulcrum-osworkflow-example/index.html"/> - </item> - <item name="Quartz" href="/fulcrum-quartz/index.html"/> - <item name="Security" href="/sites/security.html" collapse="true"> - <item name="Site" href="/fulcrum-security-site/index.html"/> - <item name="Security API" href="/fulcrum-security-api/index.html"/> - <item name="Security SPI" href="/fulcrum-security-spi/index.html"/> - <item name="Memory Impl" href="/fulcrum-security-memory/index.html"/> - <item name="Hibernate Impl" href="/fulcrum-security-hibernate/index.html"/> - <item name="NT Impl" href="/fulcrum-security-nt/index.html"/> - <item name="Adapter Turbine" href="/fulcrum-security-adapter-turbine/index.html"/> - <item name="Adapter OpenSymphony" href="/fulcrum-security-adapter-opensymphony/index.html"/> - </item> - <item name="Test Container" href="/fulcrum-testcontainer/index.html"/> - <item name="Upload" href="/fulcrum-upload/index.html"/> - <item name="XMLRPC" href="/fulcrum-xmlrpc/index.html"/> - <item name="XSLT" href="/fulcrum-xslt/index.html"/> - <item name="YAAFI" href="/fulcrum-yaafi/index.html"/> - </menu> - - <menu name="Sandbox Components"> - <item name="Script" href="/fulcrum-script/index.html"/> - <item name="CommonsEmail" href="/fulcrum-commonsemail/index.html"/> - <item name="PBE" href="/fulcrum-pbe/index.html"/> - <item name="Groovy" href="/fulcrum-groovy/index.html"/> - <item name="ResourceManager" href="/fulcrum-resourcemanager/index.html"/> - <item name="Configuration" href="/fulcrum-configuration-impl/index.html"/> - <item name="HsqlDB" href="/fulcrum-hsqldb/index.html"/> - <item name="Intake" href="/fulcrum-intake/index.html"/> - <item name="Parser" href="/fulcrum-parser/index.html"/> - <item name="Template" href="/fulcrum-template/index.html"/> - </menu> - - <menu name="Howtos (old)"> - <item name="JSP Service" href="/howto/jsp-service.html"/> - <item name="Template Service" href="/howto/template-service.html"/> - <item name="Velocity Service" href="/howto/velocity-service.html"/> - </menu> - - </body> -</project>
