diff --git a/juddi-core-openjpa/build.xml b/juddi-core-openjpa/build.xml
deleted file mode 100644
index d1ce358..0000000
--- a/juddi-core-openjpa/build.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-* Copyright 2001-2009 The Apache Software Foundation.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* 
-*      http://www.apache.org/licenses/LICenSE-2.0
-* 
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-*/ -->
-<project name="juddi-core-jpa" default="copy-from-core" basedir=".">
-	
-	<target name="copy-main">
-		    <echo>delete: ${basedir}/src/main/</echo>
-		    <delete dir="${basedir}/src/main/"  />
-	        <mkdir dir="${basedir}/src/main/"/>
-	        <echo>copy: ${juddi.core.dir}/src/main</echo>
-	        <copy todir="${basedir}/src/main">
-	            <fileset dir="${juddi.core.dir}/src/main">
-	               <include name="**/*"/>
-	            </fileset>
-	        </copy>
-	    </target>
-	
-	<target name="copy-test-java">
-		<echo>delete: ${basedir}/src/test/java</echo>
-		<delete dir="${basedir}/src/test/java" />
-        <mkdir dir="${basedir}/src/test/java"/>
-        <echo>copy: ${juddi.core.dir}/src/test/java</echo>
-        <copy todir="${basedir}/src/test/java">
-        	<fileset dir="${juddi.core.dir}/src/test/java">
-        	   <include name="**/*.java"/>
-        	</fileset>
-        </copy>
-    </target>
-	
-	<target name="copy-from-core" depends="copy-main,copy-test-java"/>
-
-</project>
diff --git a/juddi-core-openjpa/pom.xml b/juddi-core-openjpa/pom.xml
index d0bd07f..af3c9ac 100644
--- a/juddi-core-openjpa/pom.xml
+++ b/juddi-core-openjpa/pom.xml
@@ -15,73 +15,68 @@
  * limitations under the License.
  *
  */ -->
-<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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.juddi</groupId>
-		<artifactId>juddi-parent</artifactId>
-		<version>3.3.3-SNAPSHOT</version>
-	</parent>
-	<artifactId>juddi-core-openjpa</artifactId>
-	<packaging>bundle</packaging>
-	
-	<name>jUDDI Core - OpenJPA</name>
-	<description>This module enhances the JPA Entity classes from the juddi-core and reruns the same tests using OpenJPA.</description>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>1.4.0</version>
-				<configuration>
-				<instructions>
-				<Export-Package>org.apache.juddi, org.apache.juddi.api, org.apache.juddi.api.impl, org.apache.juddi.api.impl.rest,org.apache.juddi.api.util, org.apache.juddi.config, org.apache.juddi.config, org.apache.juddi.cryptor, org.apache.juddi.keygen, org.apache.juddi.mapping, org.apache.juddi.model, org.apache.juddi.query, org.apache.juddi.query.util, org.apache.juddi.rmi, org.apache.juddi.subscription, 
-				org.apache.juddi.replication, org.apache.juddi.subscription.notify, org.apache.juddi.validation,org.apache.juddi.validation.vsv, org.apache.juddi.v3.auth, org.apache.juddi.v3.error</Export-Package>
-				<Include-Resource>juddi_install_data=target/classes/juddi_install_data, target/classes/messages.properties</Include-Resource>
-				</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.3</version>
-				<executions>
-					<execution>
-						<id>copy</id>
-						<phase>validate</phase>
-						<configuration>
-							<tasks>
-								<property name="dependency.juddi.core" value="${maven.dependency.org.apache.juddi.juddi-core.jar.path}" />
-								<property name="juddi.core.dir" value="${basedir}/../juddi-core" />
-								<echo>Copy from juddi-core dir =${juddi.core.dir}</echo>
-								<ant antfile="${basedir}/build.xml">
-									<target name="copy-from-core" />
-								</ant>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				</plugin>
-				<plugin>
-                  <groupId>org.apache.openjpa</groupId>
-                  <artifactId>openjpa-maven-plugin</artifactId>
-                  <version>2.3.0</version>
-                  <configuration>
-			         <includes>**/org/apache/juddi/model/*.class</includes>
-			         <addDefaultConstructor>true</addDefaultConstructor>               
-			         <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
-			         <persistenceXmlFile>${basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
-			      </configuration>
-                  <executions>
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-parent</artifactId>
+        <version>3.3.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>juddi-core-openjpa</artifactId>
+    <packaging>bundle</packaging>
+
+    <name>jUDDI Core - OpenJPA</name>
+    <description>This module enhances the JPA Entity classes from the juddi-core and reruns the same tests using
+        OpenJPA.
+    </description>
+    <build>
+        <sourceDirectory>../juddi-core/src/main/java</sourceDirectory>
+        <testSourceDirectory>../juddi-core/src/test/java</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>../juddi-core/src/main/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.apache.juddi, org.apache.juddi.api, org.apache.juddi.api.impl,
+                            org.apache.juddi.api.impl.rest,org.apache.juddi.api.util, org.apache.juddi.config,
+                            org.apache.juddi.config, org.apache.juddi.cryptor, org.apache.juddi.keygen,
+                            org.apache.juddi.mapping, org.apache.juddi.model, org.apache.juddi.query,
+                            org.apache.juddi.query.util, org.apache.juddi.rmi, org.apache.juddi.subscription,
+                            org.apache.juddi.replication, org.apache.juddi.subscription.notify,
+                            org.apache.juddi.validation,org.apache.juddi.validation.vsv, org.apache.juddi.v3.auth,
+                            org.apache.juddi.v3.error
+                        </Export-Package>
+                        <Include-Resource>juddi_install_data=target/classes/juddi_install_data,
+                            target/classes/messages.properties
+                        </Include-Resource>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa-maven-plugin</artifactId>
+                <version>2.3.0</version>
+                <configuration>
+                    <includes>**/org/apache/juddi/model/*.class</includes>
+                    <addDefaultConstructor>true</addDefaultConstructor>
+                    <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+                    <persistenceXmlFile>${basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
+                </configuration>
+                <executions>
                     <execution>
-                       <id>enhancer</id>
-                       <phase>process-classes</phase>   
-                       <goals>
-                          <goal>enhance</goal>
-                       </goals>
+                        <id>enhancer</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>enhance</goal>
+                        </goals>
                     </execution>
                 </executions>
                 <dependencies>
@@ -91,118 +86,118 @@
                         <version>2.3.0</version>
                     </dependency>
                 </dependencies>
-                </plugin>
+            </plugin>
 
-                <plugin>
-				    <artifactId>maven-clean-plugin</artifactId>
-				    <version>2.6.1</version>
-				    <configuration>
-				      <filesets>
-				        <fileset>
-				          <directory>src/main/java</directory>
-				          <includes>
-				            <include>**/*</include>
-				          </includes>
-				          <followSymlinks>false</followSymlinks>
-				        </fileset>
-				        <fileset>
-				          <directory>src/test/java</directory>
-				          <includes>
-				            <include>**/*</include>
-				          </includes>
-				          <followSymlinks>false</followSymlinks>
-				        </fileset>
-				      </filesets>
-				    </configuration>
-				  </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.6.1</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>src/main/java</directory>
+                            <includes>
+                                <include>**/*</include>
+                            </includes>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <fileset>
+                            <directory>src/test/java</directory>
+                            <includes>
+                                <include>**/*</include>
+                            </includes>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
 
-		</plugins>
-	</build>
-	<dependencies>
-                <dependency>
-                        <groupId>org.apache.juddi</groupId>
-                        <artifactId>uddi-ws</artifactId>
-                        <version>${project.parent.version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>commons-configuration</groupId>
-                        <artifactId>commons-configuration</artifactId>
-                        <version>1.9</version>
-                </dependency>
-				  <dependency>
-	<groupId>org.apache.commons</groupId>
-	<artifactId>commons-lang3</artifactId>
-	<version>3.1</version>
-</dependency>
-<dependency>
-	  <groupId>commons-collections</groupId>
-	  <artifactId>commons-collections</artifactId>
-	  <version>3.2</version>
-	 </dependency>
-                <dependency>
-                        <groupId>org.apache.juddi</groupId>
-                        <artifactId>juddi-client</artifactId>
-                        <version>${project.parent.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa</artifactId>
-                    <version>2.3.0</version>
-                </dependency>
-				<dependency>
-				    <groupId>org.apache.geronimo.specs</groupId>
-				    <artifactId>geronimo-jpa_2.0_spec</artifactId>
-				    <version>1.1</version>
-				</dependency>
-                <dependency>
-                        <groupId>commons-codec</groupId>
-                        <artifactId>commons-codec</artifactId>
-                        <version>1.3</version>
-                </dependency>
-                
-		<dependency>
-			<groupId>org.apache.juddi</groupId>
-			<artifactId>uddi-tck-base</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockejb</groupId>
-			<artifactId>mockejb</artifactId>
-			<version>0.6-beta2</version>
-			<scope>test</scope>
-			<exclusions>  
-  			   <exclusion>
-				<groupId>cglib</groupId>
-				<artifactId>cglib-full</artifactId>	
-                           </exclusion>
-                        </exclusions>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>uddi-ws</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>juddi-client</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+        </dependency>
 
-		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>2.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.5.3.0_1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-			<version>8.2-504.jdbc3</version>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>uddi-tck-base</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockejb</groupId>
+            <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>
+            <artifactId>cglib-nodep</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.5.3.0_1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>8.2-504.jdbc3</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
@@ -227,11 +222,10 @@
             <version>1.5</version>
             <scope>test</scope>
         </dependency>
-			 <dependency>
-			  <groupId>javax.servlet</groupId>
-			  <artifactId>servlet-api</artifactId>
-			  <version>2.4</version>
-			 </dependency>
-	</dependencies>
-	
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+        </dependency>
+    </dependencies>
 </project>