Author: tv
Date: Fri Jul 24 14:29:52 2015
New Revision: 1692524
URL: http://svn.apache.org/r1692524
Log:
Include fulcrum-security in main navigation
Removed:
turbine/fulcrum/trunk/site/xdocs/navigation.xml
Modified:
turbine/fulcrum/trunk/site/src/changes/changes.xml
turbine/fulcrum/trunk/site/src/site/site.xml
turbine/fulcrum/trunk/site/xdocs/building.xml
turbine/fulcrum/trunk/site/xdocs/index.xml
Modified: turbine/fulcrum/trunk/site/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/src/changes/changes.xml?rev=1692524&r1=1692523&r2=1692524&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/site/src/changes/changes.xml Fri Jul 24 14:29:52 2015
@@ -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>
Modified: turbine/fulcrum/trunk/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/src/site/site.xml?rev=1692524&r1=1692523&r2=1692524&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/site/src/site/site.xml Fri Jul 24 14:29:52 2015
@@ -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>
Modified: turbine/fulcrum/trunk/site/xdocs/building.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/xdocs/building.xml?rev=1692524&r1=1692523&r2=1692524&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/xdocs/building.xml (original)
+++ turbine/fulcrum/trunk/site/xdocs/building.xml Fri Jul 24 14:29:52 2015
@@ -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>
Modified: turbine/fulcrum/trunk/site/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/xdocs/index.xml?rev=1692524&r1=1692523&r2=1692524&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/site/xdocs/index.xml Fri Jul 24 14:29:52 2015
@@ -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>
