You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2015/01/14 03:29:34 UTC

[23/26] juddi git commit: JUDDI-914 done

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/devguide/en-US/images/juddi_services.png
----------------------------------------------------------------------
diff --git a/docs/devguide/en-US/images/juddi_services.png b/docs/devguide/en-US/images/juddi_services.png
deleted file mode 100644
index b704408..0000000
Binary files a/docs/devguide/en-US/images/juddi_services.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/devguide/en-US/images/soap_request.png
----------------------------------------------------------------------
diff --git a/docs/devguide/en-US/images/soap_request.png b/docs/devguide/en-US/images/soap_request.png
deleted file mode 100644
index 071c804..0000000
Binary files a/docs/devguide/en-US/images/soap_request.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/devguide/en-US/jUDDI_Architecture.xml
----------------------------------------------------------------------
diff --git a/docs/devguide/en-US/jUDDI_Architecture.xml b/docs/devguide/en-US/jUDDI_Architecture.xml
deleted file mode 100644
index 30a6e68..0000000
--- a/docs/devguide/en-US/jUDDI_Architecture.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- chapter: UDDI Registry -->
-<chapter id="chap-jUDDI_Architecture">
-    <title>UDDI Registry</title>
-
-    <!-- section: Introduction -->
-    <section id="jUDDI_Architecture-intro">
-        <title>jUDDI Architecture for UDDI v3 Project</title>
-
- 	<figure id="fig-jUDDI-Architecture">
-            <title>jUDDI Architecture</title>
-            <mediaobject>
-                <imageobject>
-                    <imagedata fileref="images/juddi_architecture.png" scalefit="1"/>
-                </imageobject>
-                <textobject>
-                    <phrase>jUDDI Architecture</phrase>
-                </textobject>
-            </mediaobject>
-        </figure>
-
-
-        <para>
-The diagram above shows the software layers and components employed in the jUDDI project implementation for UDDI v3.  Here is a brief description of each item in the diagram and how they all work together to create the UDDI-compliant registry that is jUDDI:
-	</para>
-	<orderedlist>
-	<listitem>
-		<para>
-Transport - the transport layer provides the means to receive and send out requests via a network or messaging service.  The UDDI specification details an interface where XML messages are exchanged between client and server but is agnostic as to how those messages are relayed.  By default, jUDDI uses Apache CXF to transport messages via SOAP over HTTP, however, the system is designed so other methods of transport can be easily plugged in (for example, JMS).
-		</para>
-	</listitem>
-	<listitem>
-		<para>
-Security - security is provided by the UDDI specification and is based on policies defined in the specification.  jUDDI implements all the mandatory policies and can be extended to support the optional policies.  Chief among these policies is access control to the UDDI API exposed by jUDDI.  jUDDI fully implements this policy, per the specification, which allows users to easily plug in their own third-party authentication framework.
-		</para>
-	</listitem>
-	<listitem>
-		<para>
-UDDI Interface - the UDDI interface defines the methods set forth by the UDDI specification to interact with the registry.  Within jUDDI, the interface classes are generated from the UDDI WSDL and they are implemented as POJOs.  These classes are annotated with JAX-WS annotations allowing end-users to easily employ any suitable JAX-WS container to expose the interface.
-		</para>
-	</listitem>
-	<listitem>
-		<para>
-In general, the interface implementation accepts incoming UDDI-based requests and ummarshals these requests to the appropriate schema object.  This object is then served to the proceeding layers so the necessary logic can be performed to fulfill the request.  After the request is fulfilled, this layer is responsible for marshalling the result and sending the response to the requesting party.
-		</para>
-	</listitem>
-	<listitem>
-		<para>
-As the interface is implemented as POJOs, it can be accessed via an "embedded" mode.  In this scenario, the methods of the implementation classes can be called directly.  This allows users to embed jUDDI directly into their application without having to deploy a full-blown jUDDI server.
-		</para>
-	</listitem>	
-	<listitem>
-		<para>
-UDDI Schema Objects - The UDDI specification comes equipped with an XML schema for its many data structures.  jUDDI employs XML-binding technology (JAXB) to generate objects from the schema (contained within the WSDL) that are then used as the arguments for the UDDI Interface layer.  These objects needn't  originate from XML – they can also be instantiated directly to make UDDI calls directly in java code.
-		</para>
-	</listitem>
-	<listitem>
-		<para>
-Validation – the validation layer reads the schema object input from the UDDI interface layer and, based on rules defined in the specification, makes sure the input is valid for the given UDDI method.  Failed validation results in an exception and an immediate return from the method call.
-		</para>
-	</listitem>
-	<listitem>
-		<para>
-Mapping – the mapping layer is responsible for mapping the UDDI schema objects to the persistence layer model.  For all intents and purposes, the mapping layer simply copies data from a schema object to the similar model object.  This occurs in both directions, as input objects must be mapped to the model to perform the necessary logic and results obtained from the call must be mapped back to the schema as output to the caller.
-		</para>
-	</listitem>
-	<listitem>
-		<para>
-Business Logic - the business logic layer is responsible for performing all the business logic associated with the UDDI calls.  The logic layer works with objects from the persistence layer and generally consists of querying the model based on user input.
-		</para>
-	</listitem>
-	<listitem>
-		<para>
-Persistence - the persistence layer, as its name implies, is responsible for persisting registry data to a storage medium.  To this end, a third-party persistence service that implements the Java Persistence API (Apache OpenJPA, Hibernate) is utilized to manage transactions with the storage medium and also to facilitate the plugging-in of various storage types.  By default, jUDDI is packaged with Apache OpenJPA as the persistence provider and Apache Derby as the storage medium.  This can easily be configured.
-		</para>
-	</listitem>
-	</orderedlist>
-
-    </section>
-    
-</chapter>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/devguide/en-US/jUDDI_Dev_Guide.ent
----------------------------------------------------------------------
diff --git a/docs/devguide/en-US/jUDDI_Dev_Guide.ent b/docs/devguide/en-US/jUDDI_Dev_Guide.ent
deleted file mode 100644
index e9c2d2e..0000000
--- a/docs/devguide/en-US/jUDDI_Dev_Guide.ent
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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.
- *
- */ -->
-<!ENTITY BOOKID "jUDDI_User_Guide">
-<!ENTITY HOLDER "jUDDI Community.">
-<!ENTITY YEAR "2009">
-<!ENTITY VERSION "5.0">

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/devguide/en-US/jUDDI_Dev_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/devguide/en-US/jUDDI_Dev_Guide.xml b/docs/devguide/en-US/jUDDI_Dev_Guide.xml
deleted file mode 100644
index 8727faf..0000000
--- a/docs/devguide/en-US/jUDDI_Dev_Guide.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<book status="final">
-	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-	<xi:include href="jUDDI_Architecture.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Dev_Environment_Setup.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<xi:include href="Release_Process.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
-	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-</book>
-

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/devguide/en-US/jUDDI_configuration.xml
----------------------------------------------------------------------
diff --git a/docs/devguide/en-US/jUDDI_configuration.xml b/docs/devguide/en-US/jUDDI_configuration.xml
deleted file mode 100644
index 67cdf42..0000000
--- a/docs/devguide/en-US/jUDDI_configuration.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- chapter: Getting Started -->
-<chapter id="chap-jUDDI_Configuration">
-    <title>jUDDI_Configuration</title>
-
-    <!-- section:  -->
-    <section id="sect-config_Introduction">
-        <title>Introduction</title>
-        <para>
-        jUDDI will look for a juddiv3.properties file on the root of the classpath. In the
-        <filename>juddiv3.war</filename> you can find it in
-        <filename>juddiv3.war/WEB_INF/classes/juddiv3.properties</filename>
-        </para>
-    </section>
-    
-    <!-- section: Startup -->
-    <section id="sect-startup">
-        <title>Startup</title>
-        <para>
-        <!-- TODO -->
-        </para>
-    </section>
-    
-    <!-- section: Subscription -->
-    <section id="sect-config_subscription">
-        <title>Subscription</title>
-        <programlisting><xi:include href="extras/jUDDI_configuration_1.properties" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-        <para>
-        This is the upper boundary set by the registry. Between the user defined endDate
-        of a Subscription and this value, the registry will pick the earliest date.
-        </para>
-
-        <programlisting><xi:include href="extras/jUDDI_configuration_2.properties" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-        <para>
-        This is the expiration time of a subscription “chunk”.
-        </para>
-    </section>
-    
-</chapter>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/devguide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/devguide/pom.xml b/docs/devguide/pom.xml
deleted file mode 100644
index 73f1b44..0000000
--- a/docs/devguide/pom.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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.
- *
- */ -->
-	<modelVersion>4.0.0</modelVersion>
-        <parent>
-	    <groupId>org.apache.juddi</groupId>
-	    <artifactId>juddi-parent</artifactId>
-	    <version>3.2.1-SNAPSHOT</version>
-	    <relativePath>../../pom.xml</relativePath>
-	</parent>
-	<groupId>org.apache.juddi</groupId>
-	<artifactId>devguide</artifactId>
-	<packaging>jdocbook</packaging>
-	<name>jUDDI Dev Guide -(en-US)</name>
-	<properties>
-	    <translation>en-US</translation>
-	    <docname>devguide</docname>
-	    <bookname>jUDDI Dev Guide</bookname>
-	</properties>
-        <repositories>
-            <repository>
-                <id>jboss-public-repository-group</id>
-                <name>JBoss Public Repository Group</name>
-                <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                <layout>default</layout>
-                <releases>
-                    <enabled>true</enabled>
-                    <updatePolicy>never</updatePolicy>
-                </releases>
-                <snapshots>
-                    <enabled>true</enabled>
-                    <updatePolicy>never</updatePolicy>
-                </snapshots>
-            </repository>
-        </repositories>
-
-	<pluginRepositories>
-            <pluginRepository>
-                <id>jboss-public-repository-group</id>
-                <name>JBoss Public Repository Group</name>
-                <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-                <releases>
-                    <enabled>true</enabled>
-                </releases>
-                <snapshots>
-                    <enabled>true</enabled>
-                </snapshots>
-            </pluginRepository>
-	    <pluginRepository>
-	        <id>snapshots</id>
-		<name>Apache SnapShot Repository</name>
-		<layout>default</layout>
-		<url>http://people.apache.org/repo/m2-snapshot-repository</url>
-		<snapshots>
-		    <enabled>true</enabled>
-		</snapshots>
-	    </pluginRepository>
-	</pluginRepositories>
-	<profiles>
-	<!-- mvn compile -->
-	    <profile>
-		<id>all</id>
-		<activation>
-		    <activeByDefault>true</activeByDefault>
-		</activation>
-		<build>
-		<plugins>
-		    <plugin>
-			<groupId>org.jboss.maven.plugins</groupId>
-			<artifactId>maven-jdocbook-plugin</artifactId>
-			<version>2.2.0</version>
-			<extensions>true</extensions>
-                        <dependencies>
-                        <!-- Overwrite jboss highlight-->
-                            <dependency>
-                                <groupId>org.richfaces.docs</groupId>
-                                <artifactId>highlight</artifactId>
-                                <version>3.3.3.Final</version>
-                            </dependency>
-                        </dependencies>
-
-			<configuration>
-			    <formats>
-			        <format>
-				    <formatName>pdf</formatName>
-				    <stylesheetResource>classpath:/xslt/org/apache/juddi/pdf.xsl</stylesheetResource>
-				    <finalName>${docname}.pdf</finalName>
-				</format>
-				<format>
-				    <formatName>html</formatName>
-				    <stylesheetResource>classpath:/xslt/org/apache/juddi/xhtml.xsl</stylesheetResource>
-				    <finalName>index.html</finalName>
-				</format>
-				<format>
-				    <formatName>html_single</formatName>
-				    <stylesheetResource>classpath:/xslt/org/apache/juddi/xhtml-single.xsl</stylesheetResource>
-				    <finalName>index.html</finalName>
-				</format>
-		           </formats>
-                           <options>
-                               <xincludeSupported>true</xincludeSupported>
-                               <xmlTransformerType>saxon</xmlTransformerType>
-                               <docbookVersion>1.72.0</docbookVersion>
-                           </options>
-			</configuration>
-		    </plugin>
-	        </plugins>
-            </build>
-        </profile>
-    	<!-- mvn compile -Phtml -->
-	<profile>
-	    <id>html</id>
-	    <activation>
-	        <activeByDefault>false</activeByDefault>
-	    </activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jboss.maven.plugins</groupId>
-						<artifactId>maven-jdocbook-plugin</artifactId>
-						<version>2.2.0</version>
-						<extensions>true</extensions>
-						<configuration>
-							<formats>
-								<format>
-									<formatName>html</formatName>
-									<stylesheetResource>classpath:/xslt/org/apache/juddi/xhtml.xsl</stylesheetResource>
-									<finalName>index.html</finalName>
-								</format>
-							</formats>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-    <!-- mvn compile -Phtml-single -->
-		<profile>
-			<id>html-single</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jboss.maven.plugins</groupId>
-						<artifactId>maven-jdocbook-plugin</artifactId>
-						<version>2.2.0</version>
-						<extensions>true</extensions>
-						<configuration>
-							<formats>
-								<format>
-									<formatName>html_single</formatName>
-									<stylesheetResource>classpath:/xslt/org/apache/juddi/xhtml-single.xsl</stylesheetResource>
-									<finalName>index.html</finalName>
-								</format>
-							</formats>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-    <!-- mvn compile -Ppdf -->
-		<profile>
-			<id>pdf</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jboss.maven.plugins</groupId>
-						<artifactId>maven-jdocbook-plugin</artifactId>
-						<version>2.2.0</version>
-						<extensions>true</extensions>
-						<configuration>
-							<formats>
-								<format>
-									<formatName>pdf</formatName>
-									<stylesheetResource>classpath:/xslt/org/apache/juddi/pdf.xsl</stylesheetResource>
-									<finalName>${docname}.pdf</finalName>
-								</format>
-							</formats>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jboss.maven.plugins</groupId>
-				<artifactId>maven-jdocbook-plugin</artifactId>
-				<version>2.2.0</version>
-				<extensions>true</extensions>
-				 
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.juddi</groupId>
-						<artifactId>juddi-docbook-xslt</artifactId>
-						<version>1.0</version>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.juddi</groupId>
-						<artifactId>juddi-docbook-style</artifactId>
-						<version>1.0</version>
-						<type>jdocbook-style</type>
-					</dependency>
-				</dependencies>
-				
-				<configuration>
-					<sourceDocumentName>jUDDI_Dev_Guide.xml</sourceDocumentName>
-					<sourceDirectory>.</sourceDirectory>
-					<imageResource>
-						<directory>${basedir}/${translation}</directory>
-						<includes>
-							<include>images/*</include>
-						</includes>
-					</imageResource>
-					<options>
-						<xincludeSupported>true</xincludeSupported>
-						<xmlTransformerType>saxon</xmlTransformerType>
-						<docbookVersion>1.74.0</docbookVersion>
-						<transformerParameters>
-							<property>
-								<name>javax.xml.parsers.DocumentBuilderFactory</name>
-								<value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
-							</property>
-							<property>
-								<name>javax.xml.parsers.SAXParserFactory</name>
-								<value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
-							</property>
-						</transformerParameters>
-					</options>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/Administration.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/Administration.xml b/docs/userguide/en-US/Administration.xml
deleted file mode 100644
index 08f4cc9..0000000
--- a/docs/userguide/en-US/Administration.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- chapter: UDDI Registry -->
-<chapter id="chap-Administration">
-    <title>Administration</title>
-    
-    <!-- section: Introduction -->
-    <section id="sect-admin_intro">
-        <title>Introduction</title>
-        <para>
-        General Stuff about administration.
-        </para>
-    </section>
-    
-    <!-- section: Changing the Listener Port -->
-    <section id="sect-changing_listener_port">
-        <title>Changing the Listener Port</title>
-        <para>
-        If you want to change the port Tomcat listens on to something non-standard
-        (something other than 8080):
-        </para>
-    
-        <variablelist>
-            <varlistentry>
-                <term>jUDDI Server</term>
-                <listitem>
-                    <!-- procedure:  -->
-                    <procedure>
-                        <step>
-                            <para>
-                            edit <filename>conf/server.xml</filename> and change the port
-                            within the <code>&lt;Connector&gt;</code> element
-                            </para>
-                        </step>
-                        <step>
-                            <para>
-                            edit
-                            <filename>webapps/juddiv3/WEB-INF/classes/juddiv3.properties</filename>
-                            and change the port number
-                            </para>
-                        </step>
-                    </procedure>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>jUDDI Portal</term>
-                <listitem>
-                    <!-- procedure:  -->
-                    <procedure>
-                        <step>
-                            <para>
-                            edit
-                            <filename>webapps/uddi-portlets/WEB-INF/classes/META-INF/uddi.xml</filename>
-                            and change the port numbers within the endpoint URLs
-                            </para>
-                        </step>
-                        <step>
-                            <para>
-                            edit <filename>pluto/WEB-INF/classes/server.xml</filename> and
-                            change the port within the <code>&lt;Connector&gt;</code>
-                            element
-                            </para>
-                        </step>
-                    </procedure>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        
-
-
-
-        
-        
-    </section>
-    <section id="sect-changing_oracle_sequence_name">
-        <title>Changing the Oracle Sequence name</title>
-        <para>
-	If you are using Hibernate as a persistence layer for jUDDI, then Oracle will generate a default sequence for you ("HIBERNATE_SEQUENCE").     If you are using hibernate elsewhere, you may wish to change the sequence name so that you do not share this sequence with any other applications.    If other applications try to manually create the default hibernate sequence, you may even run into situations where you find conflicts or a race condition.   
-        </para>
-   	<para>
-	The easiest way to handle this is to create an <filename>orm.xml</filename> file and place it within the classpath in a META-INF directory, which will override the jUDDI persistence annotations and will allow you to specify a specific sequence name for use with jUDDI.   The following <filename>orm.xml</filename> specifies a "juddi_sequence" sequence to be used with jUDDI.   
-	</para>
-	 <programlisting language="XML" ><xi:include href="extras/Administration_orm.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-    </section>
-    <section id="sect-persistence">
-	<title>Persistence</title>
-	<para>jUDDI supports both OpenJPA and Hibernate as persistence providers.   If you are embedding jUDDI, it is important to note that there are two JARs provided through maven.    If you will be using Hibernate, please use the juddi-core JAR, if you are using OpenJPA, use juddi-core-openjpa.
-	</para>
-	<para>The difference between these JARs is that the persistence classes within juddi-core-openjpa have been enhanced (http://people.apache.org/~mprudhom/openjpa/site/openjpa-project/manual/ref_guide_pc_enhance.html).   Unfortunately, the Hibernate classloader does not deal well with these enhanced classes, so it it important to note not to use the juddi-core-openjpa JAR with Hibernate.
-	</para>
-    </section> 
-</chapter>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/Authentication.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/Authentication.xml b/docs/userguide/en-US/Authentication.xml
deleted file mode 100644
index 2f52987..0000000
--- a/docs/userguide/en-US/Authentication.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- chapter: Authentication -->
-<chapter id="chap-Authentication">
-    <title>Authentication</title>
-    
-    <!-- section: Introduction -->
-    <section id="sect-authentication_intro">
-        <title>Introduction</title>
-        <para>
-        In order to enforce proper write access to jUDDI, each request to jUDDI needs a
-        valid <classname>authToken</classname>. Note that read access is not restricted
-        and therefore queries into the registries are not restricted.
-        </para>
-        
-        <para>
-        To obtain a valid <classname>authToken</classname> a
-        <methodname>getAuthToken()</methodname> request must be made, where a
-        <classname>GetAuthToken</classname> object is passed. On the
-        <classname>GetAuthToken</classname> object a <property>userid</property> and
-        <property>credential</property> (password) needs to be set.
-        </para>
-            
-       <programlisting language="Java"><xi:include href="extras/Authentication_1.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        The property <property>juddi.authenticator</property> in the
-        <filename>juddi.properties</filename> configuration file can be used to configure
-        how jUDDI is going to check the credentials passed in on the
-        <classname>GetAuthToken</classname> request. By default jUDDI uses the
-        <classname>JUDDIAuthenticator</classname> implementation. You can provide your own
-        authentication implementation or use any of the ones mention below. The
-        implementation needs to implement the
-        <interfacename>org.apache.juddi.auth.Authenticator</interfacename> interface, and
-        <property>juddi.authenticator</property> property should refer to the implementation class.
-        </para>
-
-        <para>
-        There are two phases involved in Authentication. The authenticate phase and the
-        identify phase. Both of these phases are represented by a method in the
-        <interfacename>Authenticator</interfacename> interface.
-        </para>
-        
-        <para>
-        The authenticate phase occurs during the <methodname>GetAuthToken</methodname>
-        request as described above. The goal of this phase is to turn a user id and
-        credentials into a valid publisher id. The publisher id (referred to as the
-        “authorized name” in UDDI terminology) is the value that assigns ownership within
-        UDDI. Whenever a new entity is created, it must be tagged with ownership by the
-        authorized name of the publisher. The value of the publisher id can be completely
-        transparent to jUDDI – the only requirement is that one exists to assign to new
-        entities. Thus, the authenticate phase must return a non-null publisher id. Upon
-        completion of the <methodname>GetAuthToken</methodname> request, an authentication
-        token is issued to the caller.
-        </para>
-    
-        <para>
-        In subsequent calls to the UDDI API that require authentication, the token issued
-        from the <methodname>GetAuthToken</methodname> request must be provided. This
-        leads to the next phase of jUDDI authentication – the identify phase.
-        </para>
-
-        <para>
-        The identify phase is responsible for turning the authentication token (or the
-        publisher id associated with that authentication token) into a valid
-        <classname>UddiEntityPublisher</classname> object. The
-        <classname>UddiEntityPublisher</classname> object contains all the properties
-        necessary to handle ownership of UDDI entities. Thus, the token (or publisher id)
-        is used to “identify” the publisher.
-        </para>
-
-        <para>
-        The two phases provide compliance with the UDDI authentication structure and grant
-        flexibility for users that wish to provide their own authentication mechanism.
-        Handling of credentials and publisher properties can be done entirely outside of
-        jUDDI. However, jUDDI provides the Publisher entity, which is a sub-class of
-        <classname>UddiEntityPublisher</classname>, to persist publisher properties within
-        jUDDI. This is used in the default authentication and is the subject of the next
-        section.      
-        </para>
-    </section>
-    
-    <!-- section:  -->
-    <section id="sect-jUDDI_Authentication">
-        <title>jUDDI Authentication</title>
-        <para>
-        The default authentication mechanism provided by jUDDI is the
-        <classname>JUDDIAuthenticator</classname>. The authenticate phase of the
-        <classname>JUDDIAuthenticator</classname> simply checks to see if the user id
-        passed in has an associated record in the Publisher table. No credentials checks
-        are made. If, during authentication, the publisher does not exist, it the
-        publisher is added on the fly.
-        </para>
-
-        <warning>
-            <para>
-            Do not use jUDDI authentication in production.
-            </para>
-        </warning>
-
-        <para>
-        The identify phase uses the publisher id to retrieve the Publisher record and return
-        it. All necessary publisher properties are populated as Publisher inherits from
-        <classname>UddiEntityPublisher</classname>.
-        </para>
-        
-        <programlisting language="Java"><xi:include href="extras/Authentication_2.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-    </section>
-    
-    
-    <!-- section: XMLDocAuthentication -->
-    <section id="sect-XMLDocAuthentication">
-        <title>XMLDocAuthentication</title>
-        
-        <para>
-        The <classname>XMLDocAuthentication</classname> implementation needs a XML file on
-        the classpath. The <filename>juddi.properties</filename> file would need to look
-        like
-        </para>
-        
-        <programlisting language="Java"><xi:include href="extras/Authentication_3.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        where the name of the XML can be provided but it defaults to
-        <filename>juddi-users.xml</filename>, and the content of the file would looks
-        something like
-        </para>
-    
-        <programlisting language="XML"><xi:include href="extras/Authentication_1.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        The authenticate phase checks that the user id and password match a value in the
-        XML file. The identify phase simply uses the user id to populate a new
-        <classname>UddiEntityPublisher</classname>.
-        </para>
-    
-    </section>
-    
-    
-    <!-- section: CryptedXMLDocAuthentication  -->
-    <section id="sect-CryptedXMLDocAuthentication">
-        <title>CryptedXMLDocAuthentication</title>
-
-        <para>
-        The <classname>CryptedXMLDocAuthentication</classname> implementation is similar
-        to the <classname>XMLDocAuthentication</classname> implementation, but the
-        passwords are encrypted
-        </para>
-
-        <programlisting language="Java"><xi:include href="extras/Authentication_4.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        where the name user credential file is
-        <filename>juddi-users-encrypted.xml</filename>, and the content of the file would
-        looks something like
-        </para>
-
-        <programlisting language="XML" ><xi:include href="extras/Authentication_2.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        The <classname>DefaultCryptor</classname> implementation uses
-        <literal>BEWithMD5AndDES</literal> and <literal>Base64</literal> to encrypt the
-        passwords. Note that the code in the <classname>AuthenticatorTest</classname> can
-        be used to learn more about how to use this Authenticator implementation. You can
-        plugin your own encryption algorithm by implementing the
-        <interfacename>org.apache.juddi.cryptor.Cryptor</interfacename> interface and
-        referencing your implementation class in the <property>juddi.cryptor</property>
-        property.
-        </para>
-
-        <para>
-        The authenticate phase checks that the user id and password match a value in the XML
-        file. The identify phase simply uses the user id to populate a new
-        <classname>UddiEntityPublisher</classname>.
-        </para>
-        
-    </section>
-    
-   <!-- section: LDAP Authentication -->
-    <section id="sect-LDAP_Authentication">
-        <title>LDAP Authentication</title>
-
-        <para>
-	<classname>LdapSimpleAuthenticator</classname> provides a way of authenticating
-	users using Ldap simple authentication.    It is fairly rudimentary and more 
-	LDAP integration is planned in the future, but this class allows you to authenticate
-	a user based on an LDAP prinicipal, provided that the principal and the juddi publisher ID
-	are the same.
-        </para>
-
-        <para>
-        To use this class you must add the following properties to the
-        <filename>juddi.properties</filename> file:
-        </para>
-
-        <programlisting language="XML"><xi:include href="extras/Authentication_5.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-	The <classname>juddi.authenticator.url</classname> property configures the
-        <classname>LdapSimpleAuthenticator</classname> class so that it knows where the LDAP
-	server resides.     Future work is planned in this area to use the LDAP uid rather than
-	the LDAP principal as the default publisher id.
-        </para>
-
-    </section>
-
-
-
-    <!-- section: JBoss Authentication -->
-    <section id="sect-JBoss_Authentication">
-        <title>JBoss Authentication</title>
-
-        <para>
-        Finally is it possible to hook up to third party credential stores. If for example
-        jUDDI is deployed to the JBoss Application server it is possible to hook up to
-        it's authentication machinery. The <classname>JBossAuthenticator</classname> class
-        is provided in the <filename>docs/examples/auth</filename> directory. This class
-        enables jUDDI deployments on JBoss use a server security domain to authenticate
-        users.
-        </para>
-
-        <para>
-        To use this class you must add the following properties to the
-        <filename>juddi.properties</filename> file:
-        </para>
-
-        <programlisting language="XML"><xi:include href="extras/Authentication_3.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        The <property>juddi.authenticator</property> property plugs the
-        <classname>JbossAuthenticator</classname> class into the jUDDI the Authenticator
-        framework. The <classname>juddi.sercuity.domain</classname>, configures the
-        <classname>JBossAuthenticator</classname> class where it can lookup the
-        application server's security domain, which it will use to perform the
-        authentication. Note that JBoss creates one security domain for each application
-        policy element on the
-        <filename>$JBOSS_HOME/server/default/conf/login-config.xml</filename> file, which
-        gets bound to the server JNDI tree with name
-        <code>java:/jaas/&lt;application-policy-name&gt;</code>. If a lookup refers to a
-        non existent application policy it defaults to a policy named other.
-        </para>
-
-    </section>
-    
-</chapter>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/Author_Group.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/Author_Group.xml b/docs/userguide/en-US/Author_Group.xml
deleted file mode 100644
index 19bfeba..0000000
--- a/docs/userguide/en-US/Author_Group.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<authorgroup>
-
-	<author>
-		<firstname>Tom</firstname>
-		<surname>Cunningham</surname>
-		<affiliation>
-			<orgname></orgname>
-			<orgdiv></orgdiv>
-		</affiliation>
-		<email></email>
-	</author>
-
-	<author>
-		<firstname>Kurt</firstname>
-		<surname>Stam</surname>
-		<affiliation>
-			<orgname></orgname>
-			<orgdiv></orgdiv>
-		</affiliation>
-		<email></email>
-	</author>
-
-    <author>
-      <firstname>Jeff</firstname>
-      <surname>Faath</surname>
-      <email>jfaath@apache.org</email>
-    </author>
-
-	<author>
-		<firstname>The jUDDI Community</firstname>
-		<surname></surname>
-		<affiliation>
-			<orgname></orgname>
-			<orgdiv></orgdiv>
-		</affiliation>
-		<email></email>
-	</author>
-
-	<othercredit>
-		<firstname>Darrin</firstname>
-		<surname>Mison</surname>
-        <!-- weirdness with the xslt, it sticks orgname between firstname and lastname -->
-		<!-- <affiliation>
-			<orgname>Red Hat</orgname>
-			<orgdiv>Engineering Content Services</orgdiv>
-		</affiliation>
-		<email>dmison@redhat.com</email>
-		-->
-	</othercredit> 
-
-</authorgroup>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/Book_Info.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/Book_Info.xml b/docs/userguide/en-US/Book_Info.xml
deleted file mode 100644
index caee949..0000000
--- a/docs/userguide/en-US/Book_Info.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<bookinfo id="User_Guide-demobooks">
-	<title>jUDDI User Guide</title>
-	<subtitle>A guide to using jUDDI</subtitle>
-	<productname>jUDDI</productname>
-	<edition>1</edition>
-    <pubsnumber>1</pubsnumber>
-    <productnumber>5.0.0</productnumber>
-	<abstract>
-		<para>
-        This document is a User Guide for jUDDI. jUDDI (pronounced "Judy") is an open
-        source Java implementation of the Universal Description, Discovery, and
-        Integration (UDDI v3) specification for Web Services.
-		</para>
-	</abstract>
-	<corpauthor>
-		<inlinemediaobject>
-			<imageobject>
-				<imagedata format='SVG' fileref="Common_Content/images/title_logo.svg" />
-			</imageobject>
-			<textobject><phrase>Logo</phrase></textobject>
-		</inlinemediaobject>
-	</corpauthor>
-	<copyright>
-		<year>&YEAR;</year>
-		<holder>&HOLDER;</holder>
-	</copyright>
-	
-	<xi:include href="Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
-		<xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude">
-			<xi:include href="Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		</xi:fallback>
-	</xi:include>
-	
-	<xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</bookinfo>
-
-
-

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/Conventions.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/Conventions.xml b/docs/userguide/en-US/Conventions.xml
deleted file mode 100644
index 8183c0f..0000000
--- a/docs/userguide/en-US/Conventions.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-
-<section lang="en-US">
-	<title>Document Conventions</title>
-	<para>
-	This manual uses several conventions to highlight certain words and phrases and draw
-    attention to specific pieces of information.
-    </para>
-	<para>
-	In PDF and paper editions, this manual uses typefaces drawn from the 
-	<ulink url="https://fedorahosted.org/liberation-fonts/">Liberation Fonts</ulink> set. 
-	The Liberation Fonts set is also used in HTML editions if the set is installed on your
-    system. If not, alternative but equivalent typefaces are displayed. Note: Red Hat
-    Enterprise Linux 5 and later includes the Liberation Fonts set by default.
-	</para>
-
-	<section>
-		<title>Typographic Conventions</title>
-		<para>
-		Four typographic conventions are used to call attention to specific words and
-        phrases. These conventions, and the circumstances they apply to, are as follows.
-		</para>
-		<para>
-		<literal>Mono-spaced Bold</literal>
-		</para>
-		<para>
-		Used to highlight system input, including shell commands, file names and paths.
-        Also used to highlight key caps and key-combinations. For example:
-		</para>
-		<blockquote>
-			<para>
-			To see the contents of the file <filename>my_next_bestselling_novel</filename>
-            in your current working directory, enter the <command>cat
-            my_next_bestselling_novel</command> command at the shell prompt and press
-            <keycap>Enter</keycap> to execute the command.
-			</para>
-		</blockquote>
-		<para>
-		The above includes a file name, a shell command and a key cap, all presented in
-        Mono-spaced Bold and all distinguishable thanks to context.
-		</para>
-		<para>
-		Key-combinations can be distinguished from key caps by the hyphen connecting each
-        part of a key-combination. For example:
-		</para>
-		<blockquote>
-			<para>
-			Press <keycap>Enter</keycap> to execute the command.
-			</para>
-			<para>
-			Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F1</keycap></keycombo> to switch to the first virtual terminal. Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F7</keycap></keycombo> to return to your X-Windows session.
-			</para>
-		</blockquote>
-		<para>
-		The first sentence highlights the particular key cap to press. The second
-        highlights two sets of three key caps, each set pressed simultaneously.
-		</para>
-		<para>
-		If source code is discussed, class names, methods, functions, variable names and
-        returned values mentioned within a paragraph will be presented as above, in
-        <literal>Mono-spaced Bold</literal>. For example:
-		</para>
-		<blockquote>
-			<para>
-			File-related classes include <classname>filesystem</classname> for file
-            systems, <classname>file</classname> for files, and <classname>dir</classname>
-            for directories. Each class has its own associated set of permissions.
-			</para>
-		</blockquote>
-		<para>
-		<application>Proportional Bold</application>
-		</para>
-		<para>
-		This denotes words or phrases encountered on a system, including application
-        names; dialogue box text; labelled buttons; check-box and radio button labels;
-        menu titles and sub-menu titles. For example:
-		</para>
-		<blockquote>
-			<para>
-			Choose <guimenu>System &gt; Preferences &gt; Mouse</guimenu> from the main
-            menu bar to launch <application>Mouse Preferences</application>. In the
-            <guilabel>Buttons</guilabel> tab, click the <guilabel>Left-handed
-            mouse</guilabel> check box and click <guibutton>Close</guibutton> to switch
-            the primary mouse button from the left to the right (making the mouse suitable
-            for use in the left hand).
-			</para>
-			<para>
-			To insert a special character into a <application>gedit</application> file,
-            choose <guimenu>Applications &gt; Accessories &gt; Character Map</guimenu>
-            from the main menu bar. Next, choose <guimenu>Search &gt;
-            Find&hellip;</guimenu> from the <application>Character Map</application> menu
-            bar, type the name of the character in the <guilabel>Search</guilabel> field
-            and click <guibutton>Next</guibutton>. The character you sought will be
-            highlighted in the <guilabel>Character Table</guilabel>. Double-click this
-            highlighted character to place it in the <guilabel>Text to copy</guilabel>
-            field and then click the <guibutton>Copy</guibutton> button. Now switch back
-            to your document and choose <guimenu>Edit &gt; Paste</guimenu> from the
-            <application>gedit</application> menu bar.
-			</para>
-		</blockquote>
-		<para>
-		The above text includes application names; system-wide menu names and items;
-        application-specific menu names; and buttons and text found within a GUI
-        interface, all presented in Proportional Bold and all distinguishable by context.
-		</para>
-		<para>
-		Note the <guimenu>&gt;</guimenu> shorthand used to indicate traversal through a
-        menu and its sub-menus. This is to avoid the difficult-to-follow &#39;Select
-        <guimenuitem>Mouse</guimenuitem> from the <guimenu>Preferences</guimenu> sub-menu
-        in the <guimenu>System</guimenu> menu of the main menu bar&#39; approach.
-		</para>
-		<para>
-		<command><replaceable>Mono-spaced Bold Italic</replaceable></command> or
-        <application><replaceable>Proportional Bold Italic</replaceable></application>
-		</para>
-		<para>
-		Whether Mono-spaced Bold or Proportional Bold, the addition of Italics indicates
-        replaceable or variable text. Italics denotes text you do not input literally or
-        displayed text that changes depending on circumstance. For example:
-		</para>
-		<blockquote>
-			<para>
-				To connect to a remote machine using ssh, type <command>ssh <replaceable>username</replaceable>@<replaceable>domain.name</replaceable></command> at a shell prompt. If the remote machine is <filename>example.com</filename> and your username on that machine is john, type <command>ssh john@example.com</command>.
-			</para>
-			<para>
-				The <command>mount -o remount <replaceable>file-system</replaceable></command> command remounts the named file system. For example, to remount the <filename>/home</filename> file system, the command is <command>mount -o remount /home</command>.
-			</para>
-			<para>
-				To see the version of a currently installed package, use the <command>rpm -q <replaceable>package</replaceable></command> command. It will return a result as follows: <command><replaceable>package-version-release</replaceable></command>.
-			</para>
-		</blockquote>
-		<para>
-			Note the words in bold italics above &mdash; username, domain.name, file-system, package, version and release. Each word is a placeholder, either for text you enter when issuing a command or for text displayed by the system.
-		</para>
-		<para>
-			Aside from standard usage for presenting the title of a work, italics denotes the first use of a new and important term. For example:
-		</para>
-		<blockquote>
-			<para>
-				When the Apache HTTP Server accepts requests, it dispatches child processes or threads to handle them. This group of child processes or threads is known as a <firstterm>server-pool</firstterm>. Under Apache HTTP Server 2.0, the responsibility for creating and maintaining these server-pools has been abstracted to a group of modules called <firstterm>Multi-Processing Modules</firstterm> (<firstterm>MPMs</firstterm>). Unlike other modules, only one module from the MPM group can be loaded by the Apache HTTP Server.
-			</para>
-		</blockquote>
-	</section>
-	
-	<section>
-		<title>Pull-quote Conventions</title>
-		<para>
-			Two, commonly multi-line, data types are set off visually from the surrounding text.
-		</para>
-		<para>
-			Output sent to a terminal is set in <computeroutput>Mono-spaced Roman</computeroutput> and presented thus:
-		</para>
-		
-<screen>
-books        Desktop   documentation  drafts  mss    photos   stuff  svn
-books_tests  Desktop1  downloads      images  notes  scripts  svgs
-</screen>
-		<para>
-			Source-code listings are also set in <computeroutput>Mono-spaced Roman</computeroutput> but are presented and highlighted as follows:
-		</para>
-		
-<programlisting language="Java" role="JAVA">
-package org.jboss.book.jca.ex1;
-
-import javax.naming.InitialContext;
-
-public class ExClient
-{
-   public static void main(String args[]) 
-       throws Exception
-   {
-      InitialContext iniCtx = new InitialContext();
-      Object         ref    = iniCtx.lookup("EchoBean");
-      EchoHome       home   = (EchoHome) ref;
-      Echo           echo   = home.create();
-
-      System.out.println("Created Echo");
-
-      System.out.println("Echo.echo(&#39;Hello&#39;) = " + echo.echo("Hello"));
-   }
-   
-}
-</programlisting>
-	</section>
-	
-	<section>
-		<title>Notes and Warnings</title>
-		<para>
-			Finally, we use three visual styles to draw attention to information that might otherwise be overlooked.
-		</para>
-		<note>
-			<title>Note</title>
-			<para>
-				A Note is a tip or shortcut or alternative approach to the task at hand. Ignoring a note should have no negative consequences, but you might miss out on a trick that makes your life easier.
-			</para>
-		</note>
-		<important>
-			<title>Important</title>
-			<para>
-				Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring Important boxes won&#39;t cause data loss but may cause irritation and frustration.
-			</para>
-		</important>
-		<warning>
-			<title>Warning</title>
-			<para>
-				A Warning should not be ignored. Ignoring warnings will most likely cause data loss.
-			</para>
-		</warning>
-	</section>
-
-</section>
-
-

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/Database_Setup.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/Database_Setup.xml b/docs/userguide/en-US/Database_Setup.xml
deleted file mode 100644
index 3a16090..0000000
--- a/docs/userguide/en-US/Database_Setup.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- chapter: Database Setup -->
-<chapter id="chap-database_setup">
-    <title>Database Setup</title>
-    
-    <!-- section: Derby Out-of-the-Box -->
-    <section id="sect-derby_OOB">
-        <title>Derby Out-of-the-Box</title>
-        <para>
-        By default jUDDI uses an embedded Derby database. This allows us to build a 
-        downloadable distribution that works out-of-the-box, without having to do any 
-        database setup work. We recommend switching to an enterprise-level database 
-        before going to production. JUDDI uses the Java Persistence API (JPA) in the back 
-        end and we've tested with both OpenJPA and Hibernate. To configure which JPA 
-        provider you want to use, you will need to edit the configuration in the 
-        <filename>persistence.xml</filename>. This file can be found in the 
-        <filename>juddi.war/WEB-INF/classes/META-INF/persistence.xml</filename>
-        </para>
-    
-        <para>
-        For Hibernate the content of this file looks like
-        </para>
-    
-        <programlisting language="XML" ><xi:include href="extras/Database_Setup_1.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        The <filename>persistence.xml</filename> reference a datasource
-        <property>“java:comp/env/jdbc/JuddiDS”</property>. Datasource deployment is
-        Application Server specific. If you are using Tomcat, then the datasource is
-        defined in <filename>juddi/META-INF/context.xml</filename> which by default looks
-        like
-        </para>
-    
-        <programlisting language="XML" ><xi:include href="extras/Database_Setup_2.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-    </section>
-    
-
-    <!-- section: Switch to MySQL -->
-    <section id="sect-switch_to_mysql">
-        <title>Switch to MySQL</title>
-
-        <para>
-        To switch over to MySQL you need to add the mysql driver (i.e. The
-        <filename>mysql-connector-java-5.1.6.jar</filename>) to the classpath and you will
-        need to edit the <filename>persistence.xml</filename>
-        </para>
-
-        <programlisting language="XML" ><xi:include href="extras/Database_Setup_3.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        and the datasource. For tomcat you the <filename>context.xml</filename> should
-        look something like
-        </para>
-    
-        <programlisting language="XML" ><xi:include href="extras/Database_Setup_4.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <warning>
-            <para>
-            Tomcat copies the <filename>context.xml</filename> to <filename>conf/CATALINA/localhost/juddiv3.xml</filename>, and if
-            you update the <filename>context.xml</filename> it may not update this copy. You should simply
-            delete the <filename>juddiv3.xml</filename> file after updating the <filename>context.xml</filename>.
-            </para>
-        </warning>
-
-        <para>
-        To create a MySQL database name <literal>juddiv3</literal> use
-        </para>
-
-        <screen><xi:include href="extras/Database_Setup_1.screen" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></screen>
-
-        <para>
-        and finally you probably want to switch to a user which is a bit less potent then
-        '<literal>root</literal>'.
-        </para>
-        
-    </section>
-    
-    <!-- section: Switch to Postgres -->
-    <section id="sect-switch_to_postres">
-        <title>Switch to Postgres</title>
-        <para>
-        This was written from a JBoss - jUDDI perspective. Non-JBoss-users may have to
-        tweak this a little bit, but for the most part, the files and information needed
-        is here.
-        </para>
-    
-        <para>
-        Logged in as postgres user, access psql:
-        </para>
-    
-        <screen><xi:include href="extras/Database_Setup_2.screen" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></screen>
-
-        <para>
-        Note, for this example, my database is called juddi, as is the user who has full
-        privileges to the database. The user 'juddi' has a password set to 'password'.
-        </para>
-    
-        <programlisting language="XML" ><xi:include href="extras/Database_Setup_5.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        In <filename>persistence.xml</filename>, reference the correct JNDI name of the
-        datasource and remove the derby Dialect and add in the postgresql Dialect:
-        </para>
-    
-        <programlisting language="XML" ><xi:include href="extras/Database_Setup_6.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        Be sure to have <filename>postgresql-8.3-604.jdbc4.jar</filename> in the
-        <filename>lib</filename> folder!
-        </para>
-    </section>
-    
-     <!-- section: Switch to Oracle 10 -->
-    <section id="sect-switch_to_oracle">
-        <title>Switch to Oracle</title>
-        <para>
-        To switch over to Oracle you need to add the oracle driver (i.e. the<filename>classes12.jar</filename>) to the 
-        classpath and you will need to edit the <filename>persistence.xml</filename>
-        </para>
-        
-        <programlisting language="XML" ><xi:include href="extras/Database_Setup_7.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-        
-        <para>
-        To create a Oracle database name juddiv3 with the ultimate in minimalism use
-        <programlisting>sqlplus> create database juddiv3;</programlisting>
-        then you probably want to switch to a user which is a bit less potent then 'root' and set the appropriate password.
-        </para>
-        
-        <warning>
-			<title>Warning</title>
-			<para>
-				Tomcat copies the context.xml to conf/CATALINA/localhost/juddiv3.xml, and if you update the context.xml it may not update this copy. 
-				You should simply delete the juddiv3.xml file after updating the context.xml.
-			</para>
-		</warning>
-		
-		<para>
-		Please check the <xref linkend="sect-changing_oracle_sequence_name" >Administration Chapter</xref> if you want to change the Oracle Sequence name.
-		</para>
-        
-    </section>
-    
-     <!-- section: Switch to HSQL -->
-    <section id="sect-switch_to_hsql">
-        <title>Switch to HSQL</title>
-
-		<para>First make sure you have a running hsqldb. For a standalone server startup use:</para>
-		<programlisting>
-		java -cp hsqldb.jar org.hsqldb.server.Server --port 1747 --database.0 file:juddi --dbname.0 juddi
-		</programlisting>
-		<para>Next, connect the client manager to this instance using:</para>
-		<programlisting>
-		java -classpath hsqldb.jar org.hsqldb.util.DatabaseManagerSwing --driver org.hsqldb.jdbcDriver --url jdbc:hsqldb:hsql://localhost:1747/juddi  -user sa
-		</programlisting>
-		<para>and create the juddi user:</para>
-		<programlisting language="SQL" >
-		CREATE USER JUDDI PASSWORD "password"  ADMIN;
-		CREATE SCHEMA JUDDI AUTHORIZATION JUDDI;
-		SET DATABASE DEFAULT INITIAL SCHEMA JUDDI;
-		ALTER USER juddi set initial schema juddi;
-		</programlisting>
-		<para>From now on, one can connect as JUDDI user to that database and the database is now ready to go.</para>
-		
-        <para>
-        To switch over to HSQL you need to add the hsql driver (i.e. The
-        <filename>hsqldb.jar</filename>) to the classpath and you will
-        need to edit the <filename>persistence.xml</filename>
-        </para>
-
-        <programlisting language="XML" ><xi:include href="extras/Database_Setup_9.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-        and the datasource. For tomcat you the <filename>context.xml</filename> should
-        look something like
-        </para>
-    
-        <programlisting language="XML" ><xi:include href="extras/Database_Setup_10.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <warning>
-            <para>
-            Tomcat copies the <filename>context.xml</filename> to <filename>conf/CATALINA/localhost/juddiv3.xml</filename>, and if
-            you update the <filename>context.xml</filename> it may not update this copy. You should simply
-            delete the <filename>juddiv3.xml</filename> file after updating the <filename>context.xml</filename>.
-            </para>
-        </warning>
-
-    </section>
-    
-    <!-- section: Switch to &lt;other db&gt; -->
-    <section id="sect-switch_to_other_DB">
-        <title>Switch to &lt;other db&gt;</title>
-        <para>
-        If you use another database, please document, and send us what you had to change
-        to make it work and we will include it here.
-        </para>
-    </section>
-    
-    <!-- section: set persistence props in juddiv3.properties -->
-    <section id="sect-persistence_props">
-        <title>Override persistence properties in the juddiv3.properties</title>
-        <para>
-        The juddiv3.properties file can be externalized; if you give the path of juddiv3.properties 
-        in the JVM args, the juddiv3.properties will not be picked up from the WAR. To use this set the 
-        <filename>juddi.propertiesFile</filename> to a location of your configuration file.
-        This allows the user to change the juddi properties without having to open up the juddiv3.war file.
-        For this usecase it makes sense that also persistence properties can be overriden as well
-        in the juddiv3.properties file. The following properties can be set:
-        </para>
-        <table title="persistence properties">
-        <tr><th>property name</th><th>description</th><th>example value</th></tr>
-        <tr><td>persistenceProvider</td><td>JPA Implementation</td><td>Hibernate</td></tr>
-        <tr><td>hibernate.connection.datasource</td><td>datasource name</td><td>java:/jdbc/JuddiDS</td></tr>
-        <tr><td>hibernate.hbm2ddl.auto</td><td>hibernate to ddl setting </td><td>update</td></tr>
-        <tr><td>hibernate.default_schema</td><td>Schema name</td><td>JuddiSchema</td></tr>
-        <tr><td>hibernate.dialect</td><td>DataBase vendor name</td><td>org.hibernate.dialect.DB2Dialect</td></tr>
-        </table>
-    </section>
-    
-    
-</chapter>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/Feedback.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/Feedback.xml b/docs/userguide/en-US/Feedback.xml
deleted file mode 100644
index c0dbbdd..0000000
--- a/docs/userguide/en-US/Feedback.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<section>
-	<title>We Need Feedback!</title>
-	<para>
-	If you find a typographical error in this manual, or if you have thought of a way
-    to make this manual better, we would love to hear from you! 
-	</para>
-
-	<para>
-	For any issues you find, or improvements you have, please sign up for a JIRA account at https://issues.apache.org/jira/secure/Dashboard.jspa and file a bug under the "jUDDI" component.
-	</para>
-
-	<para>
-    If you have a suggestion for improving the documentation, try to be as specific as
-    possible when describing it. If you have found an error, please include the section number
-    and some of the surrounding text so we can find it easily.
-	</para>
-</section>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/Getting_Started.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/Getting_Started.xml b/docs/userguide/en-US/Getting_Started.xml
deleted file mode 100644
index 95fe83b..0000000
--- a/docs/userguide/en-US/Getting_Started.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- chapter: Getting Started -->
-<chapter id="chap-Getting_Started">
-    <title>Getting Started</title>
-    
-    <!-- section: What Should I Download? -->
-    <section id="sect-what_should_I_download">
-        <title>What Should I Download?</title>
-        <para>
-        The jUDDI server deploys as a WebARchive (war) named <filename>juddiv3.war</filename>. Within jUDDI,
-        there are three downloadable files (<filename>juddi-core.jar</filename>, <filename>juddi.war</filename>, and
-        <filename>juddi-tomcat.zip</filename>). You should determine which one to use depending on what level
-        of integration you want with your application and your platform / server choices.
-        </para>
-        <para>
-        JUDDI also ships with client side code, the <filename>juddi-client.jar</filename>. The jUDDI server
-        depends on the <filename>juddi-client.jar</filename> in situations where one server communicates to
-        another server. In this setup one server acts as a client to the other server. The
-        juddi-client.
-        </para>
-    </section>
-    
-    <!-- section: Using the JAR -->
-    <section id="sect-using_the_jar">
-        <title>Using the JAR</title>
-        <para>
-        The juddi-core module produces a JAR which contains the jUDDI source and a jUDDI
-        persistence.xml configuration. jUDDI's persistence is being actively tested with
-        both OpenJPA and with Hibernate. If you are going to use only the JAR, you would
-        need to directly insert objects into jUDDI through the database back end or
-        persistence layer, or configure your own Web Service provider with the provided
-        WSDL files and classes.
-        </para>
-    </section>
-    
-    <!-- section: Using the WAR File -->
-    <section id="sect-using_the_WAR_file">
-        <title>Using the WAR File</title>
-        <para>
-        As with the JAR, you need to make a decision on what framework you would like to
-        use when building the WAR. jUDDI's architecture supports any JAX-WS compliant WS
-        stack (Axis, CXF, etc). The jUDDI 3.0.GA release ships with CXF in the Tomcat
-        bundle, but any docs or descriptors to support other WS stacks would be welcome
-        contributions. Simply copy the WAR to the deploy folder of your server (this
-        release has been tested under Apache Tomcat 6.0.20), start your server, and follow
-        the directions under “using jUDDI as a Web Service”.
-        </para>
-    </section>
-    
-    <!-- section: Using the Tomcat Bundle -->
-    <section id="sect-using_the_tomcat_bundle">
-        <title>Using the Tomcat Bundle</title>
-        <para>
-        The jUDDI Tomcat bundle packages up the jUDDI WAR, Apache Derby, and a few
-        necessary configuration files and provides the user with a pre-configured jUDDI
-        instance. By default, Hibernate is used as the persistence layer and CXF is used
-        as a Web Service framework. To get started using the Tomcat bundle, unzip the
-        <filename>juddi-tomcat-bundle.zip</filename>, and start Tomcat :
-        </para>
-    
-        <screen><xi:include href="extras/Getting_Started_1.screen" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></screen>
-
-        <para>
-        It is suggested that you use JDK 1.6 with the Tomcat 6 bundle. On Mac OS X you can
-        either change your JAVA_HOME settings or use 
-        <filename>/Applications/Utilities/Java Preferences.app</filename> to change your 
-        current JDK.
-        </para>
-    
-        <para>
-        Once the server is up and running can make sure the root data was properly
-        installed by browsing to <ulink url="http://localhost:8080/juddiv3"/>
-        </para>
-        
-        <para>
-        You should see the screen show in <xref linkend="fig-jUDDI_welcome" />.
-        </para>
-    
-        <!-- figure: jUDDI Welcome Page -->
-        <figure id="fig-jUDDI_welcome">
-            <title>jUDDI Welcome Page</title>
-            <mediaobject>
-                <imageobject>
-                    <imagedata fileref="images/jUDDI_welcome.png" scalefit="1"/>
-                </imageobject>
-                <textobject>
-                    <phrase>jUDDI Welcome Page</phrase>
-                </textobject>
-            </mediaobject>
-        </figure>
-
-    </section>
-
-    <!-- section: Using jUDDI Web Services -->
-    <section id="sect-Using_jUDDI_webservices">
-        <title>Using jUDDI Web Services</title>
-        <para>
-        Once the jUDDI server is started, you can inspect the UDDI WebService API by 
-        browsing to <ulink url="http://localhost:8080/juddiv3/services"/>
-        </para>
-    
-        <para>
-        You should see an overview of all the Services and their WSDLs.
-        </para>
-    
-        <!-- figure: UDDI Services Overview -->
-        <figure id="fig-UDDI_services_overview">
-            <title>UDDI Services Overview</title>
-            <mediaobject>
-                <imageobject>
-                    <imagedata fileref="images/UDDI_services_overview.png" scalefit="1"/>
-                </imageobject>
-                <textobject>
-                    <phrase>UDDI Services Overview</phrase>
-                </textobject>
-            </mediaobject>
-        </figure>
-
-        <para>
-        The services page shows you the available endpoints and methods available. Using
-        any SOAP client, you should be able to send some sample requests to jUDDI to test:
-        </para>
-    
-        <!-- figure: Getting an authToken using SoapUI -->
-        <figure id="fig-getting_authToken_soapUI">
-            <title>Getting an authToken using SoapUI</title>
-            <mediaobject>
-                <imageobject>
-                    <imagedata fileref="images/authToken_SoapUI.png" scalefit="1"/>
-                </imageobject>
-                <textobject>
-                    <phrase>Getting an authToken using SoapUI</phrase>
-                </textobject>
-            </mediaobject>
-        </figure>
-        
-    </section>
-    
-
-
-    
-    
-    
-</chapter>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/GlassfishDeploy.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/GlassfishDeploy.xml b/docs/userguide/en-US/GlassfishDeploy.xml
deleted file mode 100644
index ff7323a..0000000
--- a/docs/userguide/en-US/GlassfishDeploy.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- chapter: Subscription -->
-<chapter id="chap-deployglassfish">
-	<title>Deploying to Glassfish 2.1.1</title>
-    
-    <!-- section: Introduction -->
-	<section id="sect-deployglassfish">
-		<title>Introduction</title>
-		<para> This section describes how to deploy juddi to Glassfish 2.1.1.
-			These instructions will use CXF as a webservice framework.</para>
-		<para>
-			First, download the glassfish-v2.1.1 installer JAR. Once
-			downloaded,install using the JAR and then run the ant setup script :
-			<programlisting>
-java -jar glassfish-installer-v2.1.1-b31g-linux.jar
-cd glassfish
-ant -f setup.xml
-</programlisting>
-		</para>
-	</section>
-	<section id="sect-glassfish-jars">
-		<title>Glassfish jars</title>
-		<para>
-			Copy the following JARs into domains/domain1/lib/ext. Note that for
-			the purposes of this example, we have copied the MySQL driver to
-			<filename>domains/domain1/lib/ext</filename>
-			:
-			<programlisting>
-antlr-2.7.6.jar
-cglib-nodep-2.1_3.jar
-commons-collections-3.2.1.jar
-commons-logging-1.1.jar
-dom4j-1.6.1.jar
-hibernate-3.2.5.ga.jar
-hibernate-annotations-3.3.0.ga.jar
-hibernate-commons-annotations-3.0.0.ga.jar
-hibernate-entitymanager-3.3.1.ga.jar
-hibernate-validator-3.0.0.ga.jar
-javassist-3.3.ga.jar
-jboss-common-core-2.0.4.GA.jar
-jta-1.0.1B.jar
-mysql-connector-java-5.0.8-bin.jar
-persistence-api-1.0.jar
-</programlisting>
-		</para>
-	</section>
-	<section id="sect-juddi-ds">
-		<title>Configure the JUDDI datasource</title>
-		<para>
-			First, using the asadmin administration tool, import the following
-			file :
-			<programlisting><xi:include href="extras/resource.xmlt"
-				parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-			<programlisting>
-	asadmin add-resources resource.xml
-	</programlisting>
-			Then use the Glassfish administration console to create a
-			"jdbc/juddiDB" JDBC datasource resource based on the mysql-pool
-			Connection Pool.
-		</para>
-	</section>
-	<section id="sect-glassfish-juddi-war">
-		<title>Add juddiv3-cxf.war</title>
-		<para>
-			Unzip the juddiv3-cxf WAR into
-			<filename>domains/domain1/autodeploy/juddiv3.war
-			</filename>
-			.
-		</para>
-		<para>
-			Add a
-			<filename>sun-web.xml</filename>
-			file into juddiv3.war/WEB-INF. Make sure that the JNDI references
-			matches the JNDI location you configured in the Glassfish
-			administration console.
-			<programlisting><xi:include href="extras/sun-web.xmlt"
-				parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-		</para>
-		<para>
-			Next, make a few changes to
-			<filename>juddiv3.war/WEB-INF/classes/META-INF/persistence.xml
-			</filename>.
-			Change the "hibernate.dialect" property to match the database that
-			you have chosen for persistence. For MySQL, change the value of
-			hibernate.dialect to "org.hibernate.dialect.MySQLDialect". A full
-			list of dialects available can be found in the hibernate
-			documentation
-			(https://www.hibernate.org/hib_docs/v3/api/org/hibernate/dialect/package-summary.html).
-			Next, change the &lt;jta-data-source&gt; change the value from java:comp/env/jdbc/JuddiDS to java:comp/env/jdbc/JuddiDB.
-
-	</para>
-
-    </section> 
-
-    <section id="sect-run">
-        <title>Run juddi</title>
-        <para>
-	Start up the server :
-	<programlisting>
-cd bin
-asadmin start-domain domain1
-        </programlisting>
-	
-	Once the server is deployed, browse to <ulink url="http://localhost:8080/juddiv3">http://localhost:8080/juddiv3</ulink>
-	</para>
-    </section>
-
-</chapter>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0833b028/docs/userguide/en-US/JBoss6Deploy.xml
----------------------------------------------------------------------
diff --git a/docs/userguide/en-US/JBoss6Deploy.xml b/docs/userguide/en-US/JBoss6Deploy.xml
deleted file mode 100644
index d780e39..0000000
--- a/docs/userguide/en-US/JBoss6Deploy.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version='1.0'?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed 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 chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- chapter: Subscription -->
-<chapter id="chap-deployjboss">
-    <title>Deploying to JBoss 6.0.0.GA</title>
-    
-    <!-- section: Introduction -->
-    <section id="sect-deployjboss">
-        <title>Introduction</title>
-        <para>
-	This section describes how to deploy juddi to JBoss 6.0.0.GA.     
-        </para>
-
-        <para>
-	First, download jboss-6.0.0.GA - the zip or tar.gz bundle may be found 
-at http://www.jboss.org/jbossas/downloads/.      Download the bundle and uncompress it.
-        </para>
-   
-    </section>
-   
-    <section id="sect-juddi-war">
-	<title>Add juddiv3.war</title>
-	<para>
-	Copy juddiv3.war to server/default/deploy and unpack it.
-	</para>
-	
-	<para>
-	Insert <filename>jboss-web.xml</filename> into the juddiv3.war/WEB-INF directory , should look like the following :
-	<programlisting><xi:include href="extras/jboss-web6.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>	
-	</para>
-    </section> 
-
-    <section id="sect-web.xml">
-	<title>Change web.xml</title>
-        <para>
-	Replace the WEB-INF/web.xml with the jbossws-native-web.xml within docs/examples/appserver.
-        </para>
-    </section>
-
-    <section id="sect-datasource">
-        <title>Configure Datasource</title>
-        <para>
-	The first step for configuring a datasource is to copy your JDBC driver into the classpath.    Copy your JDBC driver into <filename>${jboss.home.dir}/server/${configuration}/lib</filename>, where configuration is the profile you wish to start with (default, all, etc.). 
-
-	Example : 
-	<programlisting>cp mysql-connector-java-5.0.8-bin.jar /opt/jboss-5.1.0.GA/server/default/lib</programlisting> 
-        </para>
-
-        <para>
-	Next, configure a JBoss datasource file for your db.   Listed below is an example datasource for MySQL :	
-        </para>
-        <programlisting><xi:include href="extras/juddiv3-ds.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-        <para>
-	Next, make a few changes to the <filename>juddiv3.war/classes/META-INF/persistence.xml</filename>. 
-	
-	Change the "hibernate.dialect" property to match the database you have chosen for persistence.      For MySQL, change the value of hibernate.dialect to "org.hibernate.dialect.MySQLDialect".     A full list of dialects available can be found in the hibernate documentation (https://www.hibernate.org/hib_docs/v3/api/org/hibernate/dialect/package-summary.html).  
-
-	Next, change the &lt;jta-data-source&gt; tags so that it reads &lt;non-jta-data-source&gt;, and change the value from java:comp/env/jdbc/JuddiDS to java:/JuddiDS.
-        </para>
-
-    </section>
-    
-</chapter>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org