Browse Source

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@929 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

administrator 11 years ago
parent
commit
cbd010845a

+ 2 - 1
src/main/resources/META-INF/persistence.xml → src/main/resources/META-INF/jpa-persistence.xml

@@ -4,7 +4,7 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
 	<persistence-unit name="persistenceUnit"
 		transaction-type="RESOURCE_LOCAL">
-		<provider>org.hibernate.ejb.HibernatePersistence</provider>
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
 		<properties>
 			<property name="hibernate.cache.provider_class" value="org.hibernate.cache.EhCacheProvider" />
 			<property name="hibernate.cache.use_second_level_cache"
@@ -27,6 +27,7 @@
 			<!-- <property name="hibernate.ejb.resource_scanner" value="org.hibernate.ejb.packaging.NativeScanner" /> -->
 			<!-- <property name="hibernate.transaction.jta.platform"
 				value="org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform" /> -->
+			<property name="jboss.as.jpa.managed" value="false" />
 		</properties>
 	</persistence-unit>
 </persistence>

+ 6 - 3
src/main/resources/jdbc.properties

@@ -1,7 +1,10 @@
 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@218.17.158.219:1521:orcl
-jdbc.username=uuplatformdemo
-jdbc.password=selectuuplatform
+#jdbc.url=jdbc:oracle:thin:@218.17.158.219:1521:orcl
+#jdbc.username=uuplatformdemo
+#jdbc.password=selectuuplatform
+jdbc.url=jdbc:oracle:thin:@localhost:1521:orcl
+jdbc.username=platform$b2b
+jdbc.password=select*fromuu
 jdbc.initialSize=10
 jdbc.maxActive=100
 jdbc.maxIdle=50

+ 1 - 1
src/main/resources/spring/context.xml

@@ -96,7 +96,7 @@
 
 	<bean id="entityManagerFactory"
 		class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="persistenceUnitName" value="persistenceUnit" />
+		<property name="persistenceXmlLocation" value="classpath*:META-INF/jpa-persistence.xml" />
 		<property name="packagesToScan" value="com.uas.platform" />
 		<property name="dataSource" ref="dataSource" />
 		<property name="jpaVendorAdapter">

+ 2 - 17
src/main/webapp/META-INF/jboss-deployment-structure.xml

@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
 	<deployment>
-		<!-- <exclusions>
-			<module name="org.slf4j" />
-			<module name="org.slf4j.impl" />
-			<module name="org.apache.log4j" />
-			<module name="javax.persistence.api" />
+		<exclusions>
 			<module name="org.hibernate" />
-			<module name="org.hibernate.commons-annotations" />
-			<module name="org.hibernate.envers" />
-			<module name="org.hibernate.validator" />
-			<module name="org.hibernate.hibernate-entitymanager" />
-		</exclusions> -->
-	<!-- 	<dependencies>
-			<module name="org.jboss.ironjacamar.jdbcadapters" />
-			<module name="org.hornetq" />
-			<module name="org.hornetq.ra" />
-			<module name="org.jboss.ejb3" />
-			<module name="org.jboss.ejb-client" />
-		</dependencies> -->
+		</exclusions>
 	</deployment>
 </jboss-deployment-structure>

+ 8 - 0
src/main/webapp/WEB-INF/jboss-deployment-structure.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
+	<deployment>
+		<exclusions>
+			<module name="org.hibernate" />
+		</exclusions>
+	</deployment>
+</jboss-deployment-structure>

+ 4 - 0
src/main/webapp/WEB-INF/jboss-web.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-web>
+	<context-root>/</context-root>
+</jboss-web>