JUDDI-975 updates the site descriptor to use the maven fluidio skin, adds the jira changes plugin
diff --git a/.gitignore b/.gitignore
index 5f071fe..944a733 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@
 **/*.iml
 docs/db/ddl/*.ddl
 *.ddl
-uddi-tck/pref-rpt-*.txt
\ No newline at end of file
+uddi-tck/pref-rpt-*.txt
+nb-configuration.xml
diff --git a/pom.xml b/pom.xml
index 062de3d..b3b90d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 
     <issueManagement>
         <system>JIRA</system>
-        <url>http://issues.apache.org/jira/browse/JUDDI</url>
+        <url>https://issues.apache.org/jira/browse/JUDDI</url>
     </issueManagement>
     <ciManagement>
         <system>Buildbot</system>
@@ -348,11 +348,34 @@
                 <artifactId>maven-jxr-plugin</artifactId>
                 <version>2.5</version>
             </plugin>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
                 <version>0.11</version>
-            </plugin>
+            </plugin>-->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>3.0.5</version>
+				  <configuration>
+				  <xmlOutput>true</xmlOutput>
+				  <!-- Optional directory to put findbugs xdoc xml report -->
+				  <xmlOutputDirectory>target/site</xmlOutputDirectory>
+				</configuration>
+			  </plugin>
+			  <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changes-plugin</artifactId>
+				<version>2.12.1</version>
+				<reportSets>
+				  <reportSet>
+					<reports>
+					   <report>jira-report</report>
+					</reports>
+				  </reportSet>
+				</reportSets>
+			  </plugin>
+			  <!--
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
@@ -365,16 +388,7 @@
                     </reportSet>
                 </reportSets>
             </plugin>
-			 <plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.5</version>
-				  <configuration>
-				  <xmlOutput>true</xmlOutput>
-				  <!-- Optional directory to put findbugs xdoc xml report -->
-				  <xmlOutputDirectory>target/site</xmlOutputDirectory>
-				</configuration>
-			  </plugin>
+			 -->
         </plugins>
     </reporting>
     <modules>
@@ -681,12 +695,7 @@
             <layout>default</layout>
         </repository>
     </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>maven2-repository.dev.java.net</id>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
+  
     
     <profiles>
         <profile>
diff --git a/src/site/markdown/committers.md b/src/site/markdown/committers.md
new file mode 100644
index 0000000..b96a603
--- /dev/null
+++ b/src/site/markdown/committers.md
@@ -0,0 +1,64 @@
+Title: Commiter Notes
+
+## Updating the jUDDI Web Site
+
+The site source is located under our source tree at [juddi/src/cms-site](http://svn.apache.org/repos/asf/juddi/cms-site/). 
+
+There are two ways to edit the content for this site.
+
+ 1.  Edit the files in the Subversion repository
+ 1.  Using [Apache's CMS Bookmarklet](https://cms.apache.org/#bookmark)
+ 1.  Simply [Click here](https://cms.apache.org/redirect?uri=http://juddi.apache.org/)
+
+Once you're done making edits, commit the changes. Changes can be previewed on the [staging site](http://juddi.staging.apache.org/). If you're satisfied with the results, then publish it to the production site.
+
+Still have questions? Check out [this](http://www.apache.org/dev/cms.html), [this](http://www.apache.org/dev/cmsref.html) and [this](http://michelf.ca/projects/php-markdown/extra/).
+
+When updating javadoc or xref sections, it's easier to just use svn and commit it that way
+
+### Notes
+
+ - Each page has a 'Title' header except for the home page.
+ - Content is annotated using [Markdown](http://daringfireball.net/projects/markdown/syntax)
+ - All pages, except for the home page, using this [template](http://svn.apache.org/repos/asf/juddi/cms-site/trunk/templates/skeleton.html)
+ - The home page, uses this [template](http://svn.apache.org/repos/asf/juddi/cms-site/trunk/templates/skeletonHome.html)
+ - When updating the navigation bars (top or left hand side), edit both templates
+
+
+## Release Process
+
+### Release Manager
+
+One committer will be elected or hopefully volunteer to assemble the binary releases and label the source tree.
+
+### Digitally Signing Releases
+
+Apache policy requires binary releases be digitaly signed. The Apache process has not been formalized, but a general discussion about creating digital signatures and signing releases is available at http://nagoya.apache.org/wiki/apachewiki.cgi?SigningReleases. This covers some basics about using GnuPG to create key pairs and sign releases. Our goal here is to discuss jUDDI signing requirements, and provide some useful examples to release managers, not discuss digital signatures or encryption technology. Our discussion uses GnuPG, but any compliant software could be used. The examples below come from the GnuPG manual. This discussion is not a subsitute for reading that manual.
+
+Creating a key pair is pretty simple using gpg. Simply invoke gpg and take all the defaults when prompted. You will have to provide a passphrase. Be sure to remember the passphrase since you'll need it anytime you use the key pair. The passphrase should itself be sufficiently secure; it shouldn't simply be a word in a dictionary, should include a mix of digits and alphanumeric characters, etc.
+
+    gpg --gen-key
+        
+You should also generate a revocation certificate. This allows you to declare the key pair invalid publically, if you ever lose your private key, or it becomes compromised.
+
+    gpg --output revoke.as --gen-revoke mykey
+        
+The release manager is responsible for signing the binaries. The release manager must have a public key listed in the 'KEYS' file at the root of our source tree. The release manager must create a detached signature for each binary. This detached signature must be posted along with our binaries, and allow our users to verify the binary's integrity.
+
+    gpg --output jUDDI.tar.gzip.asc --detach-sig jUDDI.tar.gzip
+        
+All jUDDI committers are encouraged to create public/ private key pairs and place the public half into our 'KEYS' file at the root of our source tree. jUDDI committers are also encouraged to verify one another's keys and sign them, to help create a web of trust. Verifying a signature and a binary guarantees (in any real sense) the binary was assembled by the person that signed it. However, it does not prove the person signing it can be trusted. A web of trust can be created by signing one another's keys. This allows users and developers to 'trust' the person who created the document-signature pair to provide a secure, safe binary.
+
+### Release Procedure
+
+1. Ensure the build works (mvn clean install -Pdist)
+2. Grab the current version's release notes using JIRA. Goto JIRA, Versions, pick the version, then Release notes. Replace the release notes html file within the source with the contents from JIRA.
+3. mvn release:prepare -Papache-release
+4. mvn release:perform -Papache-release
+5. Sign in to Nexus and close the staging repo.
+6. Send a [VOTE] email to the dev mailing list regarding the new release.
+7. Upon a successful vote, sign in to Nexus and release the staging repo
+8. Add the release to svn https://dist.apache.org/repos/dist/release/juddi/
+9. Update the website with updated links, update source code and user documentation
+10. JIRA actions: close any tickets associated with the released version, then set the release date.
+11. Promote
diff --git a/src/site/markdown/demos.md b/src/site/markdown/demos.md
new file mode 100644
index 0000000..9f800ec
--- /dev/null
+++ b/src/site/markdown/demos.md
@@ -0,0 +1,23 @@
+Title: Demos and Videos
+
+## Introduction
+
+We've collected a number of simple videos and animations to help users new to UDDI. You will need to be able to view a SWF (Adobe Flash Player) and MP4 (such as [VLC](http://www.videolan.org/vlc/index.html)).
+
+[Getting Starte with jUDDI](demos/GettingStarted.swf)
+
+[How to Create a Business, Part 1](demos/CreateBusiness1.swf)
+
+[How to Create a Busuness, Part 2](demos/CreateBusiness2.swf)
+
+[Hello World Part 1](demos/HelloWorld.swf)
+
+[Hello World Part 2](demos/HelloWorld1.swf)
+
+[Hello World Part 3](demos/HelloWorld2.swf)
+
+[QA Process](demos/QAProcess.swf)
+
+[Simple Publisher](demos/simple-publish.swf)
+
+[Preview of the 3.2 jUDDI User Interface](demos/ConsoleDemo.mp4)
\ No newline at end of file
diff --git a/src/site/markdown/docs.md b/src/site/markdown/docs.md
new file mode 100644
index 0000000..f30433e
--- /dev/null
+++ b/src/site/markdown/docs.md
@@ -0,0 +1,14 @@
+Title: User, Admin and Developer Guides
+
+
+| Version	| Description			| Date			| Links |
+| --- 	| ---					| ---			| --- 	|
+| *		| Javadocs				| July 14, 2015		| [Javadoc](/apidocs/)
+| 3.3   | "Apache jUDDI Guide" (Admin & Server Guide)   | July 14, 2015   | [HTML](docs/3.3/juddi-guide/html), [HTML-SINGLE](docs/3.3/juddi-guide/html_single), [PDF](docs/3.3/juddi-guide/pdf/jUDDI_Guide.pdf) |
+| 3.3   | "Apache jUDDI Client and GUI Guide" (Client Dev & GUI User Guide)     | July 14, 2015   | [HTML](docs/3.3/juddi-client-guide/html), [HTML-SINGLE](docs/3.3/juddi-client-guide/html_single), [PDF](docs/3.3/juddi-client-guide/pdf/jUDDI_Guide.pdf) | 
+| 3.2   | "Apache jUDDI Guide" (Admin & Server Guide)   | Feb 5, 2014   | [HTML](docs/3.2/juddi-guide/html), [HTML-SINGLE](docs/3.2/juddi-guide/html_single), [PDF](docs/3.2/juddi-guide/pdf/jUDDI_Guide.pdf) |
+| 3.2   | "Apache jUDDI Client and GUI Guide" (Client Dev & GUI User Guide)     | Feb 5, 2014   | [HTML](docs/3.2/juddi-client-guide/html), [HTML-SINGLE](docs/3.2/juddi-client-guide/html_single), [PDF](docs/3.2/juddi-client-guide/pdf/jUDDI_Guide.pdf) | 
+| 3.1	| "Apache User Guide"	| May 20, 2013	| [HTML](docs/3.x/userguide/html), [HTML-SINGLE](docs/3.x/userguide/html_single), [PDF](docs/3.x/userguide/pdf/userguide.pdf) |
+| 3.1	| "Apache Dev Guide" 	| May 20, 2013	| [HTML](docs/3.x/devguide/html), [HTML-SINGLE](docs/3.x/devguide/html_single), [PDF](docs/3.x/devguide/pdf/devguide.pdf) | 
+| 2.x	| User Guide			| Jun 1, 2005	| [HTML](usersguide.html) |
+| 2.x   | Javadocs			| June 1, 2005	| [Javadoc](/apidocs2) 
diff --git a/src/site/markdown/favicon.ico b/src/site/markdown/favicon.ico
new file mode 100644
index 0000000..161bcf7
--- /dev/null
+++ b/src/site/markdown/favicon.ico
Binary files differ
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
new file mode 100644
index 0000000..6ebb396
--- /dev/null
+++ b/src/site/markdown/index.md
@@ -0,0 +1,111 @@
+## Introduction
+jUDDI (pronounced "Judy") is an open source Java implementation of [OASIS](https://www.oasis-open.org) the [Universal Description, Discovery, and Integration (UDDI)](https://www.oasis-open.org/standards#uddiv3.0.2) specification for (Web) Services. The jUDDI project includes [Scout](http://projects.apache.org/projects/scout.html). Scout is an implementation of the [JSR 93 - JavaTM API for XML Registries 1.0 (JAXR)](https://jcp.org/en/jsr/detail?id=93).
+
+## Features
+ - Open Source
+ - Platform Independent
+ - Use with any relational database that supports ANSI standard SQL (MySQL, Oracle, DB2, Sybase, Derby etc.)
+ - Deployable on any Java application server that supports the Servlet 2.3 specification
+ - jUDDI registry supports a clustered deployment configuration.
+ - Easy integration with existing authentication systems
+ - Supports InVM embeddable mode
+
+## jUDDIv3 Services
+
+ - UDDI Specification version [3.0.2](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm) compliant
+ - UDDI Specification version [2.0.4](http://uddi.org/pubs/ProgrammersAPI-V2.04-Published-20020719.htm) interoperability services (BETA)
+ - JDK 1.6 Recommended
+ - Built on [JAXB](https://jcp.org/en/jsr/detail?id=222) and [JAX-WS](https://jcp.org/en/jsr/detail?id=224) standardized interfaces, tested on [Apache CXF](http://cxf.apache.org)
+ - Built on JPA standardized interfaces, tested with [Apache OpenJPA](http://openjpa.apache.org/) and [Hibernate](http://hibernate.org/)
+ - Pre-configured bundle deployed to [Apache Tomcat](http://tomcat.apache.org/)
+ - Full featured user interface (based on [Bootstrap](http://getbootstrap.com/2.3.2/))
+ - Pre-configured portal bundle download (up to v3.1.5)
+ - User, Administrative and Developer Documentation
+ - Includes extensive predefined tModels, such as [Quality of Service Metrics](https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc)
+
+## UDDIv3 API Client Libraries
+
+ - Java using JRE 1.6
+ - .NET using Microsoft.NET Framework v3.5 (since jUDDI 3.2)
+ - Developer Documentation, Examples
+ - Digital Signature support
+ - Asynchronous Subscription support
+ - Implements [Using WSDL in a UDDI Registry](https://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm)
+ - Provides a UDDI v3 Technology Compatibility Kit (Java only)
+ - Provides backwards compatibility with UDDIv2 endpoints using the v3 API Set (Java only)
+ - Java based Command Line Interface client
+
+## jUDDIv2 Services
+
+ - UDDI version [2.0](https://www.oasis-open.org/standards#uddiv2) compliant
+ - Supports for JDK 1.3.1 and later
+
+## News
+
+Feb 11, 2017, jUDDI Release 3.3.4
+
+Sept 12, 2016, jUDDI Release 3.3.3
+
+Nov 10, 2015 jUDDI Release 3.3.2
+
+Oct 5, 2015 jUDDI Release 3.3.1
+
+July 15, 2015 jUDDI Release 3.3.0
+
+Dec 5, 2014 jUDDI Release 3.2.1
+
+Feb 5, 2014 jUDDI Release 3.2.0, Migration from SVN to GIT
+
+Jan, 2014 Happy New Year! Web site updated
+
+May, 2013 jUDDI Release 3.1.5
+
+Dec, 2012 Don't forget to check out the [jUDDI Blog](http://apachejuddi.blogspot.com/)
+
+Mar, 2012 Scout Release 1.2.6
+
+Nov, 2010 Release 3.0.4
+
+Aug, 2010 jUDDI and Scout are promoted to Top Level Project named jUDDI
+
+May, 2010 Release 3.0.2
+
+Oct 26, 2009 Release 3.0.0
+
+Aug 11, 2009 [Release 2.0](http://apachejuddi.blogspot.com/2009/07/release-juddi-v2-thank-you-steve-viens.html) and 2.0.1
+
+June 5, 2009 Release 3.0.0.beta
+
+May 31, 2009 Release 2.0rc7
+
+Feb 13, 2009 Version 3.0.0.alpha is now available
+
+Feb 10, 2009 Version 2.0rc6 is now available.
+
+Dec 13, 2007 Version 2.0rc5 is now available.
+
+June 7, 2005 Version 0.9rc4 is now available.
+
+July 2, 2004 Version 0.9rc3 is now available.
+
+June 29, 2004 Version 0.9rc2 is now available.
+
+June 16, 2004 Version 0.9rc1 is now available.
+
+March 24, 2004 jUDDI graduates from the Apache Incubator into Apache Web Services Project.
+
+Oct 08, 2003 The Apache Software Foundation's Web Services PMC (http://ws.apache.org/) voted to accept jUDDI into the Apache Incubator. The move is expected to be complete in early December.
+
+July 22, 2003 A proposal to contribute jUDDI to the Apache Software Foundation's Web Services Project is being considered.
+
+July 22, 2003 Version 0.8.0 is now available.
+
+June 27, 2003 Version 0.7.1 is now available.
+
+April 22, 2003 Version 0.7.0 is now available.
+
+## About UDDI
+
+The Universal Description, Discovery and Integration (UDDI) protocol is one of the major building blocks required for successful Web services. UDDI creates a standard interoperable platform that enables companies and applications to quickly, easily, and dynamically find and use Web services over the Internet. UDDI also allows operational registries to be maintained for different purposes in different contexts. UDDI is a cross-industry effort driven by major platform and software providers, as well as marketplace operators and e-business leaders within the OASIS standards consortium.
+
+Additional information regarding UDDI can be found at [uddi.xml.org](http://uddi.xml.org/).
diff --git a/src/site/markdown/integration.md b/src/site/markdown/integration.md
new file mode 100644
index 0000000..3325741
--- /dev/null
+++ b/src/site/markdown/integration.md
@@ -0,0 +1,32 @@
+Title: Continuous Integration
+
+## Overview
+
+This project uses [Maven](http://maven.apache.org/) in conjunction with the [BuildBot](http://buildbot.net/) Continuous Integration System which is maintained by the Apache Software Foundation.
+
+## Build Configurations
+
+For a list of all the current build configurations, visit [this link](http://ci.apache.org/builders).
+
+jUDDI currently builds with the following configuration matrix.
+
+| JPA Provider	|	JDK			| Operating System 	| .NET Runtime		| Application Container	| SOAP Framework |
+| --- 			| ---			| ---				| ---				| ---					| ---			 |
+| OpenJPA		| OpenJDK 6		| Ubuntu			| Microsoft.NET 3.5	| Apache Tomcat 6.x		| Apache CXF	 |
+| Hibernate		| Oracle JDK 6	| Windows 7			| Mono	3.x			| Apache Tomcat 6.x		| .NET WCF, .NET ASP.NET |
+
+## Access
+
+The following is a link to the continuous integration system used by the project.
+
+ - [http://ci.apache.org/buildbot.html](http://ci.apache.org/buildbot.html)
+
+## Notifiers
+
+### Email
+
+Configuration for notifying developers/users when a build is unsuccessful, including user information and notification mode is done via the [development mailing list](mailing-list.html).
+
+### IRC
+
+The jUDDI project also employs the BuildBot's IRC bot, which enables us to trigger builds manually and to make alterations to the build process.
\ No newline at end of file
diff --git a/src/site/markdown/issue-tracking.html b/src/site/markdown/issue-tracking.html
new file mode 100644
index 0000000..926ffeb
--- /dev/null
+++ b/src/site/markdown/issue-tracking.html
@@ -0,0 +1,15 @@
+<html>
+<head
+<meta http-equiv="refresh" content="1; url=http://issues.apache.org/jira/browse/JUDDI" />
+<script type="text/javascript">
+	window.location.href="http://issues.apache.org/jira/browse/JUDDI";
+</script>
+</head>
+<body>
+Redirecting...
+<br><br>
+Click this link if this takes too long...
+<a href="http://issues.apache.org/jira/browse/JUDDI">
+http://issues.apache.org/jira/browse/JUDDI
+</a>. 
+</html>
diff --git a/src/site/markdown/legal.md b/src/site/markdown/legal.md
new file mode 100644
index 0000000..42e8dc4
--- /dev/null
+++ b/src/site/markdown/legal.md
@@ -0,0 +1,7 @@
+Title: Legal Information
+
+## jUDDI - Legal Stuff
+
+All material on this website is Copyright © 1999-2017, The Apache Software Foundation.
+
+Sun, Sun Microsystems, Solaris, Java, JavaServer Web Development Kit, and JavaServer Pages are trademarks or registered trademarks of Sun Microsystems, Inc. UNIX is a registered trademark in the United States and other countries, exclusively licensed through X/Open Company, Ltd. Windows, WindowsNT, and Win32 are registered trademarks of Microsoft Corp. All other product names mentioned herein and throughout the entire web site are trademarks of their respective owners.
\ No newline at end of file
diff --git a/src/site/markdown/library.md b/src/site/markdown/library.md
new file mode 100644
index 0000000..da83410
--- /dev/null
+++ b/src/site/markdown/library.md
@@ -0,0 +1,142 @@
+Title: UDDI Library
+## Introduction
+
+The jUDDI Project lives or fails based on its human resources. Users and contributors alike help the project with ideas and brainpower. A common foundation of knowledge is required to effectively participate in this virtual community. The following is a list of documents that we have found helpful for us and may be helpful to you.
+
+## UDDI Specifications
+
+[UDDI.org](http://uddi.xml.org/)
+
+[UDDI Version 1.0 Specification](http://www.oasis-open.org/committees/uddi-spec/doc/contribs.htm#uddiv1)
+
+[UDDI Version 2.0 Specification](http://www.oasis-open.org/committees/uddi-spec/doc/contribs.htm#uddiv2)
+
+[UDDI Version 3.0 Specification](http://www.oasis-open.org/committees/uddi-spec/doc/contribs.htm#uddiv3)
+
+## UDDI Taxonomies
+
+[North American Industry Classification System (NAICS)](http://www.census.gov/epcd/www/naics.html)
+
+U.S. Census Bureau
+
+[United Nations Standard Products and Services Code System (UNSPSC) Version 3.1](http://www.unspsc.org/Defaults.asp)
+
+U.S. Census Bureau
+
+## Articles, Tutorials and Best Practices
+
+[O'Reilly Java WebServices Chapter 6: "UDDI: Universal Description, Discovery, and Integration"](http://oreilly.com/catalog/javawebserv/chapter/ch06.html)
+
+Tyler Jewell and David Chappell
+
+[Best practices for Web services versioning](http://www-106.ibm.com/developerworks/webservices/library/ws-version/)
+
+Keep your Web services current with WSDL and UDDI
+
+Kyle Brown and Michael Ellis, IBM developerWorks
+
+January 2004
+
+
+[Using WSDL in a UDDI Registry](http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm)
+
+John Colgrave and Karsten Januszewski, UDDI.org
+
+November 2003
+
+
+[Registration and Discovery of Web Services Using JAXR with XML Registries such as UDDI and ebXML](http://java.sun.com/developer/technicalArticles/WebServices/jaxrws/)
+
+The why and what of the new approach
+
+Qusay H. Mahmoud, Sun Microsystems
+
+June 2002
+
+
+[A New Approach to UDDI and WSDL Part 1](http://www-106.ibm.com/developerworks/webservices/library/ws-udmod1/)
+
+The why and what of the new approach
+
+John Colgrave, IBM developerWorks
+
+August 2003
+
+
+[A New Approach to UDDI and WSDL Part 2](http://www-106.ibm.com/developerworks/webservices/library/ws-udmod2/)
+
+Usage scenarios in publishing and finding WSDL service descriptions
+
+John Colgrave, IBM developerWorks
+
+September 2003
+
+
+[Understanding WSDL in a UDDI Registry Part 1](http://www.ibm.com/developerworks/webservices/library/ws-wsdl/)
+
+How to publish and find WSDL service descriptions
+
+Peter Brittenham, Francisco Cubera, Dave Ehnebuske, Steve Graham, IBM developerWorks
+
+September 2001 (updated September 2002)
+
+
+[Understanding WSDL in a UDDI Registry Part 2](http://www.ibm.com/developerworks/webservices/library/ws-wsdl2/)
+
+How to publish and find WSDL service descriptions
+
+Peter Brittenham, Francisco Cubera, Dave Ehnebuske, Steve Graham, IBM developerWorks
+
+September 2001 (updated September 2002)
+
+
+[Understanding WSDL in a UDDI Registry Part 3](http://www.ibm.com/developerworks/webservices/library/ws-wsdl3/)
+
+How to publish and find WSDL service descriptions
+
+Peter Brittenham, IBM developerWorks
+
+November 2001
+
+
+[Providing a Taxonomy for Use in UDDI Version 2](http://www.uddi.org/pubs/TN-taxonomy-provider-V1.00-Final-20010717.pdf)
+
+UDDI.org
+
+July 2001
+
+
+[The Role of Taxonomies in UDDI: tModels Demystified](http://www.developer.com/services/article.php/1367781)
+
+Ravi Trivedi, Developer.com
+
+
+[Versioning of Web Services: An UDDI Subscription-Based Approach](http://www.developer.com/services/article.php/3374631)
+
+Aravilli Srinivasa Rao, Developer.com
+
+
+## Related Specifications
+
+[SOAP W3C Specification](http://www.w3.org/TR/SOAP/)
+
+[Web Services Description Language (WSDL) 1.1](http://www.w3c.org/TR/wsdl.html)
+
+[Java API for XML Registries (JAXR)](http://java.sun.com/xml/jaxr/)
+
+## Other Resources
+
+[The Java Language Specification](http://java.sun.com/docs/books/jls/index.html)
+
+Written by the creators of the Java Programming Language, this online book is considered by many to be the bible for programming in Java. A must read.
+
+
+[Javadoc](http://java.sun.com/products/jdk/javadoc/index.html)
+
+Javadoc is the automatic software documentation generator used by Java since it was first released. All code written for this project must be documented using Javadoc conventions.
+
+
+[The Java Code Conventions](http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html)
+
+This Sun document specifies the de-facto standard way of formatting Java code. All code written for this project must follow these conventions.
+
diff --git a/src/site/markdown/participation.md b/src/site/markdown/participation.md
new file mode 100644
index 0000000..b326828
--- /dev/null
+++ b/src/site/markdown/participation.md
@@ -0,0 +1,59 @@
+Title: Participation
+
+## Introduction
+
+Every volunteer project obtains its strength from the people involved in it. We invite you to participate as much or as little as you choose. The roles and responsibilities that people can assume in the project are based on merit. Everybody's input matters!
+
+There are a variety of ways to participate. Regardless of how you choose to participate, we suggest you join some or all of our mailing lists.
+
+## Use the Products & Give Us Feedback
+
+Using the products,reporting bugs, making feature requests, etc. is by far the most important role. It's your feedback that allows the technology to evolve.
+
+ - Join Mailing Lists
+ - [Download Binary Builds](releases.html)
+ - [Report Bugs & Request New Features](https://issues.apache.org/jira/browse/JUDDI)
+
+## Contribute Code or Documentation Patches
+
+In this role, you participate in the actual development of the code. If this is the type of role you'd like to play, here are some steps (in addition to the ones above) to get you started:
+
+ - Read Mailing List Guidelines
+ - Review Reference Library
+ - [Get the Source Code](source.html)
+  
+Any and all new development or bug fixing uses the latest code base. If you have a patch, it should be submitted against the latest available code.
+
+### Coding Standards
+
+Here's some basic coding standards that are followed for jUDDI's code base.
+ 
+ - Tab sizes, 8 spaces
+ - Document formatting - use your IDE's auto format feature to automatically format documents
+ - Documentation
+   - Java
+     - Use javadoc style documentation for Java code
+     - Mandatory documentation on all public methods and constants
+     - Mandatory documentation on each class.
+     - Include @author, @since, and @see as often as possible
+     - Include email address with @author
+	 - Include sample code where appropriate
+	 - Use HTML formatting to aid readability
+   - .NET
+     - Use .NET style documentation when possible
+	 - For ported Java code, javadoc style documentation is acceptable
+	 - Use standard .NET tab sizes
+
+## Getting Support on the Lists
+
+We do all development and bug fixing on the latest available code base. If you've encountered what you think is a bug, please first check the [issues database](https://issues.apache.org/jira/browse/JUDDI) for known issues. If you can't find your bug, make sure you're using the latest code base. We are not able to fix bugs on earlier code bases.
+
+Please include any relevant version information and the error message text, if there is one. If you have a problem with a specific interface, like find_business, you'll likely be asked to post a log of the SOAP message exchanges between your client and the jUDDI server. You can use the [Apache TCPMon](http://ws.apache.org/tcpmon/) tool to capture these messages.
+
+Remember, Apache helps those that help themselves. Please take a look at Eric S. Raymond's and Rick Moen's explanation of [How to Ask Questions The Smart Way](http://www.catb.org/~esr/faqs/smart-questions.html).
+
+## jUDDI Wiki
+
+Like other Apache projects, jUDDI maintains a wiki, a sort of virtual meeting place for the jUDDI community. This is a resource available to everyone, and you are encouraged to contribute. This is a good resource for 'HowTos' for common configuration issues.
+
+ - [http://wiki.apache.org/juddi](http://wiki.apache.org/juddi)
\ No newline at end of file
diff --git a/src/site/markdown/releases.md b/src/site/markdown/releases.md
new file mode 100644
index 0000000..fd595de
--- /dev/null
+++ b/src/site/markdown/releases.md
@@ -0,0 +1,30 @@
+Title: Downloads and Releases
+
+## Official Releases
+
+| Name 																| Date  		| Description  			|
+| ---				| --- | --- |										
+| [3.3.4](http://www.apache.org/dyn/closer.cgi/juddi/juddi/3.3.4/)  | Feb 11, 2017   | Stable 3.3.4 Release  |		| 
+| [Older releases](http://archive.apache.org/dist/juddi/)		    | 			  	| Archived Releases  	|
+
+
+## Maven Artifacts
+
+ - Maven Group ID: org.apache.juddi
+
+| Artifact ID		| Description	|
+| ---				| ---			|
+| juddi-client 		| Java client code base (it's not just a wsimport!)							| 
+| uddi-ws			| Generated code from UDID wsdls, plus some tweaking						| 
+| juddi-core 		| This is the where the UDDI web services are implemented for Hibernate		| 
+| juddi-core-openjpa	| This is the where the UDDI web services are implemented for OpenJPA	| 
+| juddi-rest-cxf		| REST style interfaces for UDDI and then some							| 
+| uddi-tck			| JUnit tests for UDDI TCK													| 
+| uddi-tck-base		| Common functions for testing that's used from juddi-core and uddi-tck		| 
+| juddi-client-extras| SAP Registry JAXWS Transport adapter										| 
+| juddi-examples		| Example Code															| 
+| juddi-more-samples	| Even more samples														| 
+| juddi-gui			| A web application for interacting with UDDI								| 
+| juddi-migration-tool	| A tool for importing and exporting UDDI content						| 
+| juddi-tck-runner	| A CLI app to run the uddi-tck tests										| 
+| juddi-gui-war		| A UDDI end user web application											| 
diff --git a/src/site/markdown/security.md b/src/site/markdown/security.md
new file mode 100644
index 0000000..348d752
--- /dev/null
+++ b/src/site/markdown/security.md
@@ -0,0 +1,32 @@
+Title: Security Advisories
+
+## Security Advisories for Apache jUDDI
+
+### CVEID:CVE-2015-5241
+
+VERSION: 3.1.2, 3.1.3, 3.1.4, and 3.1.5 that utilize the portlets based user interface also known as 'Pluto', 'jUDDI Portal', 'UDDI Portal' or 'uddi-console'
+
+PROBLEMTYPE: Open Redirect
+
+REFERENCES: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2015-5241
+
+DESCRIPTION: After logging into the portal, the logout jsp page redirects the browser back to the login page after. It is feasible for malicious user to redirect the browser to an unintended web page. User session data, credentials, and auth tokens are cleared before the redirect.
+
+Mitigations:
+
+ 1) Remove or disable the portlet's based user interface. 
+ 2) Upgrade to newer versions of jUDDI (v3.2 and newer) which is not affected by this issue
+ 3) If upgrading or disabling the portlet based user interface is not an option, the following can be used to resolve the issue. Modify the file located at "uddi-portlets/logout.jsp", replacing the following text
+ 
+````
+   "String redirectURL = (String) request.getParameter("urlredirect");
+   if (redirectURL==null) redirectURL = "/pluto/Logout";
+````
+
+with this text
+
+````
+    String redirectURL = "/pluto/Logout";
+````
+
+No patches or releases are planned for the affected versions since jUDDI v3.2 replaced the user interface.
diff --git a/src/site/markdown/source.md b/src/site/markdown/source.md
new file mode 100644
index 0000000..cdb9b30
--- /dev/null
+++ b/src/site/markdown/source.md
@@ -0,0 +1,39 @@
+Title: Source Code
+
+## Overview
+
+This project uses Git to manage its source code. Instructions on Subversion use can be found at http://git-scm.com/.
+Web Access
+
+The following is a link to the view online source repository.
+
+    [https://git-wip-us.apache.org/repos/asf?p=juddi.git;a=summary)]
+	
+### Developer access
+
+Everyone can access the Git repository via HTTP, but Committers must checkout the Subversion repository via HTTPS.
+
+    $ git clone https://git-wip-us.apache.org/repos/asf/juddi.git
+	
+To commit changes to the repository, execute the following command to commit your changes (git will prompt you for your password)
+
+    $ git commit  .
+
+Please append comments using the following format:
+
+	JUDDI-1234 A description of the change(s)
+	JUDDI-689 A description of the change(s)
+	
+This will auto link the commit with the JIRA tickets
+	
+If you already are a Apache committer, then you can use push to synch your local changes to the main source repository. (You did remember to run ALL the tests before committing? mvn clean install -Pdist)
+
+	$ git push
+		
+### Access through a proxy
+
+The Git client can go through a HTTP proxy, if you configure it to do so. 
+
+	$ git config --global http.proxy (server)
+
+See the [http://git-scm.com/docs](Manual) for more information.
\ No newline at end of file
diff --git a/src/site/markdown/thanks.md b/src/site/markdown/thanks.md
new file mode 100644
index 0000000..7120b07
--- /dev/null
+++ b/src/site/markdown/thanks.md
@@ -0,0 +1,18 @@
+Title: Sponsors
+
+## Donated Software Licenses
+
+The jUDDI Project uses a few commercial products in the development process. We are grateful for the community licenses which were provided to the project at no costs.
+
+## JIRA
+
+Bug and issue tracker [Jira by Atlassion](http://www.atlassian.com/software/jira/).
+
+## JProfiler
+
+Java profiler [JProfiler by ej-technologies.](http://www.ej-technologies.com/products/jprofiler/overview.html)
+
+## XLT
+
+Xceptance LoadTest (XLT) for both regression as well as load tests by [Global Quality Partners, LLC](http://www.gqpartners.com/) and [Xceptance Software Technologies, Inc](http://www.xceptance.com/). Load and performance tests were created and executed by our sponsors using Xceptance LoadTest (XLT) from Xceptance Software Technologies, Inc., of which Global Quality Partners, LLC is the exclusive North American distributor. To enable the Apache jUDDI project to continue and extend these tests, Xceptance has provided an unlimited XLT license and donated the source code of the test suite to the Apache jUDDI project. XLT is built and scripted in pure Java, providing a highly scalable and easily adaptable technology that can be used across development, quality assurance, and consulting teams.
+Copyright © 2004-2013 The Apache Software Foun
\ No newline at end of file
diff --git a/src/site/markdown/uddi.md b/src/site/markdown/uddi.md
new file mode 100644
index 0000000..a976c17
--- /dev/null
+++ b/src/site/markdown/uddi.md
@@ -0,0 +1,73 @@
+Title: Supported UDDI APIs and Functions
+
+The following is a list of all supported UDDI interfaces.
+
+| API																							| Spec 			| Supported 		| Notes | 
+| --- 																							| --- 			|--- 			| ---	|
+|[Inquiry](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908076) 							| Required		| All Methods	|		|
+|[Inquiry HTTP GET](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908158)					| Optional		| All Methods	| Plus a number of additional methods |
+|[Publication](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908095) 						| Required		| All Methods	| |
+|[Security](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908115) 						| Optional		| All Methods 	| Pluggable authentication |
+|[Subscription](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908128)						| Optional		| All Methods 	| HTTP, SMTP delivery implemented, pluggable			|
+|[Subscription Listener](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908336)			| Optional		| All Methods	| Client and Server side implementations |
+|[Value Set Caching](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908141)				| Optional		| Partial		| Since 3.3 |
+|[Value Set Validation](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908141)				| Optional		| Implemented	| Since 3.3 |
+|[Replication](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908180)						| Optional		| All Methods	| Since 3.3 |
+|[Custody and Ownership Transfer](http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908118)	| Optional		| All Methods	| Since 3.3, full support |
+
+
+The following is a list of other features of interest
+
+| API								| Spec	| Supported 	| Notes | 
+| --- 								| --- 			| --- 		| ---	|
+|Digital Signatures					| Server req	| Full support | Java and .NET clients and in browser signing	|
+|Client side Subscription Listener	| Optional		| Full support | Java and .NET clients	|
+|WSDL to UDDI						| Recommendation| Full support | [1](https://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm) Java, .NET clients and web GUI |
+|WADL to UDDI						| Recommendation| Full support | [1](https://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm) Java, .NET clients and web GUI |
+|BPEL to UDDI						| Recommendation| Full support | [2](https://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-bpel-20040725.htm) Java client | 
+|UDDI Technical Compliance Kit		| -				| Full support | Provides a standalone UDDI testing capability |
+|Internationalization				| Recommendation| Yes		   | Both end user interfaces (User and Admin web apps) are supported. Error messages from the server are externaliws and can be overwritten.
+|Replication Two Stage Commit 		| Server Optional | No | The [spec](http://www.uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Ref8979261) talks about a Conditional New Data message.
+|UDDI Policy						| Recommendation| No | The [spec](http://www.uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc85908203) 
+
+Supported Sort Orders
+
+| Find Qualifier		| Spec		| Supported 	| Notes | 
+| --- 					| ---			| --- 		| ---	|
+| binarySort			| Required 	| yes |  |
+| caseInsensitiveSort	| Required 	| no | [JIRA discussion](https://issues.apache.org/jira/browse/JUDDI-785) |
+| caseSensitiveSort		| Required 	| yes | |
+| sortByNameAsc			| Required 	| yes | |
+| sortByNameDesc		| Required 	| yes | |
+| sortByDateAsc			| Required 	| yes | |
+| sortByDateDesc		| Required 	| yes | |
+| JIS-X4061				| Optional 	| no  | Japanese Character Strings|
+
+Supported Find Qualifiers
+
+| Find Qualifier			| Spec			|Supported 	| Notes | 
+| --- 						| --- 			| --- 		| ---	|
+| andAllKeys				| Required 		| yes | |
+| approximateMatch			| Required 		| yes | |
+| bindingSubset				| Required 		| yes | |
+| caseInsensitiveMatch		| Required 		| yes | |
+| caseSensitiveMatch		| Required 		| yes | |
+| combineCategoryBags		| Required 		| yes | |
+| diacriticInsensitiveMatch	| Optional 		| yes | |
+| diacriticSensitiveMatch	| Required 		| yes | |
+| exactMatch				| Required 		| yes | |
+| signaturePresent			| Required 		| yes | |
+| orAllKeys					| Required 		| yes | |
+| orLikeKeys				| Required 		| yes | |
+| serviceSubset				| Required 		| yes | |
+| suppressProjectedServices	| Required 		| yes | |
+| UTS-10					| Recommended 	| yes | |
+
+
+Supported Authentication Mechanisms
+
+ - Username/Password via Security API/Auth Token
+	- LDAP
+	- Clear text password file
+	- Encrypted password file
+	- JBoss container based
diff --git a/src/site/markdown/who.md b/src/site/markdown/who.md
new file mode 100644
index 0000000..fe8c79f
--- /dev/null
+++ b/src/site/markdown/who.md
@@ -0,0 +1,7 @@
+Title: Who We Are
+
+
+The jUDDI Project operates on a meritocracy: the more you do, the more responsibility you will obtain. This page lists all of the people who have gone the extra mile and are Committers. If you would like to get involved, the first step is to join the mailing lists.
+
+We ask that you please do not send us emails privately asking for support. We are non-paid volunteers who help out with the project and we do not necessarily have the time or energy to help people on an individual basis. Instead, we have setup mailing lists which often contain hundreds of individuals who will help answer detailed requests for help. The benefit of using mailing lists over private communication is that it is a shared resource where others can also learn from common mistakes and as a community we all grow together.
+
diff --git a/src/site/resources/images/apache_feather.gif b/src/site/resources/images/apache_feather.gif
new file mode 100644
index 0000000..226e00b
--- /dev/null
+++ b/src/site/resources/images/apache_feather.gif
Binary files differ
diff --git a/src/site/resources/images/asf_logo.png b/src/site/resources/images/asf_logo.png
new file mode 100644
index 0000000..b20bb7f
--- /dev/null
+++ b/src/site/resources/images/asf_logo.png
Binary files differ
diff --git a/src/site/resources/images/jUDDIbyKimWood300x300ish.png b/src/site/resources/images/jUDDIbyKimWood300x300ish.png
new file mode 100644
index 0000000..965f1fb
--- /dev/null
+++ b/src/site/resources/images/jUDDIbyKimWood300x300ish.png
Binary files differ
diff --git a/src/site/resources/images/juddi_logo_v2.png b/src/site/resources/images/juddi_logo_v2.png
new file mode 100644
index 0000000..8d39a80
--- /dev/null
+++ b/src/site/resources/images/juddi_logo_v2.png
Binary files differ
diff --git a/src/site/resources/images/logo.png b/src/site/resources/images/logo.png
new file mode 100644
index 0000000..6a6b975
--- /dev/null
+++ b/src/site/resources/images/logo.png
Binary files differ
diff --git a/src/site/resources/images/logo2.png b/src/site/resources/images/logo2.png
new file mode 100644
index 0000000..db14f44
--- /dev/null
+++ b/src/site/resources/images/logo2.png
Binary files differ
diff --git a/src/site/site.xml b/src/site/site.xml
index dc158c2..7ae9568 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -20,79 +20,86 @@
 
 <project name="Apache jUDDI">
 
-    <bannerLeft>
-        <name>Apache jUDDI</name>
-        <src>images/project-logo.gif</src>
-        <href>juddi.apache.org</href>
-    </bannerLeft>
-    <bannerRight>
-    <src>images/juddi.gif</src>
-  </bannerRight>
-		<skin>
+	<version position="right"/>
+	<bannerLeft>
+		<name>Apache jUDDI</name>
+		<src>images/logo.png</src>
+		<href>http://juddi.apache.org</href>
+	</bannerLeft>
+	<bannerRight>
+		<src>images/apache_feather.gif</src>
+	</bannerRight>
+	<skin>
 		<groupId>org.apache.maven.skins</groupId>
 		<artifactId>maven-fluido-skin</artifactId>
 		<version>1.6</version>
-	  </skin>
+	</skin>
 
-    <publishDate format="dd MMM yyyy" position="right"/>
-	 <custom>
-    <fluidoSkin>
-		<googleSearch>
-			<sitesearch/>
-		  </googleSearch>
-		   <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-		   <gitHub>
-			<projectId>apache/maven-skins</projectId>
-			<ribbonOrientation>right</ribbonOrientation>
-			<ribbonColor>black</ribbonColor>
-		  </gitHub>
-		  <topBarEnabled>false</topBarEnabled>
-		  <sideBarEnabled>true</sideBarEnabled>
-    </fluidoSkin>
-  </custom>
-  
-  
-    <body>
-        <breadcrumbs>
-      		<item name="Apache" href="http://www.apache.org/"/>
-    	</breadcrumbs>
+	<publishDate format="dd MMM yyyy" position="right"/>
+	<custom>
+		<fluidoSkin>
+			<googleSearch>
+				<sitesearch/>
+			</googleSearch>
+			<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+			<gitHub>
+				<projectId>apache/maven-skins</projectId>
+				<ribbonOrientation>right</ribbonOrientation>
+				<ribbonColor>black</ribbonColor>
+				<projectId>apache/juddi</projectId>
+			</gitHub>
+			<topBarEnabled>true</topBarEnabled>
+			<sideBarEnabled>true</sideBarEnabled>
+		</fluidoSkin>
+	</custom>
 
-        <menu name="Apache jUDDI">
-            <item name="Welcome" href="index.html"/>
-            <item name="Get jUDDI">
-                <item name="Releases" href="releases.html"/>
-                <item name="Source Code" href="source-repository.html"/>
-            </item>
-            <item name="Participation" href="participate.html" />
-            <item name="Documentation">
-                <item name="jUDDI Docs" href="docs.html"/>
-                <item name="Wiki" href="http://wiki.apache.org/juddi"/>
-                <item name="UDDI Library" href="library.html" />
-                <item name="Javadocs v2" href="apidocs2/index.html"/>
-                <item name="Javadocs v3" href="apidocs/index.html"/>
-                <item name="XRef v3" href="xref/index.html"/>
-            </item>
-            <item name="Project Information">
-                <item name="Project Information" href="project-info.html"/>
-                <item name="Mailing Lists" href="mail-lists.html"/>
-                <item name="jUDDI Blog" href="http://apachejuddi.blogspot.com/" />
-                <item name="Issue Tracking" href="issue-tracking.html"/>
-                <item name="Dependencies" href="dependencies.html"/>
-                <item name="Project Team" href="team-list.html"/>
-                <item name="Project Summary" href="project-summary.html"/>
-            </item>
-            <item name="Subprojects">
-    			<item name="Apache Scout" href="http://juddi.apache.org/scout/" />
-  			</item>
-  			<item name="Misc">
-    			<item name="Who We Are" href="who.html"/>
-    			<item name="Committer Notes" href="committers.html" />
-    			<item name="Sponsors" href="thanks.html"/>
-    			<item name="Legal" href="legal.html" />
-    			<item name="License" href="license.html" />
-  			</item>
-        </menu>
 
-    </body>
+	<body>
+		<breadcrumbs>
+			<item name="Apache" href="http://www.apache.org/"/>
+		</breadcrumbs>
+		<menu name="Apache jUDDI">
+			<item name="Welcome" href="index.html"/>
+			<item name="Live Demos">
+				<item name="Prod UI" href="http://uddi-jbossoverlord.rhcloud.com/"/>
+				<item name="Prod SVC" href="http://uddi-jbossoverlord.rhcloud.com/juddiv3/"/>
+				<item name="Sandbox UI" href="http://uddiconsole-jbossoverlord.rhcloud.com/" />
+				<item name="Sandbox SVC" href="http://uddiconsole-jbossoverlord.rhcloud.com/juddiv3/"/>
+			</item>
+		</menu>
+		<menu name="Downloads">
+			<item name="Releases" href="releases.html"/>
+			<item name="Source Code" href="source-repository.html"/>
+		</menu>
+
+
+
+		<menu name="Documentation">
+
+			<item name="jUDDI Docs" href="docs.html"/>
+			<item name="Wiki" href="http://wiki.apache.org/juddi"/>
+			<item name="UDDI Library" href="library.html" />
+			<item name="Javadocs v2" href="apidocs2/index.html"/>
+			<item name="Javadocs v3" href="apidocs/index.html"/>
+			<item name="XRef v3" href="xref/index.html"/>
+			<item name="jUDDI Blog" href="http://apachejuddi.blogspot.com/" />
+		</menu>
+
+		<menu name="Subprojects">
+			<item name="Apache Scout" href="http://juddi.apache.org/scout/" />
+		</menu>
+		<menu name="Misc">
+			<item name="Participation" href="participation.html" />
+			<item name="Who We Are" href="who.html"/>
+			<item name="Committer Notes" href="committers.html" />
+			<item name="Sponsors" href="thanks.html"/>
+			<item name="Legal" href="legal.html" />
+			<item name="License" href="license.html" />
+		</menu>
+
+		<menu ref="parent" inherit="top"/>
+		<menu ref="modules" />
+		<menu ref="reports"  inherit="top"/>
+	</body>
 </project>
 
diff --git a/src/site/xdoc/committers.xml b/src/site/xdoc/committers.xml
deleted file mode 100644
index 70fdc96..0000000
--- a/src/site/xdoc/committers.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
-  <properties>
-    <title>Committer Notes</title>
-  </properties>
-  <body>
-    <section name="Updating the jUDDI Web Site">
-      <p>
-       The site source is located under our source tree at juddi/src/site. To build the site, simply invoke
-        mvn site in juddi/site. The built sources will be located at juddi/target/site. You should
-        get a clean build, and no broken links. There aren't any known issues with the site.
-        </p>
-        <p>
-        You must test your builds locally by running mvn site on your local box. You can do this by invoking
-        'mvn site' in the juddi root directory.
-        </p>
-        <p>
-        The commit process is a bit complicated.
-        The live site is hosted under the site source tree, -not- the juddi src tree. The juddi/target/site
-        directory hierarchy maps to the ws-site/targets/juddi directory hierarchy.
-        Once you've built the site copy the latter hierarchy to the former, and then commit the
-        changes. The live site is updated about every 6 hours from cvs.
-        </p>
-        <p>
-        You must -also- commit the changes you've made under juddi/src/site to persist the changes for the next
-        committer to be able to reproduce your modifications.
-        </p>
-        <p>
-        To fully clean any site build you've created, you can safely delete everything under juddi/target.
-        </p>
-    </section>
-    <section name="Release Process">
-      <p><strong>Release Manager</strong></p>
-      <p>
-      One committer will be elected or hopefully volunteer to assemble the binary releases and label the source tree.
-      </p>
-      <p><strong>Digitally Signing Releases</strong></p>
-      <p>
-        Apache policy requires binary releases be digitaly signed. The Apache process has not been formalized, but a general discussion about creating digital signatures
-        and signing releases is available at
-        <link href="http://nagoya.apache.org/wiki/apachewiki.cgi?SigningReleases">http://nagoya.apache.org/wiki/apachewiki.cgi?SigningReleases</link>.
-        This covers some basics about using <link href="http://www.gnupg.org">GnuPG</link> to create key pairs and sign releases. Our goal here is to
-        discuss jUDDI signing requirements, and provide some useful examples to release managers, not discuss digital signatures or encryption technology.
-        Our discussion uses <link href="http://www.gnupg.org">GnuPG</link>, but any compliant software could be used. The examples below come from the
-        <link href="http://www.gnupg.org/gph/en/manual.html">GnuPG manual</link>. This discussion is not a subsitute for reading that manual.
-      </p>
-      <p>
-        Creating a key pair is pretty simple using <link href="http://www.gnupg.org/gph/en/manual.html#AEN26">gpg</link>. Simply invoke gpg and take all the defaults when prompted. You
-        will have to provide a passphrase. Be sure to remember the passphrase since you'll need it anytime you use the key pair. The passphrase should itself be sufficiently
-        secure; it shouldn't simply be a word in a dictionary, should include a mix of digits and alphanumeric characters, etc.
-       </p>
-        <source>
-          gpg --gen-key
-        </source>
-        <p>
-        You should also generate a <link href="http://www.gnupg.org/gph/en/manual.html#AEN26">revocation certificate</link>. This allows you to declare the key
-        pair invalid publically, if you ever lose your private key, or it becomes compromised.
-      </p>
-        <source>
-          gpg --output revoke.as --gen-revoke mykey
-        </source>
-
-      <p>
-        The release manager is responsible for signing the binaries. The release manager must have a public key listed in the 'KEYS' file at the root of our source tree.
-        The release manager must create a <link href="http://www.gnupg.org/gph/en/manual.html#AEN161">detached signature</link> for each binary. This detached
-        signature must be posted along with our binaries, and allow our users to verify the binary's integrity.
-      </p>
-        <source>
-          gpg --output jUDDI.tar.gzip.asc --detach-sig jUDDI.tar.gzip
-        </source>
-      <p>All jUDDI committers are encouraged to create public/ private key pairs and place the public half into our 'KEYS'
-        file at the root of our source tree. jUDDI committers are also encouraged to verify one another's keys and sign them, to help
-        create a web of trust. Verifying a signature and a binary guarantees (in any real sense) the binary was assembled by the person
-        that signed it. However, it does not prove the person signing it can be trusted.
-        <link href="http://www.gnupg.org/gph/en/manual.html#AEN335">A web of trust</link> can be created by signing one another's keys.
-        This allows users and developers to 'trust' the person who created the document-signature pair to provide a secure, safe
-        binary.
-      </p>
-    </section>
-  </body>
-</document>
diff --git a/src/site/xdoc/docs.xml b/src/site/xdoc/docs.xml
deleted file mode 100644
index 7c76874..0000000
--- a/src/site/xdoc/docs.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
-  <properties>
-    <title>jUDDI User and Developer Documentation</title>
-  </properties>
-  <body>
-    <section name="Guides">    
-        
-      <table>   
-           
-        <tr> 
-          <td><strong>Name</strong></td>
-          <td><strong>Date</strong></td>
-          <td><strong>Description</strong></td>
-        </tr>
-        <tr>
-          <td>3.x User Guide</td>
-          <td>May 20, 2013</td>
-          <td><a href="docs/3.x/userguide/html/index.html">HTML</a>,
-              <a href="docs/3.x/userguide/html_single/index.html">HTML-SINGLE</a>,
-              <a href="docs/3.x/userguide/pdf/userguide.pdf">PDF</a>
-          </td>
-        </tr>
-        <tr>
-          <td>3.x Developer Guide</td>
-          <td>Jul 10, 2011</td>
-          <td><a href="docs/3.x/devguide/html/index.html">HTML</a>,
-              <a href="docs/3.x/devguide/html_single/index.html">HTML-SINGLE</a>,
-              <a href="docs/3.x/devguide/pdf/devguide.pdf">PDF</a>
-          </td>
-        </tr>
-        <tr>
-          <td>2.x User Guide</td>
-          <td>Jun 1, 2005</td>
-          <td><a href="usersguide.html">HTML</a></td>
-        </tr>
-      </table>
-		
-    </section>
-  </body>
-</document>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
deleted file mode 100644
index 0442e85..0000000
--- a/src/site/xdoc/index.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<document>
-  <properties>
-    <title>Welcome to jUDDI</title>
-  </properties>
-  <body>
-
-      <section name="Intro">
-	      <p>jUDDI (pronounced &quot;Judy&quot;) is an open source Java implementation
-	        of the Universal Description, Discovery, and Integration (UDDI v3) specification
-	        for (Web) Services. The jUDDI project includes <a href="/scout/">Scout</a>. <a href="/scout/">Scout</a> is an implementation 
-	        of the JSR 93 - JavaTM API for XML Registries 1.0 (JAXR).</p>
-	  </section>
-    
-	 <section name="jUDDI Features">
-	    <ul>
-	      <li>Open Source</li>
-	      <li>Platform Independent</li>
-	      <li>Use with any relational database that supports ANSI standard SQL (MySQL, Oracle, DB2, Sybase, Derby etc.)</li>
-	      <li>Deployable on any Java application server that supports the Servlet 2.3 specification</li>
-	      <li>jUDDI registry supports a clustered deployment configuration.</li>
-	      <li>Easy integration with existing authentication systems</li>
-	      <li>Supports InVM embeddable mode</li>
-	    </ul>
-	    jUDDIv3
-	    <ul>
-	      <li>UDDI Specification version 3.0 compliant</li>
-	      <li>JDK 1.6 Recommended, but supports for JDK 1.5 and later</li>
-	      <li>Build on JAXB and JAX-WS standards, tested on CXF</li>
-	      <li>Build on JPA standard, tested with OpenJPA and Hibernate</li>
-	      <li>Pre-configured bundle deployed to Tomcat</li>
-	      <li>UDDI <a href="images/portal-preview.png">portlets</a></li>
-	      <li>Pre-configured portal bundle download</li>
-	      <li>UDDIv3 API Java Client Library</li>
-	      <li>User and Developer Documentation</li>
-	    </ul>
-	    jUDDIv2
-	    <ul>
-	      <li>UDDI version 2.0 compliant</li>
-	      <li>Supports for JDK 1.3.1 and later</li>
-	    </ul>
-	  </section>
-      
-	  <section name="News">
-	    <p><strong>May, 2013</strong> jUDDI Release 3.1.5</p>
-	    <p><strong>Dec, 2012</strong> Don't forget to check out the <a href="http://apachejuddi.blogspot.com">jUDDI Blog</a></p>
-	    <p><strong>Mar, 2012</strong> Scout Release 1.2.6</p>
-	    <p><strong>Nov, 2010</strong> Release 3.0.4</p>
-	    <p><strong>Aug, 2010</strong> jUDDI and Scout are promoted to Top Level Project named jUDDI</p>
-	    <p><strong>May, 2010</strong> Release 3.0.2</p>
-	    <p><strong>Oct 26, 2009</strong> Release 3.0.0</p>
-	    <p><strong>Aug 11, 2009</strong> <a href="http://apachejuddi.blogspot.com/2009/07/release-juddi-v2-thank-you-steve-viens.html">Release 2.0</a> and <a href="http://www.apache.org/dist/ws/juddi/2_0_1/">2.0.1</a></p>
-	    <p><strong>June 5, 2009</strong> Release 3.0.0.beta</p>
-	    <p><strong>May 31, 2009</strong> Release 2.0rc7</p>
-	    <p><strong>Feb 13, 2009</strong> Version 3.0.0.alpha is now available</p>
-	  	<p><strong>Feb 10, 2009</strong> Version 2.0rc6 is now available.</p>
-	    <p><strong>Dec 13, 2007</strong> Version 2.0rc5 is now available.</p>
-	    <p><strong>June 7, 2005</strong> Version 0.9rc4 is now available.</p>
-	    <p><strong>July 2, 2004</strong> Version 0.9rc3 is now available.</p>
-	    <p><strong>June 29, 2004</strong> Version 0.9rc2 is now available.</p>
-	    <p><strong>June 16, 2004</strong> Version 0.9rc1 is now available.</p>
-	    <p><strong>March 24, 2004</strong> jUDDI graduates from the Apache Incubator into Apache Web Services Project.</p>
-	    <p><strong>Oct 08, 2003</strong> The Apache Software Foundation's Web Services PMC (http://ws.apache.org/) voted to accept jUDDI into the Apache Incubator. The move is expected to be complete in early December.</p>
-	    <p><strong>July 22, 2003</strong> A proposal to contribute jUDDI to the Apache Software Foundation's Web Services Project is being considered.</p>
-	    <p><strong>July 22, 2003</strong> Version 0.8.0 is now available.</p>
-	    <p><strong>June 27, 2003</strong> Version 0.7.1 is now available.</p>
-	    <p><strong>April 22, 2003</strong> Version 0.7.0 is now available.</p>
-	  </section>
-
-      <section name="About UDDI">
-        <p>The Universal Description, Discovery and Integration (UDDI) protocol is 
-          one of the major building blocks required for successful Web services. 
-          UDDI creates a standard interoperable platform that enables companies 
-          and applications to quickly, easily, and dynamically find and use Web 
-          services over the Internet. UDDI also allows operational registries to 
-          be maintained for different purposes in different contexts. UDDI is a 
-          cross-industry effort driven by major platform and software providers, 
-          as well as marketplace operators and e-business leaders within the 
-          OASIS standards consortium.
-        </p>
-        <p>Additional information regarding UDDI can be found 
-          at <a href="http://www.uddi.org/">UDDI.org</a>.
-        </p>
-      </section>
-      
-  </body>
-</document>
diff --git a/src/site/xdoc/legal.xml b/src/site/xdoc/legal.xml
deleted file mode 100644
index 47a0b67..0000000
--- a/src/site/xdoc/legal.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
-  <properties>
-    <title>Legal</title>
-  </properties>
-  <body>
-    <section name="jUDDI - Legal Stuff">
-      <p>All material on this website is Copyright © 1999-2009, The Apache 
-        Software Foundation. 
-      </p>
-      <p>
-        Sun, Sun Microsystems, Solaris, Java, JavaServer 
-        Web Development Kit, and JavaServer Pages are trademarks or registered 
-        trademarks of Sun Microsystems, Inc. UNIX is a registered trademark 
-        in the United States and other countries, exclusively licensed 
-        through X/Open Company, Ltd. Windows, WindowsNT, and Win32 are 
-        registered trademarks of Microsoft Corp. All other product names 
-        mentioned herein and throughout the entire web site are trademarks 
-        of their respective owners. 
-      </p>
-    </section>
-  </body>
-</document>
diff --git a/src/site/xdoc/library.xml b/src/site/xdoc/library.xml
deleted file mode 100644
index e86bf94..0000000
--- a/src/site/xdoc/library.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
-  <properties>
-    <title>Reference Library</title>
-  </properties>
-  <body>
-
-	<section name="Introduction">
-	    <p>The jUDDI Project lives or fails based on its human resources. Users
-	      and contributors alike help the project with ideas and brainpower. A common
-	      foundation of knowledge is required to effectively participate in this
-	      virtual community. The following is a list of documents that we have found
-	      helpful for us and may be helpful to you.
-	    </p>
-    </section>
-
-    <section name="UDDI Specifications">        
-      <p>
-      <strong><a href="http://uddi.xml.org/">UDDI.org</a></strong><br/>
-      <strong><a href="http://www.oasis-open.org/committees/uddi-spec/doc/contribs.htm#uddiv1">UDDI Version 1.0 Specification</a></strong><br/>
-      <strong><a href="http://www.oasis-open.org/committees/uddi-spec/doc/tcspecs.htm#uddiv2">UDDI Version 2.0 Specification</a></strong><br/>
-      <strong><a href="http://www.oasis-open.org/committees/uddi-spec/doc/tcspecs.htm#uddiv3">UDDI Version 3.0 Specification</a></strong>
-      </p>
-    </section>
-      
-    <section name="UDDI Taxonomies">            
-
-      <p><strong><a href="http://www.census.gov/epcd/www/naics.html">North American Industry Classification System (NAICS)</a></strong><br/>U.S. Census Bureau</p>
-      <p><strong><a href="http://www.unspsc.org/Defaults.asp">United Nations Standard Products and Services Code System (UNSPSC) Version 3.1</a></strong><br/>U.S. Census Bureau</p>
-    </section>
-      
-    <section name="Articles, Tutorials and Best Practices">        
-    
-      <p><strong><a href="http://oreilly.com/catalog/javawebserv/chapter/ch06.html">O'Reilly Java WebServices Chapter 6: "UDDI: Universal Description, Discovery, and Integration"</a></strong><br/>Tyler Jewell and David Chappell</p>    
-      <p><strong><a href="http://www-106.ibm.com/developerworks/webservices/library/ws-version/">Best practices for Web services versioning</a></strong><br/>Keep your Web services current with WSDL and UDDI<br/>Kyle Brown and Michael Ellis, IBM developerWorks<br/>January 2004</p>      
-      <p><strong><a href="http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm">Using WSDL in a UDDI Registry</a></strong><br/>John Colgrave and Karsten Januszewski, UDDI.org<br/>November 2003</p>            
-      <p><strong><a href="http://java.sun.com/developer/technicalArticles/WebServices/jaxrws/">Registration and Discovery of Web Services Using JAXR with XML Registries such as UDDI and ebXML</a></strong><br/>The why and what of the new approach<br/>Qusay H. Mahmoud, Sun Microsystems<br/>June 2002</p>      
-      <p><strong><a href="http://www-106.ibm.com/developerworks/webservices/library/ws-udmod1/">A New Approach to UDDI and WSDL Part 1</a></strong><br/>The why and what of the new approach<br/>John Colgrave, IBM developerWorks<br/>August 2003</p>      
-      <p><strong><a href="http://www-106.ibm.com/developerworks/webservices/library/ws-udmod2/">A New Approach to UDDI and WSDL Part 2</a></strong><br/>Usage scenarios in publishing and finding WSDL service descriptions<br/>John Colgrave, IBM developerWorks<br/>September 2003</p>            
-      <p><strong><a href="http://www.ibm.com/developerworks/webservices/library/ws-wsdl/">Understanding WSDL in a UDDI Registry Part 1</a></strong><br/>How to publish and find WSDL service descriptions<br/>Peter Brittenham, Francisco Cubera, Dave Ehnebuske, Steve Graham, IBM developerWorks<br/>September 2001 (updated September 2002)</p>      
-      <p><strong><a href="http://www.ibm.com/developerworks/webservices/library/ws-wsdl2/">Understanding WSDL in a UDDI Registry Part 2</a></strong><br/>How to publish and find WSDL service descriptions<br/>Peter Brittenham, Francisco Cubera, Dave Ehnebuske, Steve Graham, IBM developerWorks<br/>September 2001 (updated September 2002)</p>      
-      <p><strong><a href="http://www.ibm.com/developerworks/webservices/library/ws-wsdl3/">Understanding WSDL in a UDDI Registry Part 3</a></strong><br/>How to publish and find WSDL service descriptions<br/>Peter Brittenham, IBM developerWorks<br/>November 2001</p>
-      <p><strong><a href="http://www.uddi.org/pubs/TN-taxonomy-provider-V1.00-Final-20010717.pdf">Providing a Taxonomy for Use in UDDI Version 2</a></strong><br/>UDDI.org<br/>July 2001</p>
-      <p><strong><a href="http://www.developer.com/services/article.php/1367781">The Role of Taxonomies in UDDI: tModels Demystified</a></strong><br/>Ravi Trivedi, Developer.com</p>
-      <p><strong><a href="http://www.developer.com/services/article.php/3374631">Versioning of Web Services: An UDDI Subscription-Based Approach</a></strong><br/>Aravilli Srinivasa Rao, Developer.com</p>
-    </section>
-
-    <section name="Related Specifications">        
-      <p><strong><a href="http://www.w3.org/TR/SOAP/">SOAP W3C Specification</a></strong></p>
-      <p><strong><a href="http://www.w3c.org/TR/wsdl.html">Web Services Description Language (WSDL) 1.1</a></strong></p>
-      <p><strong><a href="http://java.sun.com/xml/jaxr/">Java API for XML Registries (JAXR)</a></strong></p>
-    </section>
-               
-    <section name="Other Resources">        
-      <p><strong><a href="http://java.sun.com/docs/books/jls/index.html">The Java Language Specification</a></strong><br/>
-        Written by the creators of the Java Programming Language, this online
-        book is considered by many to be the bible for programming in Java. A must
-        read.
-      </p>
-      <p><strong><a href="http://java.sun.com/products/jdk/javadoc/index.html">Javadoc</a></strong><br/>
-        Javadoc is the automatic software documentation generator used by Java
-        since it was first released. All code written for this project must be
-        documented using Javadoc conventions.
-      </p> 
-      <p><strong><a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">The Java Code Conventions</a></strong><br/>
-        This Sun document specifies the de-facto standard way of formatting
-        Java code. All code written for this project must follow these conventions.
-      </p>
-    </section>
-
-  </body>
-</document>
diff --git a/src/site/xdoc/list-guidelines.xml b/src/site/xdoc/list-guidelines.xml
deleted file mode 100644
index d666e15..0000000
--- a/src/site/xdoc/list-guidelines.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
-  <properties>
-    <title>Mailing Lists Guidelines</title>
-  </properties>
-  <body>
-  
-  <anchor id="guidelines"/>
-  <section name="Mailing List Guidelines">
-    <p>Every volunteer project obtains its strength from the people involved in it. Mailing lists provide a simple and effective communication mechanism. 
-    </p>
-    <p>You are welcome to join any of our mailing lists (or all of them if you wish). You can choose to lurk, or actively participate. It's up to you. 
-    </p>
-    <p>Before you join these lists, you should make sure that you read and follow the guidelines below. 
-    </p>
-    <p><strong>Do your best to respect the charter of the mailing list</strong><br/>There are three types of lists that you can join: 
-    </p>
-    <ul>
-      <li>The <a href="#juddi-user">User</a> list is where you should send questions and comments about configuration, setup, usage and other "user" types of questions.</li> 
-      <li>The <a href="#juddi-dev">Developer</a> list is where you should should send questions and comments about the actual software source code and general "development" types of questions.</li> 
-      <li>The <a href="#juddi-cvs">Commit</a> list is used for tracking committer activity in the project's CVS repository. This list is used for informational purposes only.  Please do not post messages to this list.  Questions regarding activity on this list should be posted on the <a href="#juddi-dev">Developer</a> list.</li> 
-    </ul>
-    <p><strong>Join the lists that are appropriate for your discussion</strong><br/>Please make sure that you are joining the list that is appropriate for the topic or 
-      product that you would like to discuss.
-    </p>
-    <p><strong>Do not abuse resources in order to get help</strong><br/>Asking your configuration or user type of question on the developers list because you think that 
-      you will get help more quickly by going directly to the developers instead of to the user base is not very nice. Chances are that doing this will 
-      actually prevent people from answering your question because it is clear that you are trying to abuse resources.
-    </p>
-    <p><strong>Avoid sending HTML or "Stylized" email to the list</strong><br/>Do your best to ensure that you are not sending HTML or "Stylized" email to the list. If 
-      you are using Outlook or Outlook Express or Eudora, chances are that you are sending HTML email by default. There is usually a setting that will allow you to 
-      send "Plain Text" email. If you are using Microsoft products to send email, there are several bugs in the software that prevent you from turning off the sending 
-      of HTML email.
-    </p> 
-    <p><strong>Watch where you are sending email</strong><br/>The majority of our mailing lists have set the Reply-To to go back to the list. That means that when you 
-      Reply to a message, it will go to the list and not to the original author directly. The reason is because it helps facilitate discussion on 
-      the list for everyone to benefit from. Be careful of this as sometimes you may intend to reply to a message directly to someone instead of 
-      the entire list.
-    </p>
-    <p><strong>Do not crosspost messages</strong><br/>In other words, pick a mailing list and send your messages to that mailing list only. Do not send your messages 
-      to multiple mailing lists. The reason is that people may be subscribed to one list and not to the other. Therefore, some people may only see 
-      half of the conversation.
-    </p>
-  </section>
-
-  </body>
-</document>
diff --git a/src/site/xdoc/participate.xml b/src/site/xdoc/participate.xml
deleted file mode 100644
index 03897cc..0000000
--- a/src/site/xdoc/participate.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
-  <properties>
-    <title>Participation</title>
-  </properties>
-  <body>
-	  <section name="Introduction">
-      <p>Every volunteer project obtains its strength from the people involved in it.
-        We invite you to participate as much or as little as you choose. The roles
-        and responsibilities that people can assume in the project are based on
-        merit. Everybody's input matters!
-      </p>
-      <p>There are a variety of ways to participate. Regardless of how you choose
-        to participate, we suggest you join some or all of our <a href="lists.html">mailing lists</a>.
-      </p>
-      </section>
-
-      <section name="Use the Products &amp; Give Us Feedback">
-        <p>Using the products,reporting bugs, making feature requests, etc. is by
-          far the most important role. It's your feedback that allows the technology
-          to evolve.
-          <ul>
-            <li><a href="mail-lists.html">Join Mailing Lists</a></li>
-            <li><a href="releases.html">Download Binary Builds</a></li>
-            <li><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10401">Report Bugs &amp; Request New Features</a></li>
-          </ul>
-        </p>
-      </section>
-
-      <section name="Contribute Code or Documentation Patches">
-        <p>In this role, you participate in the actual development of the code. If this
-          is the type of role you'd like to play, here are some steps (in addition to
-          the ones above) to get you started:
-          <ul>
-            <li> <a href="list-guidelines.html#guidelines">Read Mailing List Guidelines </a></li>
-            <li> <a href="library.html">Review Reference Library </a></li>
-            <li> <a href="releases.html">Download the Source Code</a></li>
-            <li> <a href="source-repository.html">Access SVN Repository </a></li>
-          </ul>
-        </p>
-        <p>Any and all new development or bug fixing uses the latest code base.
-          If you have a patch, it should be submitted against the latest available
-          code.
-        </p>
-      </section>
-
-      <section name="Getting Support on the Lists">
-        <p>We do all development and bug fixing on the latest available code base.
-          If you've encountered what you think is a bug, please first check the
-          <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10401">issues database</a> for known issues. If you
-          can't find your bug, make sure you're using the latest code base. We are
-          not able to fix bugs on earlier code bases.
-        </p>
-        <p>Please include any relevant version information and the error message
-            text, if there is one. If you have a problem with a specific interface,
-            like find_business, you'll likely be asked to post a log of the SOAP
-            message exchanges between your client and the jUDDI server. You can
-            use the axis tool
-            <a href="http://ws.apache.org/axis/java/developers-guide.html">TCPMon</a>
-            to capture these messages.
-        </p>
-        <p>Remember, Apache helps those that help themselves. Please take a look
-          at Eric S. Raymond's and Rick Moen's explanation of
-          <a href="http://www.catb.org/~esr/faqs/smart-questions.html">"How to Ask Questions The Smart Way</a>.
-          </p>
-      </section>
-      <section name="jUDDI Wiki">
-        <p>Like other Apache projects, jUDDI maintains a wiki, a sort of virtual
-          meeting place for the jUDDI community. This is a resource available
-          to everyone, and you are encouraged to contribute. This is a good resource
-          for 'HowTos' for common configuration issues.
-          <ul>
-            <li> <a href="http://wiki.apache.org/juddi">http://wiki.apache.org/juddi</a></li>
-          </ul>
-          </p>
-      </section>
-
-  </body>
-</document>
diff --git a/src/site/xdoc/releases.xml b/src/site/xdoc/releases.xml
deleted file mode 100644
index 8fb01fa..0000000
--- a/src/site/xdoc/releases.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
-  <properties>
-    <title>jUDDI Releases</title>
-  </properties>
-  <body>
-    <section name="Official 3.x Releases">    
-        
-      <table>   
-           
-        <tr> 
-          <td><strong>Name</strong></td>
-          <td><strong>Date</strong></td>
-          <td><strong>Description</strong></td>
-        </tr>
-		<tr>
-		  <td><a href="http://www.apache.org/dyn/closer.cgi/juddi/juddi/3.1.5/">3.1.5</a></td>
-		  <td>May 20, 2013</td>
-		  <td>Stable 3.1.5 Release</td>
-		</tr>
-        <tr>
-          <td><a href="http://archive.apache.org/dist/juddi/">older</a></td>
-          <td>Mon 13, 2011</td>
-          <td>Archived Releases</td>
-        </tr>
-    </table>
-    </section>
-		
-  </body>
-</document>
diff --git a/src/site/xdoc/thanks.xml b/src/site/xdoc/thanks.xml
deleted file mode 100644
index d52c7c3..0000000
--- a/src/site/xdoc/thanks.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
- *
- */ -->
-<document>
-  <properties>
-    <title>Donated Software Licenses</title>
-  </properties>
-  <body>
-    <section name="Donated Software Licenses">
-	    <p>The jUDDI Project uses a few commercial products in the development 
-	    process. We are grateful for the community licenses which were provided 
-	    to the project at no costs. 
-	    </p>
-    </section>
-
-	<section name="JIRA">
-	    <p>
-	    Bug and issue tracker <a href="http://www.atlassian.com/software/jira/">
-	    Jira by Atlassion</a>.
-	    </p>
-    </section>
-
-    <section name="JProfiler">        
-      <p>
-         Java profiler <a href="http://www.ej-technologies.com/products/jprofiler/overview.html">
-         JProfiler by ej-technologies</a>.
-      </p>
-    </section>
-      
-    <section name="XLT">            
-         Xceptance LoadTest (XLT) for both regression as well as load tests by <a href="http://www.gqpartners.com/">Global Quality Partners, LLC</a> 
-         and <a href="http://www.xceptance.com/">Xceptance 
-         Software Technologies, Inc.</a> Load and performance tests were created and 
-         executed by our sponsors using Xceptance LoadTest (XLT) from Xceptance 
-         Software Technologies, Inc., of which Global Quality Partners, LLC is 
-         the exclusive North American distributor. To enable the Apache jUDDI 
-         project to continue and extend these tests, Xceptance has provided 
-         an unlimited XLT license and donated the source code of the test suite 
-         to the Apache jUDDI project. XLT is built and scripted in pure Java, 
-         providing a highly scalable and easily adaptable technology that can be 
-         used across development, quality assurance, and consulting teams.
-    </section>
-      
-  </body>
-</document>
diff --git a/src/site/xdoc/usersguide.xml b/src/site/xdoc/usersguide.xml
deleted file mode 100644
index 8336e95..0000000
--- a/src/site/xdoc/usersguide.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
-  <properties>
-    <title>jUDDI User's Guide</title>
-  </properties>
-  <body>
-
-    <anchor id="requirements"/>
-    <section name="Requirements">
-      <p>jUDDI is a pure Java web application and as such can be deployed to
-        any application server or servlet engine that supports version 2.1 or
-        later of the servlet API. If you need an application server, we
-        recommend <link href="http://jakarta.apache.org/tomcat/">Jakarta
-        Tomcat</link>.  Note also that jUDDI requires Java 1.3 or later. As
-        with any Java web application, deployment to your application server
-        or servlet engine will vary on a product-by-product basis.
-      </p>
-      <p>Instructions for deploying jUDDI to several application servers have
-        been donated and are available in the <link href="http://wiki.apache.org/ws/jUDDI">HOW-TO</link>
-        section of the jUDDI wiki.
-      </p>
-      <p>jUDDI also requires an external datastore in which to persist the 
-        registry data it manages.  Typically this is a relational database
-        management system such as MySQL, Oracle or DB2. Support for several 
-        open source and commercial database products are included. See the 
-        section below titled <link href="#datastore">Persistence</link> for 
-        more information.
-      </p>
-    </section>
-
-    <anchor id="config"/>
-    <section name="Configuration">
-      <p>To properly configure and deploy jUDDI it will be helpful to understand
-        a bit about it's architecture. jUDDI consist of a core request processor
-        that unmarshalls incoming UDDI requests, invoking the appropriate UDDI
-        function and marshalling UDDI responses (marshalling and unmarshalling
-        is the process of converting XML data to/from Java objects).
-      </p>
-      <p>To invoke a UDDI function jUDDI employs the services of three
-        configurable sub-components or modules that handle persistence (the
-        DataStore), authentication (the Authenticator) and the generation of
-        UUID's (the UUIDGen). jUDDI is bundled and pre-configured to use
-        default implementations of each of these modules to help your registry
-        up and running quickly. These sub-components and a description of 
-        the default implementations are described below.
-      </p>
-      <p>Several public Java interfaces for creating your own DataStore,
-        Authenticator and UUIDGen module implementations are available. Please
-        see the <link href="#moddev">module development</link> section of this 
-        guide for more information regarding jUDDI module development.
-      </p>
-    </section>
-
-    <anchor id="datastore"/>
-    <section name="Persistence (jUDDI DataStore)">
-      <p>jUDDI needs a place to store it's registry data so it should come as 
-        no surprise that jUDDI is pre-configured to use JDBC and any one of 
-        several different DBMSs to do this.
-      </p>            
-      <p>The process of setting this up is straight forward. Start by creating 
-        a new jUDDI database using the instructions for your preferred DBMS 
-        which you will find in the 'sql' directory of your jUDDI distribution. 
-        At the time of this writing instructions for the following products 
-        were available:
-      </p>
-      <p>
-        <ul>
-          <li>MySQL</li>
-          <li>DB2</li>
-          <li>HSQLdb (HypersonicSQL)</li>
-          <li>Sybase</li>
-          <li>PostreSQL</li>
-          <li>Oracle</li>
-          <li>TotalXML</li>
-          <li>JDataStore (Borland)</li>
-        </ul>
-      </p>
-      <p>If support for your DBMS is not listed you might try posting a message
-        to the juddi-user list to see if someone has already developed support
-        for it.  You can also try to create the scripts yourself by using the 
-        instructions for a supported DBMS as a guide. Please consider 
-        contributing your work back to the project so the next person won't 
-        have the same issue.
-      </p>      
-      <p>To complete the DataStore set up you'll need to configure a JNDI
-        Datasource with a name of <b>'jdbc/juddiDB'</b> in the application 
-        server or servlet engine that you're deploying to. Datasource setup 
-        varies on an product-by-product basis so review documentation for 
-        your application server. If you're deploying to Jakarta Tomcat,  take a 
-        look at Tomcat's <link  href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/jndi-datasource-examples-howto.html">JNDI 
-        Datasource HOW-TO</link> for assistance.
-      </p>
-    </section>
-
-    <anchor id="authenticator"/>
-    <section name="Authentication (jUDDI Authenticator)">
-      <p>Authenticating a jUDDI publisher is a two-step process. The first step
-        confirms that the ID/password combination provided by the user in a 
-        get_authToken request is valid. The default Authenticator implementation 
-        simply approves any authentication attempt. It is expected that a 
-        typical jUDDI deployment will use an external authentication 
-        mechanism.  It is our hope that additional jUDDI authentication 
-        implementations will be developed by jUDDI users as they determine how 
-        they would like authentication to take place in their particular 
-        environment. See the jUDDI Developers Guide for more information on 
-        developing a custom jUDDI authentication module for your environment.
-      </p>
-      <p>The second step confirms that the publisher has been defined to
-        jUDDI. A publisher is said to be defined when a row identifying the
-        publisher exists in the PUBLISHER table of the jUDDI datastore. At the
-        moment the only way to do this is via SQL. An example of defining a
-        new publisher named John Doe would look like this:
-      </p>
-      <p>
-        <b>
-        <pre>        
-          INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,ADMIN,ENABLED)
-          VALUES ('jdoe','John Doe','false','true');
-        </pre>
-        </b>
-      </p>
-      <p>The PUBLISHER table consists of several columns but only four of them
-        are required and they are defined as follows:
-      </p>
-      <p>
-        <table>
-         <tr><th>Column Name</th><th>Description</th></tr>
-         <tr><td>PUBLISHER_ID</td><td>The user ID the publisher uses when authenticating. IMPORTANT: This should be the same value used to authenticate with the external authentication service.</td></tr>
-         <tr><td>PUBLISHER_NAME</td><td>The publisher's name (or in UDDI speak the Authorized Name).</td></tr>
-         <tr><td>ADMIN</td><td>Indicate if the publisher has administrative privileges. Valid values for this column are 'true' or 'false'. The ADMIN value is currently not used.</td></tr>
-         <tr><td>ENABLED</td><td>Indicate if the publishers account is enabled and eligible for use.</td></tr>
-        </table>
-      </p>
-      <p>The jUDDI web application will (eventually) be extended to facilitate
-        the Publisher creation process. The value of the ADMIN column in the
-        PUBLISHER table above will be used to determine who has the privilege
-        to create new jUDDI publishers.
-      </p>
-    </section>
-
-    <anchor id="uuidgen"/>
-    <section name="UUID Generation (jUDDI UUIDGen)">
-      <p>There's nothing for you to do here but I thought I'd offer a little
-        information about how, why and where jUDDI makes use of UUID generation.
-      </p>
-      <p>The UDDI specification indicates that each Business, Service, Binding
-        and TModel (Technical Model) is to be uniquely identified by a
-        Universally Unique ID (UUID). Additionally, jUDDI also uses the UUID
-        generator to create AuthTokens.
-      </p>
-      <p>Generation of a UUID typically requires access to hardware level
-        information that (unfortunately) is not easily accessible from Java.
-        Fortunately, the UUID specification offers an alternative method for
-        generating these ID's when this hardware information is not present.
-        By default the jUDDI implements this alternative method.
-      </p>
-    </section>
-
-    <anchor id="logging"/>
-    <section name="Logging">
-      <p>When deploying jUDDI you may wish to make changes to the
-       juddi.properties and log4j.properties files. These files are located in
-       the juddi webapp's WEB-INF/classes directory. They're here because
-       they need to be in the classpath for jUDDI to locate and load them at
-       runtime. One Log4j property value that you'll most likely want to set
-       is log4j.appender.LOGFILE.File which specifies the name and location of
-       the jUDDI log file.
-      </p>
-    </section>
-
-    <anchor id="moddev"/>
-    <section name="Module Development">
-      <p>Coming Soon.
-      </p>
-    </section>
-
-  </body>
-</document>
diff --git a/src/site/xdoc/who.xml b/src/site/xdoc/who.xml
deleted file mode 100644
index f01d6ff..0000000
--- a/src/site/xdoc/who.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
-  <properties>
-    <title>The jUDDI project team</title>
-  </properties>
-  <body>
-    
-    <section name="Who We Are">
-      <p>
-        The jUDDI Project operates on a meritocracy: the more you do,
-        the more responsibility you will obtain. This page lists all
-        of the people who have gone the extra mile and are
-        Committers. If you would like to get involved, the first step
-        is to join the mailing lists.
-      </p>
-      <p>
-        We ask that you please do not send us emails privately asking
-        for support. We are non-paid volunteers who help out with the
-        project and we do not necessarily have the time or energy to
-        help people on an individual basis. Instead, we have setup
-        mailing lists which often contain hundreds of individuals who
-        will help answer detailed requests for help. The benefit of
-        using mailing lists over private communication is that it is
-        a shared resource where others can also learn from common
-        mistakes and as a community we all grow together.
-      </p>
-    </section>
-
-  </body>
-</document>