Author: kstam
Date: Mon Mar 11 17:36:39 2013
New Revision: 1455244
URL: http://svn.apache.org/r1455244
Log:
JUDDI-563 moving the tests back into juddi-core.
Added:
juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/
juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
Removed:
juddi/trunk/juddi-core-openjpa/src/test/java/
Modified:
juddi/trunk/juddi-core-openjpa/build.xml
juddi/trunk/juddi-core-openjpa/pom.xml
Modified: juddi/trunk/juddi-core-openjpa/build.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/build.xml?rev=1455244&r1=1455243&r2=1455244&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/build.xml (original)
+++ juddi/trunk/juddi-core-openjpa/build.xml Mon Mar 11 17:36:39 2013
@@ -1,7 +1,4 @@
<project name="juddi-core-jpa" default="package-jar" basedir=".">
- <property file="package.properties"/>
- <property name="lib.dir"
value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/lib"/>
- <property name="webapps.dir"
value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps"/>
<target name="unzip-jar">
<mkdir dir="${basedir}/target/classes"/>
@@ -11,12 +8,16 @@
</unzip>
</target>
- <target name="copy-resources" depends="unzip-jar">
- <copy
file="${juddi.core.dir}/src/main/resources/persistence/${persistence}-persistence.xml"
-
tofile="${basedir}/target/classes/META-INF/persistence.xml"
- overwrite="true"/>
- </target>
+ <target name="copy-tests">
+ <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="package-jar" depends="copy-resources"/>
+ <target name="package-jar" depends="unzip-jar,copy-tests"/>
</project>
Modified: juddi/trunk/juddi-core-openjpa/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/pom.xml?rev=1455244&r1=1455243&r2=1455244&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/pom.xml (original)
+++ juddi/trunk/juddi-core-openjpa/pom.xml Mon Mar 11 17:36:39 2013
@@ -26,22 +26,9 @@
<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.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <excludes>
-
<exclude>**/persistence</exclude>
-
<exclude>**/persistence.xml</exclude>
-
<exclude>**/hibernate-persistence.xml</exclude>
-
<exclude>**/openjpa-persistence.xml</exclude>
-
<exclude>**/juddi-orm.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -49,7 +36,7 @@
<configuration>
<instructions>
<Export-Package>org.apache.juddi,
org.apache.juddi.api, org.apache.juddi.api.impl, 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.subscription.notify,
org.apache.juddi.validation, org.apache.juddi.v3.auth,
org.apache.juddi.v3.error</Export-Package>
-
<Include-Resource>juddi_install_data=target/classes/juddi_install_data,
META-INF/persistence.xml=target/classes/META-INF/persistence.xml,
target/classes/messages.properties</Include-Resource>
+
<Include-Resource>juddi_install_data=target/classes/juddi_install_data,
target/classes/messages.properties</Include-Resource>
</instructions>
</configuration>
@@ -60,14 +47,12 @@
<version>1.3</version>
<executions>
<execution>
- <id>foo</id>
+ <id>unzip</id>
<phase>compile</phase>
<configuration>
<tasks>
-
<echo>PERSISTENCE***** ${persistence}</echo>
- <property
name="persistence" value="${persistence}" />
- <property
name="juddi.core.dir" value="${basedir}/../juddi-core" />
<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>Enhancing
juddi-core=${dependency.juddi.core}</echo>
<ant
antfile="${basedir}/build.xml">
<target
name="package-jar" />
@@ -80,27 +65,36 @@
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>${basedir}/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <classes>
+
${project.build.outputDirectory}/org/apache/juddi/model/
+ </classes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+
<persistenceXmlFile>src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
+ </configuration>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
</plugins>
</build>
<dependencies>
@@ -110,11 +104,20 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</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>1.2.2</version>
+ </dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -125,11 +128,7 @@
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
- </dependency>
+
<dependency>
<groupId>org.apache.juddi</groupId>
<artifactId>juddi-core</artifactId>
@@ -193,100 +192,5 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>hibernate</id>
- <properties>
- <persistence>hibernate</persistence>
- </properties>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
-
<artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
-
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.3.1.ga</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
-
<artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>openjpa</id>
- <properties>
- <persistence>openjpa</persistence>
- </properties>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <configuration>
- <classes>
-
${project.build.outputDirectory}/org/apache/juddi/model/
- </classes>
- <toolProperties>
- <property>
-
<name>addDefaultConstructor</name>
-
<value>true</value>
- </property>
- <property>
-
<name>enforcePropertyRestrictions</name>
-
<value>true</value>
- </property>
- </toolProperties>
- </configuration>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
-
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
Added:
juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml?rev=1455244&view=auto
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
(added)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
Mon Mar 11 17:36:39 2013
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd";
+ version="1.0">
+ <persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+
+ <!-- entity classes -->
+ <class>org.apache.juddi.model.Address</class>
+ <class>org.apache.juddi.model.AddressLine</class>
+ <class>org.apache.juddi.model.AuthToken</class>
+ <class>org.apache.juddi.model.BindingCategoryBag</class>
+ <class>org.apache.juddi.model.BindingDescr</class>
+ <class>org.apache.juddi.model.BindingTemplate</class>
+ <class>org.apache.juddi.model.BusinessCategoryBag</class>
+ <class>org.apache.juddi.model.BusinessDescr</class>
+ <class>org.apache.juddi.model.BusinessEntity</class>
+ <class>org.apache.juddi.model.BusinessIdentifier</class>
+ <class>org.apache.juddi.model.BusinessName</class>
+ <class>org.apache.juddi.model.BusinessService</class>
+ <class>org.apache.juddi.model.CanonicalizationMethod</class>
+ <class>org.apache.juddi.model.CategoryBag</class>
+ <class>org.apache.juddi.model.Clerk</class>
+ <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
+ <class>org.apache.juddi.model.Contact</class>
+ <class>org.apache.juddi.model.ContactDescr</class>
+ <class>org.apache.juddi.model.DiscoveryUrl</class>
+ <class>org.apache.juddi.model.Email</class>
+ <class>org.apache.juddi.model.InstanceDetailsDescr</class>
+ <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
+ <class>org.apache.juddi.model.KeyedReference</class>
+ <class>org.apache.juddi.model.KeyedReferenceGroup</class>
+ <class>org.apache.juddi.model.KeyDataValue</class>
+ <class>org.apache.juddi.model.KeyInfo</class>
+ <class>org.apache.juddi.model.Node</class>
+ <class>org.apache.juddi.model.ObjectType</class>
+ <class>org.apache.juddi.model.ObjectTypeContent</class>
+ <class>org.apache.juddi.model.OverviewDoc</class>
+ <class>org.apache.juddi.model.OverviewDocDescr</class>
+ <class>org.apache.juddi.model.PersonName</class>
+ <class>org.apache.juddi.model.Phone</class>
+ <class>org.apache.juddi.model.Publisher</class>
+ <class>org.apache.juddi.model.PublisherAssertion</class>
+ <class>org.apache.juddi.model.PublisherAssertionId</class>
+ <class>org.apache.juddi.model.Reference</class>
+ <class>org.apache.juddi.model.ServiceCategoryBag</class>
+ <class>org.apache.juddi.model.ServiceDescr</class>
+ <class>org.apache.juddi.model.ServiceName</class>
+ <class>org.apache.juddi.model.ServiceProjection</class>
+ <class>org.apache.juddi.model.ServiceProjectionId</class>
+ <class>org.apache.juddi.model.Signature</class>
+ <class>org.apache.juddi.model.SignatureMethod</class>
+ <class>org.apache.juddi.model.SignatureTransform</class>
+ <class>org.apache.juddi.model.SignatureTransformDataValue</class>
+ <class>org.apache.juddi.model.SignatureValue</class>
+ <class>org.apache.juddi.model.SignedInfo</class>
+ <class>org.apache.juddi.model.Subscription</class>
+ <class>org.apache.juddi.model.SubscriptionChunkToken</class>
+ <class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.Tmodel</class>
+ <class>org.apache.juddi.model.TmodelCategoryBag</class>
+ <class>org.apache.juddi.model.TmodelDescr</class>
+ <class>org.apache.juddi.model.TmodelIdentifier</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfo</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
+ <class>org.apache.juddi.model.TransferToken</class>
+ <class>org.apache.juddi.model.TransferTokenKey</class>
+ <class>org.apache.juddi.model.UddiEntity</class>
+ <class>org.apache.juddi.model.UddiEntityPublisher</class>
+
+ <properties>
+ <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(SchemaAction='dropDB,add')"/>
+ <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
+ <property name="openjpa.jdbc.UpdateManager" value="operation-order"/>
+ <property name="openjpa.RuntimeUnenhancedClasses" value="warn"/>
+
+ <!-- derby connection properties -->
+ <property name="openjpa.ConnectionDriverName"
value="org.apache.derby.jdbc.EmbeddedDriver"/>
+ <property name="openjpa.ConnectionURL"
value="jdbc:derby:memory:juddi-derby-test-db;create=true"/>
+ <property name="openjpa.ConnectionUserName" value=""/>
+ <property name="openjpa.ConnectionPassword" value=""/>
+
+
+ <!-- mysql connection properties
+ <property name="openjpa.ConnectionURL"
value="jdbc:mysql://localhost:3306/juddi"/>
+ <property name="openjpa.ConnectionDriverName"
value="com.mysql.jdbc.Driver"/>
+ <property name="openjpa.ConnectionUserName" value="juddiv3"/>
+ <property name="openjpa.ConnectionPassword" value=""/>
+ -->
+
+ <!-- pgsql connection properties
+ <property name="openjpa.ConnectionURL"
value="jdbc:postgresql://localhost/juddi"/>
+ <property name="openjpa.ConnectionDriverName"
value="org.postgresql.Driver"/>
+ <property name="openjpa.ConnectionUserName" value="juddi"/>
+ <property name="openjpa.ConnectionPassword" value="juddi"/>
+ -->
+
+ </properties>
+ </persistence-unit>
+</persistence>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
