Skip to content

Commit c20aeea

Browse files
jmcc0nn3lljmcc0nn3ll
committed
rather large restructure as proposed by greg
1 parent 9e1a91f commit c20aeea

File tree

82 files changed

+379
-507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+379
-507
lines changed

‎src/docbkx/advanced/contributing/chapter.xml

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/docbkx/advanced/embedding/chapter.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<chapter xml:id="deployment-using-overlays" version="5.0" xmlns="http://docbook.org/ns/docbook"
2+
<chapter xml:id="advanced-embedding" version="5.0" xmlns="http://docbook.org/ns/docbook"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xl="http://www.w3.org/1999/xlink"
44
xmlns:xi="http://www.w3.org/2001/XInclude"
55
xsi:schemaLocation="http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd">
6-
<title>Deployment Using Overlays</title>
6+
<title>Embedding</title>
77
<xi:include href="embedding-jetty.xml" />
88
<xi:include href="jetty-helloworld.xml" />
99
<xi:include href="configuring-overlay-deployer.xml" />

‎src/docbkx/advanced/frameworks/chapter.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns:mth="http://www.w3.org/1998/Math/Ma
55
xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook">
66
<title>Frameworks</title>
77
<xi:include href="spring-usage.xml" />
8+
<xi:include href="osgi.xml" />
89
</chapter>

‎src/docbkx/advanced/client/chapter.xml renamed to ‎src/docbkx/advanced/frameworks/osgi.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<chapter xml:id="clients" version="5.0" xmlns="http://docbook.org/ns/docbook"
2+
<section xml:id="framework-jetty-osgi" version="5.0" xmlns="http://docbook.org/ns/docbook"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xl="http://www.w3.org/1999/xlink"
44
xmlns:xi="http://www.w3.org/2001/XInclude"
55
xsi:schemaLocation="http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd">
6-
<title>Jetty Client Options</title>
7-
<!--xi:include href="content.xml" /-->
8-
</chapter>
6+
<title>OSGI Setup</title>
7+
<section>
8+
<para>Content from: http://wiki.eclipse.org/Jetty/ osgi bits</para>
9+
</section>
10+
</section>

‎src/docbkx/advanced/starting/chapter.xml renamed to ‎src/docbkx/advanced/jetty-start/chapter.xml

File renamed without changes.

‎src/docbkx/advanced/starting/start-features.xml renamed to ‎src/docbkx/advanced/jetty-start/start-features.xml

File renamed without changes.

‎src/docbkx/advanced/starting/start-matrix.xml renamed to ‎src/docbkx/advanced/jetty-start/start-matrix.xml

File renamed without changes.

‎src/docbkx/basic/jmx/chapter.xml renamed to ‎src/docbkx/advanced/jmx/chapter.xml

File renamed without changes.

‎src/docbkx/basic/jmx/using-jmx.xml renamed to ‎src/docbkx/advanced/jmx/using-jmx.xml

File renamed without changes.

‎src/docbkx/basic/jndi/chapter.xml renamed to ‎src/docbkx/advanced/jndi/chapter.xml

File renamed without changes.

‎src/docbkx/basic/jndi/configuring-jndi-datasource.xml renamed to ‎src/docbkx/advanced/jndi/configuring-jndi-datasource.xml

File renamed without changes.

‎src/docbkx/basic/jndi/configuring-jndi.xml renamed to ‎src/docbkx/advanced/jndi/configuring-jndi.xml

File renamed without changes.

‎src/docbkx/advanced/logging/6/debugging.xml

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎src/docbkx/advanced/logging/chapter.xml

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎src/docbkx/advanced/osgi/chapter.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/docbkx/basic/sessions/chapter.xml renamed to ‎src/docbkx/advanced/sessions/chapter.xml

File renamed without changes.

‎src/docbkx/basic/sessions/setting-session-characteristics.xml renamed to ‎src/docbkx/advanced/sessions/setting-session-characteristics.xml

File renamed without changes.

‎src/docbkx/basic/sessions/using-persistent-sessions.xml renamed to ‎src/docbkx/advanced/sessions/using-persistent-sessions.xml

File renamed without changes.

‎src/docbkx/basic/troubleshooting/chapter.xml renamed to ‎src/docbkx/advanced/troubleshooting/chapter.xml

File renamed without changes.

‎src/docbkx/basic/troubleshooting/preventing-memory-leaks.xml renamed to ‎src/docbkx/advanced/troubleshooting/preventing-memory-leaks.xml

File renamed without changes.

‎src/docbkx/basic/troubleshooting/troubleshooting-zip-exceptions.xml renamed to ‎src/docbkx/advanced/troubleshooting/troubleshooting-zip-exceptions.xml

File renamed without changes.

‎src/docbkx/basic/tuning/chapter.xml renamed to ‎src/docbkx/advanced/tuning/chapter.xml

File renamed without changes.

‎src/docbkx/basic/tuning/garbage-collection.xml renamed to ‎src/docbkx/advanced/tuning/garbage-collection.xml

File renamed without changes.

‎src/docbkx/basic/tuning/high-load.xml renamed to ‎src/docbkx/advanced/tuning/high-load.xml

File renamed without changes.

0 commit comments

Comments
 (0)