Skip to content

Commit c1ae4bd

Browse files
author
gm2552
committed
Removing doxia books from site creation.
1 parent a7f892b commit c1ae4bd

4 files changed

Lines changed: 19 additions & 73 deletions

File tree

‎pom.xml‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -254,76 +254,6 @@
254254
</execution>
255255
</executions>
256256
</plugin>
257-
<!-- DOXIA does not yet copy resources to the generated-site or site location. Bug
258-
DOXIA-355 was submitted in July of 09 and is listed to be resolved in DOXIA 1.2.
259-
This plugin a is work around for copying the resources from the book source to
260-
the generate site. -->
261-
<plugin>
262-
<groupId>org.apache.maven.plugins</groupId>
263-
<artifactId>maven-antrun-plugin</artifactId>
264-
<executions>
265-
<execution>
266-
<id>book</id>
267-
<phase>pre-site</phase>
268-
<configuration>
269-
<tasks>
270-
<copy todir="${project.build.directory}/generated-site/xdoc/users-guide/images/">
271-
<fileset dir="${basedir}/src/books/users-guide/images/" />
272-
</copy>
273-
<copy todir="${project.build.directory}/site/users-guide/images/">
274-
<fileset dir="${basedir}/src/books/users-guide/images/" />
275-
</copy>
276-
</tasks>
277-
</configuration>
278-
<goals>
279-
<goal>run</goal>
280-
</goals>
281-
</execution>
282-
</executions>
283-
</plugin>
284-
<plugin>
285-
<groupId>org.apache.maven.doxia</groupId>
286-
<artifactId>doxia-maven-plugin</artifactId>
287-
<version>1.2</version>
288-
<executions>
289-
<execution>
290-
<phase>pre-site</phase>
291-
<goals>
292-
<goal>render-books</goal>
293-
</goals>
294-
</execution>
295-
</executions>
296-
<configuration>
297-
<books>
298-
<book>
299-
<directory>src/books/users-guide</directory>
300-
<descriptor>src/books/users-guide.xml</descriptor>
301-
<formats>
302-
<format>
303-
<id>xdoc</id>
304-
</format>
305-
</formats>
306-
</book>
307-
</books>
308-
</configuration>
309-
<dependencies>
310-
<dependency>
311-
<groupId>org.codehaus.plexus</groupId>
312-
<artifactId>plexus-utils</artifactId>
313-
<version>1.5.12</version>
314-
</dependency>
315-
<dependency>
316-
<groupId>org.apache.maven.doxia</groupId>
317-
<artifactId>doxia-decoration-model</artifactId>
318-
<version>1.2</version>
319-
</dependency>
320-
<dependency>
321-
<groupId>org.apache.maven.doxia</groupId>
322-
<artifactId>doxia-module-confluence</artifactId>
323-
<version>1.2</version>
324-
</dependency>
325-
</dependencies>
326-
</plugin>
327257
<plugin>
328258
<groupId>org.apache.maven.plugins</groupId>
329259
<artifactId>maven-javadoc-plugin</artifactId>

‎src/site/apt/releaseNotes.apt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
Greg Meyer
77
---
88

9+
{6.0.2}
10+
11+
Changes included with release 6.0.2
12+
13+
[]
14+
15+
Enhancements
16+
17+
* NA
18+
19+
[]
20+
21+
Bug Fixes
22+
23+
* Fixing support for OAEP decryption.
24+
925
{6.0.1}
1026

1127
Changes included with release 6.0.1

‎src/site/site.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<body>
1111
<menu name="Documents">
1212
<item name="Release Notes" href="releaseNotes.html" />
13-
<item name="Users Guide" href="users-guide/"/>
13+
<item name="Users Guide" href="https://directprojectjavari.github.io/agent/"/>
1414
</menu>
1515
<menu name="External Links">
1616
<item name="The Direct Project Wiki" href="http://wiki.directproject.org" />

‎src/site/xdoc/index.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<section name="Overview">
1414
<p>
1515
The security and trust agent is responsible for implementing the policies of the security and trust
16-
<a href="http://wiki.directproject.org/Content+Security+for+Simple+Health+Trans">specification.</a> It
16+
<a href="http://wiki.directproject.org/w/images/e/e6/Applicability_Statement_for_Secure_Health_Transport_v1.2.pdf">specification.</a> It
1717
contains interfaces and implementations for resolving private and public certificates, message signing
1818
and validating message signatures, message encryption, and enforcing trust policies.
1919
</p>
@@ -24,7 +24,7 @@
2424
</p>
2525
<p>
2626
For more detail on developing directly against the agent API and other library components, refer to the
27-
<a href="users-guide/index.html">users guide.</a>
27+
<a href="https://directprojectjavari.github.io/agent/">users guide.</a>
2828
</p>
2929
</section>
3030
</body>

0 commit comments

Comments
 (0)