juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r763060 - in /webservices/juddi/branches/v3_trunk/juddi-core: pom.xml src/main/resources/persistence/hibernate-persistence.xml src/main/resources/persistence/openjpa-persistence.xml
Date Wed, 08 Apr 2009 00:46:26 GMT
Author: kstam
Date: Wed Apr  8 00:46:26 2009
New Revision: 763060

URL: http://svn.apache.org/viewvc?rev=763060&view=rev
Log:
JUDDI-217, moving properties back into the persistence.xml

Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/hibernate-persistence.xml
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml

Modified: webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/pom.xml?rev=763060&r1=763059&r2=763060&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/pom.xml Wed Apr  8 00:46:26 2009
@@ -284,52 +284,6 @@
 			  <includes>
 				<include>**/*Test.java</include>
 			  </includes>
-              <systemProperties>
-				 <property>
-					<name>hibernate.archive.autodetection</name>
-					<value>class</value>
-				 </property>
-				 <property>
-				     <name>hibernate.hbm2ddl.auto</name>
-					 <value>update</value>
-				 </property>
-				 <property>
-				     <name>hibernate.show_sql</name>
-					 <value>false</value>
-				 </property>
-				 <property>
-				     <name>hibernate.dialect</name>
-					 <value>org.hibernate.dialect.DerbyDialect</value>
-				 </property>
-				 <property>
-				     <name>hibernate.connection.driver_class</name>
-					 <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-				 </property>
-				 <property>
-				     <name>hibernate.connection.username</name>
-					 <value></value>
-				 </property>
-				 <property>
-				     <name>hibernate.connection.password</name>
-					 <value></value>
-				 </property>
-				 <property>
-					 <name>hibernate.connection.url</name>
-					 <value>jdbc:derby:target/juddi-derby-test-db;create=true</value>
-				 </property>
-                 <property>
-				     <name>hibernate.dbcp.maxActive</name>
-					 <value>100</value>
-				 </property>
-				 <property>
-					 <name>hibernate.dbcp.maxIdle</name>
-					 <value>30</value>
-				 </property>
-				 <property>
-					 <name>hibernate.dbcp.maxWait</name>
-					 <value>10000</value>
-				 </property>
-			   </systemProperties>
              </configuration>
            </plugin>
          </plugins>
@@ -363,36 +317,6 @@
 			  <includes>
 				<include>**/*Test.java</include>
 			  </includes>
-              <systemProperties>
-				 <property>
-					<name>openjpa.jdbc.SynchronizeMappings</name>
-					<value>buildSchema(SchemaAction='dropDB,add')</value>
-				 </property>
-				 <property>
-				     <name>openjpa.Log</name>
-					 <value>DefaultLevel=WARN, Tool=INFO</value>
-				 </property>
-				 <property>
-				     <name>openjpa.ConnectionDriverName</name>
-					 <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-				 </property>
-				 <property>
-				     <name>openjpa.ConnectionURL</name>
-					 <value>jdbc:derby:target/juddi-derby-test-db;create=true</value>
-				 </property>
-				 <property>
-				     <name>openjpa.ConnectionUserName</name>
-					 <value></value>
-				 </property>
-				 <property>
-				     <name>openjpa.ConnectionPassword</name>
-					 <value></value>
-				 </property>
-				 <property>
-				     <name>openjpa.jdbc.UpdateManager</name>
-					 <value>operation-order</value>
-				 </property>
-			   </systemProperties>
             </configuration>
         </plugin>
 		<plugin>

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/hibernate-persistence.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/hibernate-persistence.xml?rev=763060&r1=763059&r2=763060&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/hibernate-persistence.xml
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/hibernate-persistence.xml
Wed Apr  8 00:46:26 2009
@@ -1,20 +1,4 @@
 <?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.
- *
- */ -->
 <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"

@@ -27,6 +11,31 @@
     -->
     
     <properties>
+      <property name="hibernate.archive.autodetection" value="class"/>
+      <property name="hibernate.hbm2ddl.auto" value="update"/>
+      <property name="hibernate.show_sql" value="false"/>
+
+      <!-- derby connection properties -->
+      <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
+      <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+      <property name="hibernate.connection.url" value="jdbc:derby:target/juddi-derby-test-db;create=true"/>
+      <property name="hibernate.connection.username" value=""/>
+      <property name="hibernate.connection.password" value=""/>
+   
+
+ 	  <!--  mysql connection properties 
+      <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
+      <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"
/>
+      <property name="hibernate.connection.username" value="juddiv3" />
+      <property name="hibernate.connection.password" value="" />
+      <property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/juddiv3"
/>
+      -->
+      
+      <!-- connection pool properties -->
+      <property name="hibernate.dbcp.maxActive" value="100"/>
+      <property name="hibernate.dbcp.maxIdle" value="30"/>
+      <property name="hibernate.dbcp.maxWait" value="10000"/>
+      
     </properties>
   </persistence-unit>
 </persistence>

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml?rev=763060&r1=763059&r2=763060&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml
(original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/persistence/openjpa-persistence.xml
Wed Apr  8 00:46:26 2009
@@ -1,20 +1,4 @@
 <?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.
- *
- */ -->
 <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"

@@ -69,6 +53,23 @@
     <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"/>
+      
+      <!-- derby connection properties -->
+      <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+      <property name="openjpa.ConnectionURL" value="jdbc:derby:target/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=""/>
+      -->
+      
     </properties>
   </persistence-unit>
 </persistence>



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org


Mime
View raw message