Repository: juddi Updated Branches: refs/heads/master 977f51397 -> ea8962baf
JUDDI-587 upgradinding to JPA 2.0 Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/ea8962ba Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/ea8962ba Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/ea8962ba Branch: refs/heads/master Commit: ea8962baf6027d7714f26309c2a7b87b9e7ac141 Parents: 977f513 Author: Kurt Stam <[email protected]> Authored: Tue Sep 23 09:45:33 2014 -0400 Committer: Kurt Stam <[email protected]> Committed: Tue Sep 23 09:45:33 2014 -0400 ---------------------------------------------------------------------- juddi-core-openjpa/pom.xml | 10 +- juddi-core/pom.xml | 18 +-- juddi-rest-cxf/pom.xml | 45 ++++--- .../WEB-INF/classes/META-INF/persistence.xml | 117 +++++++++---------- .../WEB-INF/classes/log4j.properties | 25 ---- .../WEB-INF/jboss-deployment-structure.xml | 2 +- juddiv3-war/pom.xml | 44 +++++-- 7 files changed, 125 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/ea8962ba/juddi-core-openjpa/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-core-openjpa/pom.xml b/juddi-core-openjpa/pom.xml index 12af380..b2f7477 100644 --- a/juddi-core-openjpa/pom.xml +++ b/juddi-core-openjpa/pom.xml @@ -125,11 +125,11 @@ <artifactId>openjpa</artifactId> <version>2.2.1</version> </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.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> http://git-wip-us.apache.org/repos/asf/juddi/blob/ea8962ba/juddi-core/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-core/pom.xml b/juddi-core/pom.xml index ec51475..417ea58 100644 --- a/juddi-core/pom.xml +++ b/juddi-core/pom.xml @@ -114,14 +114,14 @@ <version>3.1</version> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.1-api</artifactId> + <version>1.0.0.Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.5.ga</version> + <artifactId>hibernate-core</artifactId> + <version>4.3.6.Final</version> <exclusions> <exclusion> <groupId>cglib</groupId> @@ -132,7 +132,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>3.3.1.ga</version> + <version>4.3.6.Final</version> </dependency> <dependency> <groupId>cglib</groupId> @@ -158,12 +158,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxrs_1.1_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>10.5.3.0_1</version> http://git-wip-us.apache.org/repos/asf/juddi/blob/ea8962ba/juddi-rest-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-rest-cxf/pom.xml b/juddi-rest-cxf/pom.xml index 3f683d9..4ac53c2 100644 --- a/juddi-rest-cxf/pom.xml +++ b/juddi-rest-cxf/pom.xml @@ -94,30 +94,27 @@ <artifactId>commons-lang3</artifactId> <version>3.1</version> </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.5.ga</version> - <exclusions> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.3.1.ga</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.1-api</artifactId> + <version>1.0.0.Final</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>4.3.6.Final</version> + <exclusions> + <exclusion> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>4.3.6.Final</version> + </dependency> <dependency> <groupId>cglib</groupId> <artifactId>cglib-nodep</artifactId> http://git-wip-us.apache.org/repos/asf/juddi/blob/ea8962ba/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml index c3f1d52..0033ed2 100644 --- a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml +++ b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml @@ -1,52 +1,53 @@ <?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 classpath:schemas/persistence_1_0.xsd" - version="1.0"> +<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence + http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd";> + <persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL"> - <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <non-jta-data-source>java:jboss/datasources/ExampleDS</non-jta-data-source> - <!-- 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> + <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider> + <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source> + <!-- 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.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.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.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.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> @@ -56,20 +57,20 @@ <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.SubscriptionChunkToken</class> <class>org.apache.juddi.model.SubscriptionMatch</class> <class>org.apache.juddi.model.TempKey</class> - <class>org.apache.juddi.model.TempKeyPK</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> + <class>org.apache.juddi.model.TempKeyPK</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> <class>org.apache.juddi.model.ValueSetValues</class> <class>org.apache.juddi.model.ChangeRecord</class> @@ -80,17 +81,13 @@ <class>org.apache.juddi.model.ControlMessage</class> <class>org.apache.juddi.model.ReplicationMessage</class> - <properties> - <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(SchemaAction='add')"/> - <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/> - <property name="openjpa.jdbc.UpdateManager" value="operation-order"/> - <property name="openjpa.jdbc.DBDictionary" value="h2"/> - <!-- dialects: derby, postgres, mysql, oracle, sybase, sqlserver - for a complete list check the OpenJPA documentation --> - <property name="openjpa.RuntimeUnenhancedClasses" value="warn"/> - <property name="openjpa.Compatibility" value="CheckDatabaseForCascadePersistToDetachedEntity=true"/> - <property name="jboss.as.jpa.providerModule" value="org.apache.openjpa" /> + <property name="hibernate.archive.autodetection" value="class"/> + <property name="hibernate.hbm2ddl.auto" value="update"/> + <property name="hibernate.show_sql" value="false"/> + <property name="hibernate.listeners.envers.autoRegister" value="false" /> + <property name="hibernate.id.new_generator_mappings" value="true" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/> </properties> </persistence-unit> </persistence> http://git-wip-us.apache.org/repos/asf/juddi/blob/ea8962ba/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/log4j.properties ---------------------------------------------------------------------- diff --git a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/log4j.properties b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/log4j.properties deleted file mode 100644 index b37c93a..0000000 --- a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,25 +0,0 @@ - -log4j.rootLogger=INFO, logfile - -# in case any output is given to stdout, format it -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n - -log4j.appender.logfile=org.apache.log4j.RollingFileAppender -log4j.appender.logfile.File=${catalina.home}/logs/juddi.log -log4j.appender.logfile.MaxFileSize=512MB -# Keep three backup files. -log4j.appender.logfile.MaxBackupIndex=3 -# Pattern to output: date priority [category] - message -log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n - -#log4j.category.org.springframework.beans.property editors.CustomDateEditor=DEBUG - -log4j.debug=false - -# showing sql -#log4j.category.org.hibernate.hql.ast.QueryTranslatorImpl=DEBUG -#log4j.category.org.hibernate.SQL=DEBUG -#log4j.category.org.hibernate.loader.hql.QueryLoad er=DEBUG http://git-wip-us.apache.org/repos/asf/juddi/blob/ea8962ba/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml index a7c07b2..f55959a 100644 --- a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml +++ b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml @@ -2,7 +2,7 @@ <jboss-deployment-structure> <deployment> <dependencies> - <module name="org.jboss.as.jpa.openjpa" /> + <module name="org.jboss.as.jpa" /> <module name="org.jboss.ws.cxf.jbossws-cxf-server" /> </dependencies> </deployment> http://git-wip-us.apache.org/repos/asf/juddi/blob/ea8962ba/juddiv3-war/pom.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/pom.xml b/juddiv3-war/pom.xml index 0e53da5..2efea8a 100644 --- a/juddiv3-war/pom.xml +++ b/juddiv3-war/pom.xml @@ -445,7 +445,17 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <version>2.4</version> <configuration> + <packagingExcludes> + WEB-INF/lib/hibernate*.jar, + WEB-INF/lib/cglib*.jar, + WEB-INF/lib/log4j*.jar, + WEB-INF/lib/stax*.jar, + WEB-INF/lib/commons-log*.jar, + WEB-INF/classes/commons*, + WEB-INF/classes/log* + </packagingExcludes> <webResources> <resource> <directory>JPA/OpenJPA-JBossAS7Up</directory> @@ -454,13 +464,14 @@ <directory>JAX-WS/CXF-JBossAS7Up</directory> </resource> </webResources> + </configuration> </plugin> </plugins> </build> <dependencies> <dependency> - <artifactId>juddi-core-openjpa</artifactId> + <artifactId>juddi-core</artifactId> <groupId>org.apache.juddi</groupId> <version>${project.version}</version> <exclusions> @@ -469,8 +480,16 @@ <artifactId>junit</artifactId> </exclusion> <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jpa</artifactId> </exclusion> </exclusions> </dependency> @@ -487,14 +506,21 @@ <groupId>cglib</groupId> <artifactId>cglib-nodep</artifactId> </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jpa</artifactId> + </exclusion> </exclusions> </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> + </dependencies> </profile> </profiles> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
