[maven-release-plugin]  copy for tag juddi-3.1.0

git-svn-id: https://svn.apache.org/repos/asf/juddi/tags/juddi-3.1.0@1138715 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE b/NOTICE
index 199604a..899208f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache jUDDI
-Copyright 2004-2009 The Apache Software Foundation
+Copyright 2004-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -30,6 +30,4 @@
 		followed, or as required to translate it into languages other than
 		English.
 
-This product uses JUnit, which is offered up under the BSD license.
-
 
diff --git a/RELEASE_NOTES.html b/RELEASE_NOTES.html
index 54fdda5..0674ecb 100644
--- a/RELEASE_NOTES.html
+++ b/RELEASE_NOTES.html
@@ -1,3 +1,19 @@
+<!--
+ * 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.
+ *
+ * -->
 
  <h1>Release Notes - jUDDI - Version 3.1.0</h1>
                 
@@ -92,9 +108,16 @@
 </li>
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-494'>JUDDI-494</a>] -         NPE when trying to option the DispositionReport using the JBossWS stack
 </li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-498'>JUDDI-498</a>] -         Success messages for deletes are not empty
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-500'>JUDDI-500</a>] -         deleteSQL query is wrong in PublisherAssertionQuery
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-501'>JUDDI-501</a>] -         Upgrade to valid Derby release
+</li>
 </ul>
             
-<h2>Improvement</h2>
+<h2>        Improvement
+</h2>
 <ul>
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-304'>JUDDI-304</a>] -         uddi_090_SubscriptionListenerIntegrationTest fails easily
 </li>
@@ -114,13 +137,15 @@
 </li>
 </ul>
     
-<h2>New Feature</h2>
+<h2>        New Feature
+</h2>
 <ul>
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-243'>JUDDI-243</a>] -         Add support for RMI transport for subscription notifications
 </li>
 </ul>
                         
-<h2>Task</h2>
+<h2>        Task
+</h2>
 <ul>
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-411'>JUDDI-411</a>] -         Change Derby to run in memory for the unittests
 </li>
@@ -148,6 +173,8 @@
 </li>
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-467'>JUDDI-467</a>] -         Deprecate using ManagerName of null.
 </li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-470'>JUDDI-470</a>] -         Remove old releases from dist
+</li>
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-472'>JUDDI-472</a>] -         Lazy load the JAXBContext in the JAXBMarshaller
 </li>
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-475'>JUDDI-475</a>] -         Add support to register BPEL processes according to BPEL4WS technote
@@ -166,8 +193,13 @@
 </li>
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-495'>JUDDI-495</a>] -         Tone down INFO level logging
 </li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-499'>JUDDI-499</a>] -         Upgrade to the latest apache parent pom
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-502'>JUDDI-502</a>] -         Updating release related issues
+</li>
 </ul>
                 
+                
 <h1>Release Notes - jUDDI - Version 3.0.4</h1>
     
 <h2>Sub-task</h2>
@@ -792,4 +824,4 @@
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-187'>JUDDI-187</a>] -         Updating AuthenticationTest and Adding documentation on the new Authentication Approach
 </li>
 </ul>
-                     
\ No newline at end of file
+                     
diff --git a/docs/assembly.xml b/docs/assembly.xml
index 72c7bda..2fafd29 100644
--- a/docs/assembly.xml
+++ b/docs/assembly.xml
@@ -1,3 +1,20 @@
+<!--
+ * 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.
+ *
+ */ -->
+
 <assembly>
 	<id></id>
 	<formats>
diff --git a/docs/db/README.txt b/docs/db/README.txt
index 570b2ac..710568b 100644
--- a/docs/db/README.txt
+++ b/docs/db/README.txt
@@ -1 +1,18 @@
-The ER diagram is produced using the MySQL Workbench (version 5.2.6 alpha).  
\ No newline at end of file
+<!--
+ * 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.
+ *
+ */ -->
+
+The ER diagram is produced using the MySQL Workbench (version 5.2.6 alpha).  
diff --git a/docs/db/ddl/README.txt b/docs/db/ddl/README.txt
index b37634d..507c557 100644
--- a/docs/db/ddl/README.txt
+++ b/docs/db/ddl/README.txt
@@ -1,3 +1,20 @@
+<!--
+ * 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.
+ *
+ */ -->
+
 To generate the ddl, in the juddi-core module run
 
 mvn hibernate3:hbm2ddl
diff --git a/docs/db/ddl/db2.ddl b/docs/db/ddl/db2.ddl
index f2a14c7..5c8da87 100644
--- a/docs/db/ddl/db2.ddl
+++ b/docs/db/ddl/db2.ddl
@@ -1,3 +1,19 @@
+<*
+ * 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.
+ *
+ */
 
     create table j3_address (
         id bigint generated by default as identity,
diff --git a/docs/db/ddl/derby.ddl b/docs/db/ddl/derby.ddl
index fbaa9ee..74bb2fa 100644
--- a/docs/db/ddl/derby.ddl
+++ b/docs/db/ddl/derby.ddl
@@ -1,3 +1,19 @@
+<*
+ * 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.
+ *
+ */
 
     create table j3_address (
         id bigint not null,
diff --git a/docs/db/ddl/mysql5.ddl b/docs/db/ddl/mysql5.ddl
index fcf180b..2975ecc 100644
--- a/docs/db/ddl/mysql5.ddl
+++ b/docs/db/ddl/mysql5.ddl
@@ -1,3 +1,19 @@
+<*
+ * 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.
+ *
+ */
 
     create table j3_address (
         id bigint not null auto_increment,
diff --git a/docs/db/ddl/mysql5InnoDB.ddl b/docs/db/ddl/mysql5InnoDB.ddl
index 895849d..726a57d 100644
--- a/docs/db/ddl/mysql5InnoDB.ddl
+++ b/docs/db/ddl/mysql5InnoDB.ddl
@@ -1,3 +1,19 @@
+<*
+ * 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.
+ *
+ */
 
     create table j3_address (
         id bigint not null auto_increment,
diff --git a/docs/db/ddl/oracle9.ddl b/docs/db/ddl/oracle9.ddl
index b508ab5..da693c4 100644
--- a/docs/db/ddl/oracle9.ddl
+++ b/docs/db/ddl/oracle9.ddl
@@ -1,3 +1,19 @@
+<*
+ * 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.
+ *
+ */
 
     create table j3_address (
         id number(19,0) not null,
diff --git a/docs/db/ddl/postgres.ddl b/docs/db/ddl/postgres.ddl
index 6dee267..9b1bb9a 100644
--- a/docs/db/ddl/postgres.ddl
+++ b/docs/db/ddl/postgres.ddl
@@ -1,3 +1,19 @@
+<*
+ * 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.
+ *
+ */
 
     create table j3_address (
         id int8 not null,
diff --git a/docs/db/ddl/sqlserver.ddl b/docs/db/ddl/sqlserver.ddl
index a801cf6..21256bf 100644
--- a/docs/db/ddl/sqlserver.ddl
+++ b/docs/db/ddl/sqlserver.ddl
@@ -1,3 +1,19 @@
+<*
+ * 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.
+ *
+ */
 
     create table j3_address (
         id numeric(19,0) identity not null,
diff --git a/docs/db/ddl/sybase.ddl b/docs/db/ddl/sybase.ddl
index a801cf6..21256bf 100644
--- a/docs/db/ddl/sybase.ddl
+++ b/docs/db/ddl/sybase.ddl
@@ -1,3 +1,19 @@
+<*
+ * 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.
+ *
+ */
 
     create table j3_address (
         id numeric(19,0) identity not null,
diff --git a/docs/devguide/en-US/Author_Group.xml b/docs/devguide/en-US/Author_Group.xml
index 9eae14d..ed615ef 100644
--- a/docs/devguide/en-US/Author_Group.xml
+++ b/docs/devguide/en-US/Author_Group.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/devguide/en-US/Book_Info.xml b/docs/devguide/en-US/Book_Info.xml
index 78462e7..367f205 100644
--- a/docs/devguide/en-US/Book_Info.xml
+++ b/docs/devguide/en-US/Book_Info.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/devguide/en-US/Conventions.xml b/docs/devguide/en-US/Conventions.xml
index ef65a63..ec27c07 100644
--- a/docs/devguide/en-US/Conventions.xml
+++ b/docs/devguide/en-US/Conventions.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/devguide/en-US/Dev_Environment_Setup.xml b/docs/devguide/en-US/Dev_Environment_Setup.xml
index 270b5f2..d8e52b0 100644
--- a/docs/devguide/en-US/Dev_Environment_Setup.xml
+++ b/docs/devguide/en-US/Dev_Environment_Setup.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
diff --git a/docs/devguide/en-US/Feedback.xml b/docs/devguide/en-US/Feedback.xml
index 4a8c7f8..0461375 100644
--- a/docs/devguide/en-US/Feedback.xml
+++ b/docs/devguide/en-US/Feedback.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/devguide/en-US/Legal_Notice.xml b/docs/devguide/en-US/Legal_Notice.xml
index 2db4011..0a2b330 100644
--- a/docs/devguide/en-US/Legal_Notice.xml
+++ b/docs/devguide/en-US/Legal_Notice.xml
@@ -1,4 +1,21 @@
 <?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 legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
diff --git a/docs/devguide/en-US/Preface.xml b/docs/devguide/en-US/Preface.xml
index 51d4df8..c2d295f 100644
--- a/docs/devguide/en-US/Preface.xml
+++ b/docs/devguide/en-US/Preface.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/devguide/en-US/Release_Process.xml b/docs/devguide/en-US/Release_Process.xml
index 5548405..57a9ce7 100644
--- a/docs/devguide/en-US/Release_Process.xml
+++ b/docs/devguide/en-US/Release_Process.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
diff --git a/docs/devguide/en-US/Revision_History.xml b/docs/devguide/en-US/Revision_History.xml
index 1a1c37d..8a9bcf7 100644
--- a/docs/devguide/en-US/Revision_History.xml
+++ b/docs/devguide/en-US/Revision_History.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/devguide/en-US/jUDDI_Architecture.xml b/docs/devguide/en-US/jUDDI_Architecture.xml
index 8031e8f..30a6e68 100644
--- a/docs/devguide/en-US/jUDDI_Architecture.xml
+++ b/docs/devguide/en-US/jUDDI_Architecture.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
diff --git a/docs/devguide/en-US/jUDDI_Dev_Guide.ent b/docs/devguide/en-US/jUDDI_Dev_Guide.ent
index 122d472..e9c2d2e 100644
--- a/docs/devguide/en-US/jUDDI_Dev_Guide.ent
+++ b/docs/devguide/en-US/jUDDI_Dev_Guide.ent
@@ -1,4 +1,20 @@
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
 <!ENTITY BOOKID "jUDDI_User_Guide">
 <!ENTITY HOLDER "jUDDI Community.">
 <!ENTITY YEAR "2009">
-<!ENTITY VERSION "5.0">
\ No newline at end of file
+<!ENTITY VERSION "5.0">
diff --git a/docs/devguide/en-US/jUDDI_Dev_Guide.xml b/docs/devguide/en-US/jUDDI_Dev_Guide.xml
index 5160842..8727faf 100644
--- a/docs/devguide/en-US/jUDDI_Dev_Guide.xml
+++ b/docs/devguide/en-US/jUDDI_Dev_Guide.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/devguide/en-US/jUDDI_configuration.xml b/docs/devguide/en-US/jUDDI_configuration.xml
index e9423fb..67cdf42 100644
--- a/docs/devguide/en-US/jUDDI_configuration.xml
+++ b/docs/devguide/en-US/jUDDI_configuration.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_Dev_Guide.ent">
diff --git a/docs/devguide/pom.xml b/docs/devguide/pom.xml
index fdd140b..0cdf9a4 100644
--- a/docs/devguide/pom.xml
+++ b/docs/devguide/pom.xml
@@ -1,84 +1,116 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-    <parent>
-		<groupId>org.apache.juddi</groupId>
-		<artifactId>juddi-parent</artifactId>
-		<version>3.1.0</version>
-		<relativePath>../../pom.xml</relativePath>
+        <parent>
+	    <groupId>org.apache.juddi</groupId>
+	    <artifactId>juddi-parent</artifactId>
+	    <version>3.1.0</version>
+	    <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.juddi</groupId>
 	<artifactId>devguide</artifactId>
 	<packaging>jdocbook</packaging>
 	<name>jUDDI Dev Guide -(en-US)</name>
 	<properties>
-		<translation>en-US</translation>
-		<docname>devguide</docname>
-		<bookname>jUDDI Dev Guide</bookname>
+	    <translation>en-US</translation>
+	    <docname>devguide</docname>
+	    <bookname>jUDDI Dev Guide</bookname>
 	</properties>
+        <repositories>
+            <repository>
+                <id>jboss-public-repository-group</id>
+                <name>JBoss Public Repository Group</name>
+                <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+                <layout>default</layout>
+                <releases>
+                    <enabled>true</enabled>
+                    <updatePolicy>never</updatePolicy>
+                </releases>
+                <snapshots>
+                    <enabled>true</enabled>
+                    <updatePolicy>never</updatePolicy>
+                </snapshots>
+            </repository>
+        </repositories>
+
 	<pluginRepositories>
-		<pluginRepository>
-			<id>repository.jboss.org</id>
-			<name>JBoss Repository</name>
-			<layout>default</layout>
-			<url>http://repository.jboss.org/maven2/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>snapshots</id>
-			<name>Apache SnapShot Repository</name>
-			<layout>default</layout>
-			<url>http://people.apache.org/repo/m2-snapshot-repository</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
+            <pluginRepository>
+                <id>jboss-public-repository-group</id>
+                <name>JBoss Public Repository Group</name>
+                <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+                <releases>
+                    <enabled>true</enabled>
+                </releases>
+                <snapshots>
+                    <enabled>true</enabled>
+                </snapshots>
+            </pluginRepository>
+	    <pluginRepository>
+	        <id>snapshots</id>
+		<name>Apache SnapShot Repository</name>
+		<layout>default</layout>
+		<url>http://people.apache.org/repo/m2-snapshot-repository</url>
+		<snapshots>
+		    <enabled>true</enabled>
+		</snapshots>
+	    </pluginRepository>
 	</pluginRepositories>
 	<profiles>
-    <!-- mvn compile -->
-		<profile>
-			<id>all</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jboss.maven.plugins</groupId>
-						<artifactId>maven-jdocbook-plugin</artifactId>
-						<version>2.2.0</version>
-						<extensions>true</extensions>
-						<configuration>
-							<formats>
-								<format>
-									<formatName>pdf</formatName>
-									<stylesheetResource>classpath:/xslt/org/apache/juddi/pdf.xsl</stylesheetResource>
-									<finalName>${docname}.pdf</finalName>
-								</format>
-								<format>
-									<formatName>html</formatName>
-									<stylesheetResource>classpath:/xslt/org/apache/juddi/xhtml.xsl</stylesheetResource>
-									<finalName>index.html</finalName>
-								</format>
-								<format>
-									<formatName>html_single</formatName>
-									<stylesheetResource>classpath:/xslt/org/apache/juddi/xhtml-single.xsl</stylesheetResource>
-									<finalName>index.html</finalName>
-								</format>
-							</formats>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
+	<!-- mvn compile -->
+	    <profile>
+		<id>all</id>
+		<activation>
+		    <activeByDefault>true</activeByDefault>
+		</activation>
+		<build>
+		<plugins>
+		    <plugin>
+			<groupId>org.jboss.maven.plugins</groupId>
+			<artifactId>maven-jdocbook-plugin</artifactId>
+			<version>2.2.0</version>
+			<extensions>true</extensions>
+                        <dependencies>
+                        <!-- Overwrite jboss highlight-->
+                            <dependency>
+                                <groupId>org.richfaces.docs</groupId>
+                                <artifactId>highlight</artifactId>
+                                <version>3.3.3.Final</version>
+                            </dependency>
+                        </dependencies>
 
-    <!-- mvn compile -Phtml -->
-		<profile>
-			<id>html</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
+			<configuration>
+			    <formats>
+			        <format>
+				    <formatName>pdf</formatName>
+				    <stylesheetResource>classpath:/xslt/org/apache/juddi/pdf.xsl</stylesheetResource>
+				    <finalName>${docname}.pdf</finalName>
+				</format>
+				<format>
+				    <formatName>html</formatName>
+				    <stylesheetResource>classpath:/xslt/org/apache/juddi/xhtml.xsl</stylesheetResource>
+				    <finalName>index.html</finalName>
+				</format>
+				<format>
+				    <formatName>html_single</formatName>
+				    <stylesheetResource>classpath:/xslt/org/apache/juddi/xhtml-single.xsl</stylesheetResource>
+				    <finalName>index.html</finalName>
+				</format>
+		           </formats>
+                           <options>
+                               <xincludeSupported>true</xincludeSupported>
+                               <xmlTransformerType>saxon</xmlTransformerType>
+                               <docbookVersion>1.72.0</docbookVersion>
+                           </options>
+			</configuration>
+		    </plugin>
+	        </plugins>
+            </build>
+        </profile>
+    	<!-- mvn compile -Phtml -->
+	<profile>
+	    <id>html</id>
+	    <activation>
+	        <activeByDefault>false</activeByDefault>
+	    </activation>
 			<build>
 				<plugins>
 					<plugin>
@@ -188,15 +220,7 @@
 					<options>
 						<xincludeSupported>true</xincludeSupported>
 						<xmlTransformerType>saxon</xmlTransformerType>
-						<!--
-							needed for uri-resolvers; can be ommitted if using 'current' uri
-							scheme
-						-->
-						<!--
-							could also locate the docbook dependency and inspect its
-							version...
-						-->
-						<docbookVersion>1.72.0</docbookVersion>
+						<docbookVersion>1.74.0</docbookVersion>
 						<transformerParameters>
 							<property>
 								<name>javax.xml.parsers.DocumentBuilderFactory</name>
@@ -212,4 +236,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/docs/userguide/en-US/Administration.xml b/docs/userguide/en-US/Administration.xml
index 3e92c79..08f4cc9 100644
--- a/docs/userguide/en-US/Administration.xml
+++ b/docs/userguide/en-US/Administration.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
diff --git a/docs/userguide/en-US/Authentication.xml b/docs/userguide/en-US/Authentication.xml
index e71f9a0..a8710a1 100644
--- a/docs/userguide/en-US/Authentication.xml
+++ b/docs/userguide/en-US/Authentication.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
diff --git a/docs/userguide/en-US/Author_Group.xml b/docs/userguide/en-US/Author_Group.xml
index a0cbcfc..19bfeba 100644
--- a/docs/userguide/en-US/Author_Group.xml
+++ b/docs/userguide/en-US/Author_Group.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/userguide/en-US/Book_Info.xml b/docs/userguide/en-US/Book_Info.xml
index 441a31d..caee949 100644
--- a/docs/userguide/en-US/Book_Info.xml
+++ b/docs/userguide/en-US/Book_Info.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/userguide/en-US/Conventions.xml b/docs/userguide/en-US/Conventions.xml
index 3b6a317..8183c0f 100644
--- a/docs/userguide/en-US/Conventions.xml
+++ b/docs/userguide/en-US/Conventions.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/userguide/en-US/Database_Setup.xml b/docs/userguide/en-US/Database_Setup.xml
index c33ec06..53f8356 100644
--- a/docs/userguide/en-US/Database_Setup.xml
+++ b/docs/userguide/en-US/Database_Setup.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
@@ -203,4 +220,4 @@
     </section>
     
     
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/docs/userguide/en-US/Feedback.xml b/docs/userguide/en-US/Feedback.xml
index 71a4ddc..c0dbbdd 100644
--- a/docs/userguide/en-US/Feedback.xml
+++ b/docs/userguide/en-US/Feedback.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/userguide/en-US/Getting_Started.xml b/docs/userguide/en-US/Getting_Started.xml
index 849500c..95fe83b 100644
--- a/docs/userguide/en-US/Getting_Started.xml
+++ b/docs/userguide/en-US/Getting_Started.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
@@ -147,4 +164,4 @@
     
     
     
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/docs/userguide/en-US/GlassfishDeploy.xml b/docs/userguide/en-US/GlassfishDeploy.xml
index 0d3a0da..ff7323a 100644
--- a/docs/userguide/en-US/GlassfishDeploy.xml
+++ b/docs/userguide/en-US/GlassfishDeploy.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
diff --git a/docs/userguide/en-US/JBoss6Deploy.xml b/docs/userguide/en-US/JBoss6Deploy.xml
index acb3d4f..d780e39 100644
--- a/docs/userguide/en-US/JBoss6Deploy.xml
+++ b/docs/userguide/en-US/JBoss6Deploy.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
diff --git a/docs/userguide/en-US/JBossDeploy.xml b/docs/userguide/en-US/JBossDeploy.xml
index eadff90..917f48d 100644
--- a/docs/userguide/en-US/JBossDeploy.xml
+++ b/docs/userguide/en-US/JBossDeploy.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
diff --git a/docs/userguide/en-US/Legal_Notice.xml b/docs/userguide/en-US/Legal_Notice.xml
index b58d2cf..45c322c 100644
--- a/docs/userguide/en-US/Legal_Notice.xml
+++ b/docs/userguide/en-US/Legal_Notice.xml
@@ -1,4 +1,21 @@
 <?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 legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
diff --git a/docs/userguide/en-US/Preface.xml b/docs/userguide/en-US/Preface.xml
index 6748eec..9b28bd8 100644
--- a/docs/userguide/en-US/Preface.xml
+++ b/docs/userguide/en-US/Preface.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/userguide/en-US/Revision_History.xml b/docs/userguide/en-US/Revision_History.xml
index 67c92a2..7e21017 100644
--- a/docs/userguide/en-US/Revision_History.xml
+++ b/docs/userguide/en-US/Revision_History.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/userguide/en-US/Root_seed_data.xml b/docs/userguide/en-US/Root_seed_data.xml
index 8051025..dc3bab4 100644
--- a/docs/userguide/en-US/Root_seed_data.xml
+++ b/docs/userguide/en-US/Root_seed_data.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
@@ -125,4 +142,4 @@
     </section>
     
 
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/docs/userguide/en-US/SimplePublish.xml b/docs/userguide/en-US/SimplePublish.xml
index d7f52a0..0b2fc0b 100644
--- a/docs/userguide/en-US/SimplePublish.xml
+++ b/docs/userguide/en-US/SimplePublish.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/userguide/en-US/Subscription.xml b/docs/userguide/en-US/Subscription.xml
index 2fbc1ec..69e2db7 100644
--- a/docs/userguide/en-US/Subscription.xml
+++ b/docs/userguide/en-US/Subscription.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
diff --git a/docs/userguide/en-US/UDDI_Annotations.xml b/docs/userguide/en-US/UDDI_Annotations.xml
index 3fee077..ca3e1e1 100644
--- a/docs/userguide/en-US/UDDI_Annotations.xml
+++ b/docs/userguide/en-US/UDDI_Annotations.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
@@ -180,4 +197,4 @@
         </para>
     </section>
 
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/docs/userguide/en-US/UDDI_Registry.xml b/docs/userguide/en-US/UDDI_Registry.xml
index 4211b12..f87d313 100644
--- a/docs/userguide/en-US/UDDI_Registry.xml
+++ b/docs/userguide/en-US/UDDI_Registry.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
diff --git a/docs/userguide/en-US/Using_UDDI-Client.xml b/docs/userguide/en-US/Using_UDDI-Client.xml
index 073419c..a7bf104 100644
--- a/docs/userguide/en-US/Using_UDDI-Client.xml
+++ b/docs/userguide/en-US/Using_UDDI-Client.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
@@ -208,4 +225,4 @@
     </section>
 
 
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/docs/userguide/en-US/Using_jUDDI-Client.xml b/docs/userguide/en-US/Using_jUDDI-Client.xml
index e4ccd15..47dca0a 100644
--- a/docs/userguide/en-US/Using_jUDDI-Client.xml
+++ b/docs/userguide/en-US/Using_jUDDI-Client.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
@@ -214,4 +231,4 @@
     </section>
 
 
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/docs/userguide/en-US/jUDDI_User_Guide.ent b/docs/userguide/en-US/jUDDI_User_Guide.ent
index 122d472..e9c2d2e 100644
--- a/docs/userguide/en-US/jUDDI_User_Guide.ent
+++ b/docs/userguide/en-US/jUDDI_User_Guide.ent
@@ -1,4 +1,20 @@
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
 <!ENTITY BOOKID "jUDDI_User_Guide">
 <!ENTITY HOLDER "jUDDI Community.">
 <!ENTITY YEAR "2009">
-<!ENTITY VERSION "5.0">
\ No newline at end of file
+<!ENTITY VERSION "5.0">
diff --git a/docs/userguide/en-US/jUDDI_User_Guide.xml b/docs/userguide/en-US/jUDDI_User_Guide.xml
index 841776d..3e97845 100644
--- a/docs/userguide/en-US/jUDDI_User_Guide.xml
+++ b/docs/userguide/en-US/jUDDI_User_Guide.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
 %BOOK_ENTITIES;
diff --git a/docs/userguide/en-US/jUDDI_configuration.xml b/docs/userguide/en-US/jUDDI_configuration.xml
index eaf2cd8..6d859e7 100644
--- a/docs/userguide/en-US/jUDDI_configuration.xml
+++ b/docs/userguide/en-US/jUDDI_configuration.xml
@@ -1,4 +1,21 @@
 <?xml version='1.0'?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % BOOK_ENTITIES SYSTEM "jUDDI_User_Guide.ent">
@@ -195,4 +212,4 @@
 		</para>
 	</section>
     
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/docs/userguide/pom.xml b/docs/userguide/pom.xml
index 24d4098..a9f3e2e 100644
--- a/docs/userguide/pom.xml
+++ b/docs/userguide/pom.xml
@@ -1,5 +1,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+
   <modelVersion>4.0.0</modelVersion>
   <parent>
 	<groupId>org.apache.juddi</groupId>
@@ -17,16 +33,36 @@
     <docname>userguide</docname>
     <bookname>jUDDI User Guide</bookname>
   </properties> 
+    <repositories>
+        <repository>
+            <id>jboss-public-repository-group</id>
+            <name>JBoss Public Repository Group</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+            <layout>default</layout>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
+
   <pluginRepositories>
-    <pluginRepository>
-      <id>repository.jboss.org</id>
-      <name>JBoss Repository</name>
-      <layout>default</layout>
-      <url>http://repository.jboss.org/maven2/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </pluginRepository>
+        <pluginRepository>
+            <id>jboss-public-repository-group</id>
+            <name>JBoss Public Repository Group</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+
     <pluginRepository>
 		<id>snapshots</id>
 		<name>Apache SnapShot Repository</name>
@@ -53,6 +89,14 @@
     				<artifactId>maven-jdocbook-plugin</artifactId>
     				<version>2.2.0</version>
     				<extensions>true</extensions>
+                                <dependencies>
+                                <!-- Overwrite jboss-highlight -->
+                                <dependency>
+                                    <groupId>org.richfaces.docs</groupId>
+                                    <artifactId>highlight</artifactId>
+                                    <version>3.3.3.Final</version>
+                                </dependency>
+			        </dependencies>
     				<configuration>
     				  <formats>
         				<format>
@@ -71,6 +115,11 @@
         				  <finalName>index.html</finalName>
         				</format>
     					</formats>
+                                        <options>
+                                           <xincludeSupported>true</xincludeSupported>
+                                           <xmlTransformerType>saxon</xmlTransformerType>
+                                           <docbookVersion>1.72.0</docbookVersion>
+                                        </options>
   					</configuration>
   				</plugin>
 				</plugins>
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ReadWSDL.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ReadWSDL.java
index 327820b..9ad1b23 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ReadWSDL.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ReadWSDL.java
@@ -14,6 +14,8 @@
  */

 package org.apache.juddi.v3.client.mapping;

 

+import java.net.URI;

+import java.net.URISyntaxException;

 import java.net.URL;

 

 import javax.wsdl.Definition;

@@ -22,6 +24,8 @@
 import javax.wsdl.xml.WSDLLocator;

 import javax.wsdl.xml.WSDLReader;

 

+import org.apache.commons.logging.Log;

+import org.apache.commons.logging.LogFactory;

 import org.apache.juddi.v3.client.ClassUtil;

 

 import com.ibm.wsdl.factory.WSDLFactoryImpl;

@@ -31,13 +35,21 @@
  */

 public class ReadWSDL {

 	

+	private final Log log = LogFactory.getLog(this.getClass());

+	

 	public Definition readWSDL(String fileName) throws WSDLException {

 	

+		Definition wsdlDefinition = null;

 		WSDLFactory factory = WSDLFactoryImpl.newInstance();

 		WSDLReader reader = factory.newWSDLReader();

 		URL url = ClassUtil.getResource(fileName, this.getClass());

-		WSDLLocator locator = new WSDLLocatorImpl(url);

-		Definition wsdlDefinition = reader.readWSDL(locator);

+		try {

+			URI uri = url.toURI();

+			WSDLLocator locator = new WSDLLocatorImpl(uri);

+			wsdlDefinition = reader.readWSDL(locator);

+		} catch (URISyntaxException e) {

+			log.error(e.getMessage(),e);

+		}

 		return wsdlDefinition;

 	}

 	

diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java
index 2237a3b..60ba793 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDLLocatorImpl.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
+ *
  */
 package org.apache.juddi.v3.client.mapping;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import javax.wsdl.xml.WSDLLocator;
@@ -27,123 +28,112 @@
 import org.apache.commons.logging.LogFactory;
 import org.xml.sax.InputSource;
 
-
+/**
+ * Implementation of the interface {@link WSDLLocatorImpl}. 
+ *  
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ *
+ */
 public class WSDLLocatorImpl implements WSDLLocator {
-	
-	  private final Log log = LogFactory.getLog(this.getClass());
-      private URL wsdlURL;
-      private String latestImportURI;
-      private InputStream is = null;
 
-      public WSDLLocatorImpl(URL wsdlFile)
-      {
-         if (wsdlFile == null)
-            throw new IllegalArgumentException("WSDL file argument cannot be null");
+	private final Log log = LogFactory.getLog(this.getClass());
+	private InputStream inputStream = null;
+	private URI baseURI;
+	private String latestImportURI;
+	/**
+	 * Constructor taking the URI to the WSDL. This class implements the {@link WSDLLocatorImpl}
+	 * Interface.
+	 * 
+	 * @param baseURI - URI of the WSDL
+	 */
+	public WSDLLocatorImpl(URI baseURI) {
+		this.baseURI = baseURI;
+	}
+	/**
+	 * @see WSDLLocatorImpl.getBaseInputSource
+	 */
+	public InputSource getBaseInputSource() {
+		InputSource inputSource = null;
+		try {
+			inputStream = baseURI.toURL().openStream();
+			inputSource =new InputSource(inputStream);
+		} catch (IOException e) {
+			log.error(e.getMessage(),e);
+		}
+		return inputSource;
+	}
+	/**
+	 * Internal method to normalize the importUrl. The importLocation can be relative to
+	 * the parentLocation. 
+	 * 
+	 * @param parentLocation
+	 * @param importLocation
+	 * @return
+	 */
+	protected URL constructImportUrl(String parentLocation, String importLocation) {
+		URL importUrl = null;
+		try {
+			URI importLocationURI = new URI(importLocation);
+			if (importLocationURI.getScheme()!=null || parentLocation==null) {
+				importUrl = importLocationURI.toURL();
+			} else {
+				String parentDir = parentLocation.substring(0, parentLocation.lastIndexOf("/"));
+				URI uri = new URI(parentDir + "/" + importLocation);
+				importUrl = uri.normalize().toURL();
+			}
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+		}
+		log.debug("importUrl: " + importUrl.toExternalForm());
+		return importUrl;
+	}
 
-         this.wsdlURL = wsdlFile;
-      }
-
-      public InputSource getBaseInputSource()
-      {
-         log.debug("getBaseInputSource [wsdlUrl=" + wsdlURL + "]");
-         try
-         {
-            is = wsdlURL.openStream();
-            if (is == null)
-               throw new IllegalArgumentException("Cannot obtain wsdl from [" + wsdlURL + "]");
-
-            return new InputSource(is);
-         }
-         catch (IOException e)
-         {
-            throw new RuntimeException("Cannot access wsdl from [" + wsdlURL + "], " + e.getMessage());
-         }
-      }
-
-      public String getBaseURI()
-      {
-         return wsdlURL.toExternalForm();
-      }
-
-      public InputSource getImportInputSource(String parent, String resource)
-      {
-         log.debug("getImportInputSource [parent=" + parent + ",resource=" + resource + "]");
-
-         URL parentURL = null;
-         try
-         {
-            parentURL = new URL(parent);
-         }
-         catch (MalformedURLException e)
-         {
-            log.error("Not a valid URL: " + parent);
-            return null;
-         }
-
-         String wsdlImport = null;
-         String external = parentURL.toExternalForm();
-
-         // An external URL
-         if (resource.startsWith("http://") || resource.startsWith("https://"))
-         {
-            wsdlImport = resource;
-         }
-
-         // Absolute path
-         else if (resource.startsWith("/"))
-         {
-            String beforePath = external.substring(0, external.indexOf(parentURL.getPath()));
-            wsdlImport = beforePath + resource;
-         }
-
-         // A relative path
-         else
-         {
-            String parentDir = external.substring(0, external.lastIndexOf("/"));
-
-            // remove references to current dir
-            while (resource.startsWith("./"))
-               resource = resource.substring(2);
-
-            // remove references to parentdir
-            while (resource.startsWith("../"))
-            {
-               parentDir = parentDir.substring(0, parentDir.lastIndexOf("/"));
-               resource = resource.substring(3);
-            }
-
-            wsdlImport = parentDir + "/" + resource;
-         }
-
-         try
-         {
-            log.debug("Resolved to: " + wsdlImport);
-            InputStream is = new URL(wsdlImport).openStream();
-            if (is == null)
-               throw new IllegalArgumentException("Cannot import wsdl from [" + wsdlImport + "]");
-
-            latestImportURI = wsdlImport;
-            return new InputSource(is);
-         }
-         catch (IOException e)
-         {
-            throw new RuntimeException("Cannot access imported wsdl [" + wsdlImport + "], " + e.getMessage());
-         }
-      }
-
-      public String getLatestImportURI()
-      {
-         return latestImportURI;
-      }
-
+	/**
+	 * @see WSDLLocatorImpl.getImportInputSource
+	 */
+	public InputSource getImportInputSource(String parentLocation, String importLocation)
+	{
+		InputSource inputSource = null;
+		try {
+			URL importUrl = constructImportUrl(parentLocation, importLocation);
+			InputStream inputStream = importUrl.openStream();
+			inputSource = new InputSource(inputStream);
+			latestImportURI = importUrl.toExternalForm();
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+		}
+		return inputSource;
+	}
+	/**
+	 * @see WSDLLocatorImpl.getBaseURI
+	 */
+	public String getBaseURI() {
+		String baseURIStr = null;
+		try {
+			baseURIStr = baseURI.toURL().toExternalForm();
+		} catch (IOException e) {
+			log.error(e.getMessage(),e);
+		}
+		return baseURIStr;
+	}
+	/**
+	 * @see WSDLLocatorImpl.getLatestImportURI
+	 */
+	public String getLatestImportURI() {
+		return latestImportURI;
+	}
+	/**
+	 * @see WSDLLocatorImpl.close
+	 */
 	public void close() {
-		if (is!=null)
+		if (inputStream!=null) {
 			try {
-				is.close();
+				inputStream.close();
 			} catch (IOException e) {
 				log.error(e.getMessage(),e);
 			}
-		
+		}
 	}
-   }
+
+}
 
diff --git a/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLLocatorTest.java b/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLLocatorTest.java
new file mode 100644
index 0000000..0e7f37a
--- /dev/null
+++ b/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WSDLLocatorTest.java
@@ -0,0 +1,91 @@
+/*

+ * 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.

+ */

+package org.apache.juddi.v3.client.mapping;

+

+import java.io.File;

+import java.net.URISyntaxException;

+import java.net.URL;

+

+import org.apache.juddi.v3.client.ClassUtil;

+import org.junit.Assert;

+import org.junit.Test;

+

+/**

+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>

+ */

+public class WSDLLocatorTest {

+

+	@Test

+	public void testResolveAbsoluteURL() {

+		WSDLLocatorImpl wsdlLocatorImpl = new WSDLLocatorImpl(null);

+		URL url = wsdlLocatorImpl.constructImportUrl(null, "http://localhost/file.wsdl");

+		Assert.assertEquals("http://localhost/file.wsdl", url.toExternalForm());

+	}

+	

+	@Test

+	public void testResolveAbsoluteURL2() {

+		WSDLLocatorImpl wsdlLocatorImpl = new WSDLLocatorImpl(null);

+		URL url = wsdlLocatorImpl.constructImportUrl("should get ignored", "http://localhost/file.wsdl");

+		Assert.assertEquals("http://localhost/file.wsdl", url.toExternalForm());

+	}

+	

+	@Test

+	public void testResolveInCurrentDir() {

+		WSDLLocatorImpl wsdlLocatorImpl = new WSDLLocatorImpl(null);

+		URL wsdlFile = ClassUtil.getResource("wsdl/HelloWorld.wsdl", this.getClass());

+		if (wsdlFile==null) Assert.fail("Can not find HelloWorld.wsdl file");

+		String wsdlFileStr = wsdlFile.toExternalForm();

+		String wsdlDir = wsdlFileStr.substring(0,wsdlFileStr.lastIndexOf(File.separator));

+		URL url = wsdlLocatorImpl.constructImportUrl(wsdlFileStr, "child.wsdl");

+		Assert.assertEquals(wsdlDir + "/child.wsdl", url.toExternalForm());

+	}

+	

+	@Test

+	public void testResolveInCurrentDir2() {

+		WSDLLocatorImpl wsdlLocatorImpl = new WSDLLocatorImpl(null);

+		URL wsdlFile = ClassUtil.getResource("wsdl/HelloWorld.wsdl", this.getClass());

+		if (wsdlFile==null) Assert.fail("Can not find HelloWorld.wsdl file");

+		String wsdlFileStr = wsdlFile.toExternalForm();

+		String wsdlDir = wsdlFileStr.substring(0,wsdlFileStr.lastIndexOf(File.separator));

+		URL url = wsdlLocatorImpl.constructImportUrl(wsdlFileStr, "./child.wsdl");

+		Assert.assertEquals(wsdlDir + "/child.wsdl", url.toExternalForm());

+	}

+	

+	@Test

+	public void testResolveInParentDir() {

+		WSDLLocatorImpl wsdlLocatorImpl = new WSDLLocatorImpl(null);

+		URL wsdlFile = ClassUtil.getResource("wsdl/HelloWorld.wsdl", this.getClass());

+		if (wsdlFile==null) Assert.fail("Can not find HelloWorld.wsdl file");

+		String wsdlFileStr = wsdlFile.toExternalForm();

+		String wsdlDir = wsdlFileStr.substring(0,wsdlFileStr.lastIndexOf("/"));

+		wsdlDir = wsdlDir.substring(0, wsdlDir.lastIndexOf("/"));

+		URL url = wsdlLocatorImpl.constructImportUrl(wsdlFileStr, "../child.wsdl");

+		Assert.assertEquals(wsdlDir + "/child.wsdl", url.toExternalForm());

+	}

+	

+	@Test

+	public void testResolveInParentDir2() throws URISyntaxException {

+		WSDLLocatorImpl wsdlLocatorImpl = new WSDLLocatorImpl(null);

+		URL wsdlFile = ClassUtil.getResource("wsdl/HelloWorld.wsdl", this.getClass());

+		if (wsdlFile==null) Assert.fail("Can not find HelloWorld.wsdl file");

+		String wsdlFileStr = wsdlFile.toExternalForm();

+		String wsdlDir = wsdlFileStr.substring(0,wsdlFileStr.lastIndexOf("/"));

+		wsdlDir = wsdlDir.substring(0, wsdlDir.lastIndexOf("/"));

+		wsdlDir = wsdlDir.substring(0, wsdlDir.lastIndexOf("/"));

+		URL url = wsdlLocatorImpl.constructImportUrl(wsdlFileStr, "../../child.wsdl");

+		Assert.assertEquals(wsdlDir + "/child.wsdl", url.toExternalForm());

+	}

+	

+}

diff --git a/juddi-console/juddi-portal/assembly.xml b/juddi-console/juddi-portal/assembly.xml
index 64cbf89..1d15dd2 100644
--- a/juddi-console/juddi-portal/assembly.xml
+++ b/juddi-console/juddi-portal/assembly.xml
@@ -1,3 +1,19 @@
+<!--
+ * 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.
+ *
+ */ -->
 <assembly>
 	<id />
 	<formats>
@@ -11,4 +27,4 @@
 			<outputDirectory />
 		</fileSet>
 	</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/juddi-console/juddi-portal/build.xml b/juddi-console/juddi-portal/build.xml
index 254e1c6..38bf04c 100644
--- a/juddi-console/juddi-portal/build.xml
+++ b/juddi-console/juddi-portal/build.xml
@@ -1,3 +1,19 @@
+<!--
+ * 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.
+ *
+ */ -->
 <project name="juddi-portal.tomcat" default="package-tomcat" basedir=".">
 	<property name="lib.dir" value="${basedir}/target/tomcat/juddi-tomcat-${juddi.tomcat.version}/lib"/>
 	<property name="conf.dir" value="${basedir}/target/tomcat/juddi-tomcat-${juddi.tomcat.version}/conf"/>
diff --git a/juddi-console/juddi-portal/package.properties b/juddi-console/juddi-portal/package.properties
index 626001f..c3608a3 100644
--- a/juddi-console/juddi-portal/package.properties
+++ b/juddi-console/juddi-portal/package.properties
@@ -1 +1,14 @@
+# 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.
 juddi.tomcat.version=3.0.2-SNAPSHOT
diff --git a/juddi-console/juddi-portal/pluto.xml b/juddi-console/juddi-portal/pluto.xml
index fc9734f..8f7f368 100644
--- a/juddi-console/juddi-portal/pluto.xml
+++ b/juddi-console/juddi-portal/pluto.xml
@@ -1 +1,17 @@
-<Context path="pluto" crossContext="true"></Context>
\ No newline at end of file
+<!--
+ * 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.
+ *
+ */ -->
+<Context path="pluto" crossContext="true"></Context>
diff --git a/juddi-console/juddi-portal/pluto/unitpngfix.js b/juddi-console/juddi-portal/pluto/unitpngfix.js
index 3f96f23..54de764 100644
--- a/juddi-console/juddi-portal/pluto/unitpngfix.js
+++ b/juddi-console/juddi-portal/pluto/unitpngfix.js
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ *
+ */
+
 var clear="clear.gif" //path to clear.gif
 
 pngfix=function(){
@@ -32,4 +49,4 @@
 		}
 	}
 }
-window.attachEvent('onload',pngfix);
\ No newline at end of file
+window.attachEvent('onload',pngfix);
diff --git a/juddi-console/juddi-portal/tomcat-users.xml b/juddi-console/juddi-portal/tomcat-users.xml
index f2e39e0..51ba78f 100644
--- a/juddi-console/juddi-portal/tomcat-users.xml
+++ b/juddi-console/juddi-portal/tomcat-users.xml
@@ -1,4 +1,20 @@
 <?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.
+ *
+ */ -->
 <tomcat-users>
   <role rolename="pluto"/>
   <role rolename="tomcat"/>
diff --git a/juddi-console/pom.xml b/juddi-console/pom.xml
index e20630e..7541884 100644
--- a/juddi-console/pom.xml
+++ b/juddi-console/pom.xml
@@ -21,6 +21,9 @@
 	<artifactId>juddi-console</artifactId>
 	<name>jUDDI Console</name>
 	<packaging>pom</packaging>
+	 <prerequisites>
+      <maven>3.0.3</maven>
+    </prerequisites>
 	<modules>
 		<module>uddi-portlets</module>
 		<module>juddi-portal</module>
diff --git a/juddi-console/uddi-portlets/pom.xml b/juddi-console/uddi-portlets/pom.xml
index 36c9c6c..6039c00 100644
--- a/juddi-console/uddi-portlets/pom.xml
+++ b/juddi-console/uddi-portlets/pom.xml
@@ -153,7 +153,7 @@
 						<goals>
 							<goal>mergewebxml</goal>
 							<goal>compile</goal>
-							<goal>test</goal>
+							<goal>test</goal> 
 						</goals>
 					</execution>
 				</executions>
diff --git a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/JUDDIPublisher.gwt.xml b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/JUDDIPublisher.gwt.xml
index 935187d..2fe55c0 100644
--- a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/JUDDIPublisher.gwt.xml
+++ b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/JUDDIPublisher.gwt.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?><module>
-
+<!--
+ * 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.
+ *
+ */ -->
       <!-- Inherit the core Web Toolkit stuff.                        -->
       <inherits name="com.google.gwt.user.User"/>   	
     
@@ -12,4 +27,4 @@
 	  <servlet class="org.apache.juddi.portlets.server.service.SecurityServiceImpl" path="/security"/>
 	  <servlet class="org.apache.juddi.portlets.server.service.JUDDIApiServiceImpl" path="/juddi-api"/>
 	 
-</module>
\ No newline at end of file
+</module>
diff --git a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDIBrowser.gwt.xml b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDIBrowser.gwt.xml
index 4b7a837..93097f2 100644
--- a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDIBrowser.gwt.xml
+++ b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDIBrowser.gwt.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?><module>
-
+<!--
+ * 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.
+ *
+ */ -->
       <!-- Inherit the core Web Toolkit stuff.                        -->
       <inherits name="com.google.gwt.user.User"/>   	
     
@@ -15,4 +30,4 @@
 	  <servlet class="org.apache.juddi.portlets.server.service.PublicationServiceImpl" path="/publication"/>
 	  <servlet class="org.apache.juddi.portlets.server.service.FindServiceImpl"     path="/find"/>
 	 
-</module>
\ No newline at end of file
+</module>
diff --git a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISearch.gwt.xml b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISearch.gwt.xml
index b3c0747..edb9de0 100644
--- a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISearch.gwt.xml
+++ b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISearch.gwt.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?><module>
+<!--
+ * 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.
+ *
+ */ -->
 
       <!-- Inherit the core Web Toolkit stuff.                        -->
       <inherits name="com.google.gwt.user.User"/>   	
@@ -13,4 +29,4 @@
 	  <servlet class="org.apache.juddi.portlets.server.service.InquiryServiceImpl"     path="/inquiry"/>
 	  <servlet class="org.apache.juddi.portlets.server.service.PublicationServiceImpl" path="/publication"/>
 	 
-</module>
\ No newline at end of file
+</module>
diff --git a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISubscription.gwt.xml b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISubscription.gwt.xml
index 4a035b6..0461711 100644
--- a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISubscription.gwt.xml
+++ b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISubscription.gwt.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?><module>
+<!--
+ * 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.
+ *
+ */ -->
+
 
       <!-- Inherit the core Web Toolkit stuff.                        -->
       <inherits name="com.google.gwt.user.User"/>   	
@@ -12,4 +29,4 @@
 	  <servlet class="org.apache.juddi.portlets.server.service.SecurityServiceImpl"     path="/security"/>
 	  <servlet class="org.apache.juddi.portlets.server.service.SubscriptionServiceImpl" path="/subscription"/>
 	 
-</module>
\ No newline at end of file
+</module>
diff --git a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISubscriptionNotification.gwt.xml b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISubscriptionNotification.gwt.xml
index 33ec933..bdccb44 100644
--- a/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISubscriptionNotification.gwt.xml
+++ b/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/UDDISubscriptionNotification.gwt.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?><module>
+<!--
+ * 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.
+ *
+ */ -->        
 
       <!-- Inherit the core Web Toolkit stuff.                        -->
       <inherits name="com.google.gwt.user.User"/>   	
@@ -11,4 +27,4 @@
 
 	  <servlet class="org.apache.juddi.portlets.server.service.NotifyServiceImpl" path="/notify"/>	
 	 
-</module>
\ No newline at end of file
+</module>
diff --git a/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml b/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
index b4c12e1..53e9a79 100644
--- a/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
+++ b/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ * 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.
+ *
+ */ -->
 
 <uddi>
     <reloadDelay>5000</reloadDelay>
@@ -51,4 +67,4 @@
 	   </clerks>
 	</manager> 
    
-</uddi>
\ No newline at end of file
+</uddi>
diff --git a/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing b/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing
index 6f27209..0b51ba2 100644
--- a/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing
+++ b/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ * 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.
+ *
+ */ -->
 
 <uddi>
     <reloadDelay>5000</reloadDelay>
@@ -45,4 +61,4 @@
 	   </clerks>
 	</manager> 
    
-</uddi>
\ No newline at end of file
+</uddi>
diff --git a/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales b/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales
index 2f1649b..925a15d 100644
--- a/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales
+++ b/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ * 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.
+ *
+ */ -->
 
 <uddi>
     <reloadDelay>5000</reloadDelay>
@@ -45,4 +61,4 @@
 	   </clerks>
 	</manager> 
    
-</uddi>
\ No newline at end of file
+</uddi>
diff --git a/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/classes/juddiv3.properties b/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/classes/juddiv3.properties
index 1793a0a..3c66392 100644
--- a/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/classes/juddiv3.properties
+++ b/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/classes/juddiv3.properties
@@ -1,3 +1,17 @@
+# 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.
+
 ################################################################
 #                 jUDDI-v3.0 configuration.                    #
 ################################################################
diff --git a/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/classes/log4j.properties b/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/classes/log4j.properties
index b37c93a..336e836 100644
--- a/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -1,3 +1,16 @@
+# 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.
 
 log4j.rootLogger=INFO, logfile
 
diff --git a/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/portlet.xml b/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/portlet.xml
index f05f7e2..5719675 100644
--- a/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/portlet.xml
+++ b/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/portlet.xml
@@ -1,3 +1,19 @@
+<!--
+ * 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.
+ *
+ */ -->
 <portlet-app id="browser-container"
     xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
     version="1.0"
diff --git a/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/web.xml b/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/web.xml
index 641779e..fcb8676 100644
--- a/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/web.xml
+++ b/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,23 @@
 <!DOCTYPE web-app PUBLIC
  "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
  "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
+<!--
+ * 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.
+ *
+ * 
+ -->
 <web-app>
 	<display-name>GWT-Maven-Archetype</display-name>
 		
diff --git a/juddi-console/uddi-portlets/src/main/webapp/index.html b/juddi-console/uddi-portlets/src/main/webapp/index.html
index c39c4cb..9e2fc3f 100644
--- a/juddi-console/uddi-portlets/src/main/webapp/index.html
+++ b/juddi-console/uddi-portlets/src/main/webapp/index.html
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * 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.
+ *
+ * -->
 <html>
 <head>
 <!-- forward to the GWT Example Application -->
 <meta http-equiv="REFRESH"
 	content="0;url=org.apache.juddi.portlets.JUDDIPublisher/JUDDIPublisher.html">
 </HEAD>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/juddi-console/uddi-portlets/src/test/java/org/apache/juddi/portlets/AStandardNonGwtTest.java b/juddi-console/uddi-portlets/src/test/java/org/apache/juddi/portlets/AStandardNonGwtTest.java
index 7f989c6..1129837 100644
--- a/juddi-console/uddi-portlets/src/test/java/org/apache/juddi/portlets/AStandardNonGwtTest.java
+++ b/juddi-console/uddi-portlets/src/test/java/org/apache/juddi/portlets/AStandardNonGwtTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ *
+ */
 package org.apache.juddi.portlets;
 
 import junit.framework.Assert;
@@ -13,4 +29,4 @@
         Assert.assertTrue(true);
     }
     
-}
\ No newline at end of file
+}
diff --git a/juddi-console/uddi-portlets/tomcat/conf/web.xml b/juddi-console/uddi-portlets/tomcat/conf/web.xml
index 99c9bbb..16d76bb 100644
--- a/juddi-console/uddi-portlets/tomcat/conf/web.xml
+++ b/juddi-console/uddi-portlets/tomcat/conf/web.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * 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.
+ *
+ * 
+ -->
 <!-- A tweaked version of the default Tomcat web.xml to remove everything except the stuff we want to use -->
 <web-app version="2.4">
 
diff --git a/juddi-console/uddi-portlets/tomcat/webapps/ROOT/WEB-INF/web.xml b/juddi-console/uddi-portlets/tomcat/webapps/ROOT/WEB-INF/web.xml
index e600b2f..5a2421b 100644
--- a/juddi-console/uddi-portlets/tomcat/webapps/ROOT/WEB-INF/web.xml
+++ b/juddi-console/uddi-portlets/tomcat/webapps/ROOT/WEB-INF/web.xml
@@ -1,4 +1,20 @@
 <?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.
+ *
+ * -->
 <web-app>
 
 	<servlet>
diff --git a/juddi-console/uddi-portlets/uddi-portlets.launch b/juddi-console/uddi-portlets/uddi-portlets.launch
index 09d2baa..b127df9 100644
--- a/juddi-console/uddi-portlets/uddi-portlets.launch
+++ b/juddi-console/uddi-portlets/uddi-portlets.launch
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ * 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.
+ *
+ */ -->
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/juddi-console"/>
diff --git a/juddi-core-openjpa/pom.xml b/juddi-core-openjpa/pom.xml
index dc07dd5..42a4245 100644
--- a/juddi-core-openjpa/pom.xml
+++ b/juddi-core-openjpa/pom.xml
@@ -28,7 +28,7 @@
 		<persistence>openjpa</persistence>
 	</properties>
 	
-	<name>jUDDI Core</name>
+	<name>jUDDI Core - OpenJPA</name>
 	<build>
 		<plugins>	
 			<plugin>
@@ -149,6 +149,13 @@
 			<artifactId>mockejb</artifactId>
 			<version>0.6-beta2</version>
 			<scope>test</scope>
+			<exclusions>  
+  			   <exclusion>
+				<groupId>cglib</groupId>
+				<artifactId>cglib-full</artifactId>	
+                           </exclusion>
+                        </exclusions>
+
 		</dependency>
 		<dependency>
 			<groupId>cglib</groupId>
@@ -165,7 +172,7 @@
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
-			<version>10.5.3.0</version>
+			<version>10.5.3.0_1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -174,12 +181,18 @@
 			<version>8.2-504.jdbc3</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>6.0</version>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.4_mail</artifactId>
+            <version>1.8.2</version>
+            <scope>provided</scope>
+        </dependency>
 
 	</dependencies>
 	<profiles>
diff --git a/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/notify/NotifierTest.java b/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/notify/NotifierTest.java
index 15b0001..8411157 100644
--- a/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/notify/NotifierTest.java
+++ b/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/notify/NotifierTest.java
@@ -43,8 +43,7 @@
 		
 		Assert.assertEquals(HTTPNotifier.class, notifier.getClass());
 	}
-	//Expected error because we don't have a javax.mail implementation on the classpath
-	@Test(expected=java.lang.ClassFormatError.class)
+	@Test
 	public void testSMTPNotifier() throws IllegalArgumentException, SecurityException, URISyntaxException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, ClassNotFoundException {
 		BindingTemplate bindingTemplate = new BindingTemplate();
 		bindingTemplate.setEntityKey("uddi:uddi.joepublisher.com:bindingnotifier");
diff --git a/juddi-core/pom.xml b/juddi-core/pom.xml
index d50687a..f214fdd 100644
--- a/juddi-core/pom.xml
+++ b/juddi-core/pom.xml
@@ -148,16 +148,22 @@
 			<artifactId>commons-configuration</artifactId>
 			<version>1.6</version>
 		</dependency>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>6.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.4_mail</artifactId>
+            <version>1.8.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
-			<version>10.5.3.0</version>
+			<version>10.5.3.0_1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
index b280435..6ee9e69 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
@@ -57,8 +57,6 @@
 import org.apache.juddi.mapping.MappingModelToApi;

 import org.apache.juddi.v3.error.ErrorMessage;

 import org.apache.juddi.v3.error.FatalErrorException;

-import org.apache.juddi.v3.error.RegistryException;

-import org.apache.juddi.v3.error.UDDIErrorHelper;

 import org.apache.juddi.validation.ValidatePublish;

 import org.apache.juddi.query.FetchBusinessEntitiesQuery;

 import org.apache.juddi.query.FetchTModelsQuery;

@@ -68,7 +66,6 @@
 import org.apache.juddi.query.DeletePublisherAssertionByBusinessQuery;

 import org.apache.juddi.query.TModelQuery;

 import org.apache.juddi.model.UddiEntityPublisher;

-import org.apache.juddi.api.util.InquiryQuery;

 import org.apache.juddi.api.util.PublicationQuery;

 import org.apache.juddi.api.util.QueryStatus;

 import org.apache.juddi.config.AppConfig;

@@ -93,7 +90,7 @@
             serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(this.getClass());

         }

 	

-	public DispositionReport addPublisherAssertions(AddPublisherAssertions body)

+	public void addPublisherAssertions(AddPublisherAssertions body)

 			throws DispositionReportFaultMessage {

 	        long startTime = System.nanoTime();

 

@@ -168,10 +165,9 @@
 			}

 			em.close();

 		}

-		return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);

 	}

 

-	public DispositionReport deleteBinding(DeleteBinding body)

+	public void deleteBinding(DeleteBinding body)

 			throws DispositionReportFaultMessage {

 	        long startTime = System.nanoTime();

 

@@ -209,10 +205,9 @@
 			}

 			em.close();

 		}

-		return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);

 	}

 

-	public DispositionReport deleteBusiness(DeleteBusiness body)

+	public void deleteBusiness(DeleteBusiness body)

 			throws DispositionReportFaultMessage {

 	        long startTime = System.nanoTime();

 

@@ -244,10 +239,9 @@
 			}

 			em.close();

 		}

-		return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);

 	}

 

-	public DispositionReport deletePublisherAssertions(DeletePublisherAssertions body)

+	public void deletePublisherAssertions(DeletePublisherAssertions body)

 			throws DispositionReportFaultMessage {

 	        long startTime = System.nanoTime();

 

@@ -281,10 +275,9 @@
 			}

 			em.close();

 		}

-		return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);

 	}

 

-	public DispositionReport deleteService(DeleteService body)

+	public void deleteService(DeleteService body)

 			throws DispositionReportFaultMessage {

 	        long startTime = System.nanoTime();

 

@@ -320,11 +313,10 @@
 			}

 			em.close();

 		}

-		return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);

 	}

 

 

-	public DispositionReport deleteTModel(DeleteTModel body)

+	public void deleteTModel(DeleteTModel body)

 			throws DispositionReportFaultMessage {

 	        long startTime = System.nanoTime();

 

@@ -358,7 +350,6 @@
 			}

 			em.close();

 		}

-		return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);

 	}

 

 

diff --git a/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java
index cef0fd5..6d15700 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java
@@ -38,7 +38,7 @@
 

 	static {

 		StringBuffer sql = new StringBuffer(200);

-		sql.append("delete " + ENTITY_ALIAS + " from " + ENTITY_NAME + " " + ENTITY_ALIAS + " ");

+		sql.append("delete from " + ENTITY_NAME + " " + ENTITY_ALIAS + " ");

 		deleteSQL = sql.toString();

 	}

 	

diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java
index f780905..cf2494a 100644
--- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java
+++ b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java
@@ -33,7 +33,6 @@
 import org.uddi.api_v3.DeletePublisherAssertions;
 import org.uddi.api_v3.DeleteService;
 import org.uddi.api_v3.DeleteTModel;
-import org.uddi.api_v3.DispositionReport;
 import org.uddi.api_v3.GetRegisteredInfo;
 import org.uddi.api_v3.PublisherAssertion;
 import org.uddi.api_v3.RegisteredInfo;
@@ -59,34 +58,34 @@
 		super(port);
 	}
 
-	public DispositionReport addPublisherAssertions(AddPublisherAssertions body)
+	public void addPublisherAssertions(AddPublisherAssertions body)
 			throws RemoteException {
-		return publication.addPublisherAssertions(body);
+		publication.addPublisherAssertions(body);
 	}
 
-	public DispositionReport deleteBinding(DeleteBinding body)
+	public void deleteBinding(DeleteBinding body)
 			throws RemoteException {
-		return publication.deleteBinding(body);
+		publication.deleteBinding(body);
 	}
 
-	public DispositionReport deleteBusiness(DeleteBusiness body)
+	public void deleteBusiness(DeleteBusiness body)
 			throws RemoteException {
-		return publication.deleteBusiness(body);
+		publication.deleteBusiness(body);
 	}
 
-	public DispositionReport deletePublisherAssertions(DeletePublisherAssertions body)
+	public void deletePublisherAssertions(DeletePublisherAssertions body)
 			throws RemoteException {
-		return publication.deletePublisherAssertions(body);
+		publication.deletePublisherAssertions(body);
 	}
 
-	public DispositionReport deleteService(DeleteService body)
+	public void deleteService(DeleteService body)
 			throws RemoteException {
-		return publication.deleteService(body);
+		publication.deleteService(body);
 	}
 
-	public DispositionReport deleteTModel(DeleteTModel body)
+	public void deleteTModel(DeleteTModel body)
 			throws RemoteException {
-		return publication.deleteTModel(body);
+		publication.deleteTModel(body);
 	}
 
 	public List<AssertionStatusItem> getAssertionStatusReport(String authInfo,
diff --git a/juddi-dist/assembly.xml b/juddi-dist/assembly.xml
index 75d7853..e3af410 100644
--- a/juddi-dist/assembly.xml
+++ b/juddi-dist/assembly.xml
@@ -1,3 +1,19 @@
+<!--
+ * 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.
+ *
+ */ -->
 <assembly>
     <id>dist</id>
     <formats>
diff --git a/juddi-dist/build.xml b/juddi-dist/build.xml
index f368d37..f0b9f8d 100644
--- a/juddi-dist/build.xml
+++ b/juddi-dist/build.xml
@@ -1,3 +1,19 @@
+<!--
+ * 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.
+ *
+ */ -->
 <project name="juddi-dist" default="package-dist" basedir=".">
 	<property file="package.properties"/>
 	<property name="dist.dir" value="${basedir}/target/dist"/>
diff --git a/pom.xml b/pom.xml
index 89775fc..19a6766 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>7</version>
+        <version>9</version>
     </parent>
 	<packaging>pom</packaging>
 	<groupId>org.apache.juddi</groupId>
@@ -32,6 +32,10 @@
 		Integration (UDDI) specification for Web Services.</description>
 	<url>http://juddi.apache.org/</url>
 	
+	<prerequisites>
+      <maven>3.0.3</maven>
+    </prerequisites>
+	
 	<properties>
         <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -291,7 +295,7 @@
 		<repository>
 			<id>jboss</id>
 			<name>JBoss Repository</name>
-			<url>http://repository.jboss.org/maven2</url>	
+			<url>http://repository.jboss.org/nexus/content/groups/public</url>	
 			<layout>default</layout>
 		</repository>
 	</repositories>
diff --git a/qa/GettingStarted.txt b/qa/GettingStarted.txt
index e7c2c83..e7e78eb 100644
--- a/qa/GettingStarted.txt
+++ b/qa/GettingStarted.txt
@@ -1,3 +1,17 @@
+# 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.
+
 To run the qa tests
 
 1. Start the jUDDI server at port 8080.
diff --git a/qa/QATestingProcess.odp b/qa/QATestingProcess.odp
index 73185b1..9ef2c04 100644
--- a/qa/QATestingProcess.odp
+++ b/qa/QATestingProcess.odp
Binary files differ
diff --git a/qa/QATestingProcess.pdf b/qa/QATestingProcess.pdf
index bd95314..b1b9b19 100644
--- a/qa/QATestingProcess.pdf
+++ b/qa/QATestingProcess.pdf
Binary files differ
diff --git a/qa/juddi-xlt/build.properties b/qa/juddi-xlt/build.properties
index 02aece8..212e0a9 100644
--- a/qa/juddi-xlt/build.properties
+++ b/qa/juddi-xlt/build.properties
@@ -1,3 +1,17 @@
+# 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.

+

 # configure the location of XLT 

 fs = ${file.separator}

 xlt.home.dir = ..${fs}target${fs}xlt-3.3.0-r3088${fs}

diff --git a/qa/juddi-xlt/config/data/default/companies.txt b/qa/juddi-xlt/config/data/default/companies.txt
index ac41d64..527718d 100644
--- a/qa/juddi-xlt/config/data/default/companies.txt
+++ b/qa/juddi-xlt/config/data/default/companies.txt
@@ -1,3 +1,14 @@
+# 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.

 1838 Bond-Deb Trading Fund

 1st Source Corp

 20th Century Industries

diff --git a/qa/juddi-xlt/config/data/default/countries.txt b/qa/juddi-xlt/config/data/default/countries.txt
index a25b410..6908207 100644
--- a/qa/juddi-xlt/config/data/default/countries.txt
+++ b/qa/juddi-xlt/config/data/default/countries.txt
@@ -1,3 +1,14 @@
+# 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.

 Online shopping

 Shopping Center

 Central intelligence

diff --git a/qa/juddi-xlt/config/data/default/emails.txt b/qa/juddi-xlt/config/data/default/emails.txt
index 6123a43..ada1419 100644
--- a/qa/juddi-xlt/config/data/default/emails.txt
+++ b/qa/juddi-xlt/config/data/default/emails.txt
@@ -1,3 +1,14 @@
+# 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.

 loadtest01@gmail.com

 loadtest02@gmail.com

 loadtest03@gmail.com

diff --git a/qa/juddi-xlt/config/data/default/firstnames.txt b/qa/juddi-xlt/config/data/default/firstnames.txt
index 9b08c97..18c91f4 100644
--- a/qa/juddi-xlt/config/data/default/firstnames.txt
+++ b/qa/juddi-xlt/config/data/default/firstnames.txt
@@ -1,3 +1,14 @@
+# 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.

 Aaliea

 Aaliyah

 Aamir

diff --git a/qa/juddi-xlt/config/data/default/lastnames.txt b/qa/juddi-xlt/config/data/default/lastnames.txt
index ba5b9fb..3a3d731 100644
--- a/qa/juddi-xlt/config/data/default/lastnames.txt
+++ b/qa/juddi-xlt/config/data/default/lastnames.txt
@@ -1,3 +1,14 @@
+# 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.

 Aagaard

 Aalders

 Aaltonen

diff --git a/qa/juddi-xlt/config/data/default/nouns.txt b/qa/juddi-xlt/config/data/default/nouns.txt
index a50f67d..68cc7db 100644
--- a/qa/juddi-xlt/config/data/default/nouns.txt
+++ b/qa/juddi-xlt/config/data/default/nouns.txt
@@ -1,3 +1,14 @@
+# 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.

 aangles

 aardvark

 aardvarks

diff --git a/qa/juddi-xlt/config/data/default/searchphrases.txt b/qa/juddi-xlt/config/data/default/searchphrases.txt
index 0bcc739..a920648 100644
--- a/qa/juddi-xlt/config/data/default/searchphrases.txt
+++ b/qa/juddi-xlt/config/data/default/searchphrases.txt
@@ -1,3 +1,14 @@
+# 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.

 852658

 bottle

 pants

diff --git a/qa/juddi-xlt/config/data/default/sentences.txt b/qa/juddi-xlt/config/data/default/sentences.txt
index cf3d7a6..0d506ec 100644
--- a/qa/juddi-xlt/config/data/default/sentences.txt
+++ b/qa/juddi-xlt/config/data/default/sentences.txt
@@ -1,3 +1,14 @@
+# 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.

 Telia pulled the dress over her head and down her body, smoothing the pale fabric thoughtfully.

 She felt something different this morning.

 Anticipation.

diff --git a/qa/juddi-xlt/config/data/default/streets.txt b/qa/juddi-xlt/config/data/default/streets.txt
index 2ec655b..78dde65 100644
--- a/qa/juddi-xlt/config/data/default/streets.txt
+++ b/qa/juddi-xlt/config/data/default/streets.txt
@@ -1,3 +1,14 @@
+# 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.

 ping ntwegaNorderwieke

 15 bis Rue JOBBE-DUVAL

 224 bis Rue Marcadet

diff --git a/qa/juddi-xlt/config/data/default/towns.txt b/qa/juddi-xlt/config/data/default/towns.txt
index 9f4230d..d96de82 100644
--- a/qa/juddi-xlt/config/data/default/towns.txt
+++ b/qa/juddi-xlt/config/data/default/towns.txt
@@ -1,3 +1,14 @@
+# 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.

 ALFTER

 ANNABURG

 ATHEN

diff --git a/qa/juddi-xlt/config/data/default/words.txt b/qa/juddi-xlt/config/data/default/words.txt
index bd3d4c9..ffd19f7 100644
--- a/qa/juddi-xlt/config/data/default/words.txt
+++ b/qa/juddi-xlt/config/data/default/words.txt
@@ -1,3 +1,14 @@
+# 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.

 A Christmas Carol

 A Comedy of Errors

 A Midsummer Night's Dream

diff --git a/qa/juddi-xlt/config/default.properties b/qa/juddi-xlt/config/default.properties
index d1b59be..57d7127 100644
--- a/qa/juddi-xlt/config/default.properties
+++ b/qa/juddi-xlt/config/default.properties
@@ -1,3 +1,17 @@
+# 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.

+

 #####################################################################

 #

 # General Settings

diff --git a/qa/juddi-xlt/config/dev-log4j.properties b/qa/juddi-xlt/config/dev-log4j.properties
index 873007c..5c6e8f1 100644
--- a/qa/juddi-xlt/config/dev-log4j.properties
+++ b/qa/juddi-xlt/config/dev-log4j.properties
@@ -1,3 +1,17 @@
+# 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.

+

 #############################################################################

 #

 # log4j Settings - Development Mode 

diff --git a/qa/juddi-xlt/config/dev.properties b/qa/juddi-xlt/config/dev.properties
index 3db2417..6c783d6 100644
--- a/qa/juddi-xlt/config/dev.properties
+++ b/qa/juddi-xlt/config/dev.properties
@@ -1,3 +1,17 @@
+# 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.

+

 ################################################################################

 # 

 # Development Mode Settings

@@ -21,4 +35,4 @@
 ## - onError ... pages are logged only if the transaction had errors

 ## - always ... pages are logged always 

 com.xceptance.xlt.output2disk = always

-   
\ No newline at end of file
+   

diff --git a/qa/juddi-xlt/config/jvmargs.cfg b/qa/juddi-xlt/config/jvmargs.cfg
index 2f5a06c..ebea7d3 100644
--- a/qa/juddi-xlt/config/jvmargs.cfg
+++ b/qa/juddi-xlt/config/jvmargs.cfg
@@ -1,3 +1,17 @@
+# 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.
+
 #############################################################################
 #
 # Agent JVM Configuration
diff --git a/qa/juddi-xlt/config/log4j.properties b/qa/juddi-xlt/config/log4j.properties
index 2cd83dc..d746c04 100644
--- a/qa/juddi-xlt/config/log4j.properties
+++ b/qa/juddi-xlt/config/log4j.properties
@@ -6,6 +6,20 @@
 #

 #############################################################################

 

+# 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.

+

 ### Logger definitions ###

 

 log4j.rootLogger = warn, file

diff --git a/qa/juddi-xlt/config/project.properties b/qa/juddi-xlt/config/project.properties
index 456316d..44def2c 100644
--- a/qa/juddi-xlt/config/project.properties
+++ b/qa/juddi-xlt/config/project.properties
@@ -1,3 +1,17 @@
+# 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.

+

 ################################################################################

 #

 # Test Run Specific Settings

diff --git a/qa/juddi-xlt/config/test.properties b/qa/juddi-xlt/config/test.properties
index 1cdcc22..8102db7 100644
--- a/qa/juddi-xlt/config/test.properties
+++ b/qa/juddi-xlt/config/test.properties
@@ -1,4 +1,18 @@
-email################################################################################

+# 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.

+

+###############################################################################

 #

 # Load Test Profile Configuration

 #

diff --git a/qa/juddi-xlt/readme.txt b/qa/juddi-xlt/readme.txt
index 0ae2bb9..efac262 100644
--- a/qa/juddi-xlt/readme.txt
+++ b/qa/juddi-xlt/readme.txt
@@ -1,4 +1,16 @@
--=READ ME=-
+# 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.
+
+-=READ ME=-
 
 This is some clarification on what is included in the jUDDI XLT test suite and how to use it to run load tests.
 
diff --git a/qa/juddi-xlt/src/META-INF/uddi.xml b/qa/juddi-xlt/src/META-INF/uddi.xml
index 2f370dd..e8044bd 100644
--- a/qa/juddi-xlt/src/META-INF/uddi.xml
+++ b/qa/juddi-xlt/src/META-INF/uddi.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-
+<!--
+ * 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.
+ *
+ */ -->
 <uddi>
     <reloadDelay>5000</reloadDelay>
     <manager name="test-manager">
@@ -68,4 +83,4 @@
 	   </clerks>
 	  
 	</manager>
-</uddi>
\ No newline at end of file
+</uddi>
diff --git a/qa/simple-setup.odg b/qa/simple-setup.odg
index 80e8a51..06c0d9c 100644
--- a/qa/simple-setup.odg
+++ b/qa/simple-setup.odg
Binary files differ
diff --git a/qa/simple-setup.pdf b/qa/simple-setup.pdf
index 8a556f8..1fdd0d2 100644
--- a/qa/simple-setup.pdf
+++ b/qa/simple-setup.pdf
Binary files differ
diff --git a/src/site/xdoc/committers.xml b/src/site/xdoc/committers.xml
index 048b16d..70fdc96 100644
--- a/src/site/xdoc/committers.xml
+++ b/src/site/xdoc/committers.xml
@@ -1,4 +1,20 @@
 <?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>
diff --git a/src/site/xdoc/docs.xml b/src/site/xdoc/docs.xml
index ba81d24..6089ae5 100644
--- a/src/site/xdoc/docs.xml
+++ b/src/site/xdoc/docs.xml
@@ -1,4 +1,20 @@
 <?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>
@@ -15,23 +31,23 @@
           <td><strong>Description</strong></td>
         </tr>
         <tr>
-          <td>3.0 User Guide</td>
-          <td>Feb 1, 2010</td>
-          <td><a href="docs/3.0/userguide/html/index.html">HTML</a>,
-              <a href="docs/3.0/userguide/html_single/index.html">HTML-SINGLE</a>,
-              <a href="docs/3.0/userguide/pdf/userguide.pdf">PDF</a>
+          <td>3.x User Guide</td>
+          <td>Jul 10, 2011</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.0 Developer Guide</td>
-          <td>Feb 1, 2010</td>
-          <td><a href="docs/3.0/devguide/html/index.html">HTML</a>,
-              <a href="docs/3.0/devguide/html_single/index.html">HTML-SINGLE</a>,
-              <a href="docs/3.0/devguide/pdf/devguide.pdf">PDF</a>
+          <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.0 User Guide</td>
+          <td>2.x User Guide</td>
           <td>Jun 1, 2005</td>
           <td><a href="usersguide.html">HTML</a></td>
         </tr>
diff --git a/src/site/xdoc/legal.xml b/src/site/xdoc/legal.xml
index 7e375b2..47a0b67 100644
--- a/src/site/xdoc/legal.xml
+++ b/src/site/xdoc/legal.xml
@@ -1,4 +1,20 @@
 <?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>
@@ -21,4 +37,4 @@
       </p>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>
diff --git a/src/site/xdoc/library.xml b/src/site/xdoc/library.xml
index cedfb59..e86bf94 100644
--- a/src/site/xdoc/library.xml
+++ b/src/site/xdoc/library.xml
@@ -1,4 +1,20 @@
 <?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>
@@ -70,4 +86,4 @@
     </section>
 
   </body>
-</document>
\ No newline at end of file
+</document>
diff --git a/src/site/xdoc/list-guidelines.xml b/src/site/xdoc/list-guidelines.xml
index 548484e..d666e15 100644
--- a/src/site/xdoc/list-guidelines.xml
+++ b/src/site/xdoc/list-guidelines.xml
@@ -1,4 +1,20 @@
 <?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>
diff --git a/src/site/xdoc/participate.xml b/src/site/xdoc/participate.xml
index f8507b7..3a5dccd 100644
--- a/src/site/xdoc/participate.xml
+++ b/src/site/xdoc/participate.xml
@@ -1,4 +1,20 @@
 <?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>
@@ -77,4 +93,4 @@
       </section>
 
   </body>
-</document>
\ No newline at end of file
+</document>
diff --git a/src/site/xdoc/releases.xml b/src/site/xdoc/releases.xml
index deedc9b..405876b 100644
--- a/src/site/xdoc/releases.xml
+++ b/src/site/xdoc/releases.xml
@@ -1,4 +1,20 @@
 <?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>
diff --git a/src/site/xdoc/thanks.xml b/src/site/xdoc/thanks.xml
index 3339604..d52c7c3 100644
--- a/src/site/xdoc/thanks.xml
+++ b/src/site/xdoc/thanks.xml
@@ -1,4 +1,20 @@
 <?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>
@@ -40,4 +56,4 @@
     </section>
       
   </body>
-</document>
\ No newline at end of file
+</document>
diff --git a/src/site/xdoc/usersguide.xml b/src/site/xdoc/usersguide.xml
index d1e7bbf..8336e95 100644
--- a/src/site/xdoc/usersguide.xml
+++ b/src/site/xdoc/usersguide.xml
@@ -1,4 +1,20 @@
 <?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>
@@ -176,4 +192,4 @@
     </section>
 
   </body>
-</document>
\ No newline at end of file
+</document>
diff --git a/src/site/xdoc/who.xml b/src/site/xdoc/who.xml
index 0538705..f01d6ff 100644
--- a/src/site/xdoc/who.xml
+++ b/src/site/xdoc/who.xml
@@ -1,4 +1,20 @@
 <?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>
@@ -28,4 +44,4 @@
     </section>
 
   </body>
-</document>
\ No newline at end of file
+</document>
diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml
index e17d8f2..7e14396 100644
--- a/uddi-tck/pom.xml
+++ b/uddi-tck/pom.xml
@@ -77,7 +77,7 @@
 		</dependency>
 		-->
 		<dependency>
-		    <groupId>easymock</groupId>
+		    <groupId>org.easymock</groupId>
 		    <artifactId>easymock</artifactId>
 		    <version>2.0</version>
 		    <scope>test</scope>
diff --git a/uddi-ws/pom.xml b/uddi-ws/pom.xml
index 9a1c429..63003d4 100644
--- a/uddi-ws/pom.xml
+++ b/uddi-ws/pom.xml
@@ -52,45 +52,13 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-      <id>jaxws22</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <dependencies>
-        <!-- the JAXWS 2.2 specification -->
-        <dependency>
+    </profiles>
+	<dependencies>
+		 <dependency>
           <groupId>org.apache.geronimo.specs</groupId>
           <artifactId>geronimo-jaxws_2.2_spec</artifactId>
           <version>1.0</version>
           <type>jar</type>
         </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>jaxws21</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <envClassifier>jaxws21</envClassifier>
-      </properties>
-      <dependencies>
-        <!-- the JAXWS 2.1 specification -->
-        <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-          <version>1.0</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </profile>
-    </profiles>
-	<dependencies>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.2.2</version>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/uddi-ws/src/main/java/org/uddi/v3_service/UDDIPublicationPortType.java b/uddi-ws/src/main/java/org/uddi/v3_service/UDDIPublicationPortType.java
index b85200f..57855fc 100644
--- a/uddi-ws/src/main/java/org/uddi/v3_service/UDDIPublicationPortType.java
+++ b/uddi-ws/src/main/java/org/uddi/v3_service/UDDIPublicationPortType.java
@@ -40,7 +40,6 @@
 import org.uddi.api_v3.DeletePublisherAssertions;

 import org.uddi.api_v3.DeleteService;

 import org.uddi.api_v3.DeleteTModel;

-import org.uddi.api_v3.DispositionReport;

 import org.uddi.api_v3.GetRegisteredInfo;

 import org.uddi.api_v3.PublisherAssertion;

 import org.uddi.api_v3.RegisteredInfo;

@@ -82,9 +81,8 @@
      * @throws DispositionReportFaultMessage, RemoteException

      */

     @WebMethod(operationName = "add_publisherAssertions", action = "add_publisherAssertions")

-    @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

     @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)

-    public DispositionReport addPublisherAssertions(

+    public void addPublisherAssertions(

         @WebParam(name = "add_publisherAssertions", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

         AddPublisherAssertions body)

         throws DispositionReportFaultMessage, RemoteException

@@ -96,9 +94,8 @@
      * @throws DispositionReportFaultMessage, RemoteException

      */

     @WebMethod(operationName = "delete_binding", action = "delete_binding")

-    @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

     @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)

-    public DispositionReport deleteBinding(

+    public void deleteBinding(

         @WebParam(name = "delete_binding", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

         DeleteBinding body)

         throws DispositionReportFaultMessage, RemoteException

@@ -110,9 +107,8 @@
      * @throws DispositionReportFaultMessage, RemoteException

      */

     @WebMethod(operationName = "delete_business", action = "delete_business")

-    @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

     @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)

-    public DispositionReport deleteBusiness(

+    public void deleteBusiness(

         @WebParam(name = "delete_business", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

         DeleteBusiness body)

         throws DispositionReportFaultMessage, RemoteException

@@ -124,9 +120,8 @@
      * @throws DispositionReportFaultMessage, RemoteException

      */

     @WebMethod(operationName = "delete_publisherAssertions", action = "delete_publisherAssertions")

-    @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

     @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)

-    public DispositionReport deletePublisherAssertions(

+    public void deletePublisherAssertions(

         @WebParam(name = "delete_publisherAssertions", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

         DeletePublisherAssertions body)

         throws DispositionReportFaultMessage, RemoteException

@@ -138,9 +133,8 @@
      * @throws DispositionReportFaultMessage, RemoteException

      */

     @WebMethod(operationName = "delete_service", action = "delete_service")

-    @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

     @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)

-    public DispositionReport deleteService(

+    public void deleteService(

         @WebParam(name = "delete_service", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

         DeleteService body)

         throws DispositionReportFaultMessage, RemoteException

@@ -152,9 +146,8 @@
      * @throws DispositionReportFaultMessage, RemoteException

      */

     @WebMethod(operationName = "delete_tModel", action = "delete_tModel")

-    @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

     @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)

-    public DispositionReport deleteTModel(

+    public void deleteTModel(

         @WebParam(name = "delete_tModel", targetNamespace = "urn:uddi-org:api_v3", partName = "body")

         DeleteTModel body)

         throws DispositionReportFaultMessage, RemoteException