xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route

Browse source 
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7

Former-commit-id: e8511a53ad [formerly b9d8e444b3] [formerly 9bc7c854ab] [formerly 7ee918a548 [formerly 9bc7c854ab [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]]
Former-commit-id: 7ee918a548
Former-commit-id: 0bda58a8028b819a68146a811f6632e8d08a2202 [formerly 50cb2e26a2]
Former-commit-id: e7a679ebc7
This commit is contained in:
Dustin Johnson 2013-06-18 11:24:42 -05:00
parent 5153afecf9
commit 73e70fe69a
13 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cots/org.hibernate/.classpath
View file

@ -2,7 +2,7 @@
<classpath>
<classpathentry exported="true" kind="lib" path="hibernate-spatial-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="hibernate-spatial-postgis-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="hibernate3.5.6-Final.jar"/>
<classpathentry exported="true" kind="lib" path="hibernate3.5.6-Final.jar" sourcepath="hibernate-3.5.6-Final-source.zip"/>
<classpathentry exported="true" kind="lib" path="javassist-3.9.0.GA.jar"/>
<classpathentry exported="true" kind="lib" path="jta-1.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

BIN
cots/org.hibernate/hibernate-3.5.6-Final-source.zip Normal file
View file

Binary file not shown.

BIN
cots/org.hibernate/hibernate3.5.0-Final.jar
View file

Binary file not shown.

1
edexOsgi/build.edex/esb/bin/setup.env
View file

@ -24,7 +24,6 @@ export DATA_ARCHIVE_ROOT=/tmp/sbn
# setup db connections
export DB_ADDR=localhost
export DB_PORT=5432
export DB_DIALECT=org.hibernate.dialect.PostgreSQLDialect
# setup connection to qpid
export BROKER_ADDR=localhost

4
edexOsgi/build.edex/esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml
View file

@ -31,7 +31,7 @@
org.postgresql.Driver
</property>
<property name="dialect">
${db.dialect}
org.hibernate.dialect.PostgreSQLDialect
</property>
<property name="connection.url">
jdbc:postgresql://${db.addr}:${db.port}/metadata
@ -73,4 +73,4 @@
<property name="cache.use_query_cache">false</property>
</session-factory>
</hibernate-configuration>
</hibernate-configuration>

2
edexOsgi/build.edex/esb/conf/log4j-dataprovideragent.xml
View file

@ -64,7 +64,7 @@
<level value="WARN"/>
</logger>
<logger name="org.hibernate" additivity="false">
<level value="ERROR"/>
<level value="WARN"/>
<appender-ref ref="HibernateLog" />
</logger>
<logger name="org.geotools">

2
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
View file

@ -251,7 +251,7 @@
<level value="WARN"/>
</logger>
<logger name="org.hibernate" additivity="false">
<level value="ERROR"/>
<level value="WARN"/>
<appender-ref ref="HibernateLog" />
</logger>
<logger name="org.geotools">

2
edexOsgi/build.edex/esb/conf/log4j-registry.xml
View file

@ -115,7 +115,7 @@
<level value="WARN"/>
</logger>
<logger name="org.hibernate" additivity="false">
<level value="ERROR"/>
<level value="WARN"/>
<appender-ref ref="HibernateLog" />
</logger>
<logger name="org.geotools">

2
edexOsgi/build.edex/esb/conf/log4j.xml
View file

@ -137,7 +137,7 @@
<level value="WARN"/>
</logger>
<logger name="org.hibernate" additivity="false">
<level value="ERROR"/>
<level value="WARN"/>
<appender-ref ref="HibernateLog" />
</logger>
<logger name="org.geotools">

13
edexOsgi/build.edex/esb/conf/wrapper.conf
View file

@ -100,13 +100,12 @@ wrapper.java.additional.qpid.1=-Dqpid.dest_syntax=BURL
# hibernate.cfg.xml cannot read from ENV variables but can read from Java system properties
wrapper.java.additional.db.1=-Ddb.addr=${DB_ADDR}
wrapper.java.additional.db.2=-Ddb.port=${DB_PORT}
wrapper.java.additional.db.3=-Ddb.dialect=${DB_DIALECT}
wrapper.java.additional.db.4=-Ddc.db.name=${DC_DB_NAME}
wrapper.java.additional.db.5=-Dfxa.db.name=${FXA_DB_NAME}
wrapper.java.additional.db.6=-Dhm.db.name=${HM_DB_NAME}
wrapper.java.additional.db.7=-Dih.db.name=${IH_DB_NAME}
wrapper.java.additional.db.8=-Ddb.metadata.pool.min=${METADATA_POOL_MIN}
wrapper.java.additional.db.9=-Ddb.metadata.pool.max=${METADATA_POOL_MAX}
wrapper.java.additional.db.3=-Ddc.db.name=${DC_DB_NAME}
wrapper.java.additional.db.4=-Dfxa.db.name=${FXA_DB_NAME}
wrapper.java.additional.db.5=-Dhm.db.name=${HM_DB_NAME}
wrapper.java.additional.db.6=-Dih.db.name=${IH_DB_NAME}
wrapper.java.additional.db.7=-Ddb.metadata.pool.min=${METADATA_POOL_MIN}
wrapper.java.additional.db.8=-Ddb.metadata.pool.max=${METADATA_POOL_MAX}
# site ID of EDEX for localization and site aware services
wrapper.java.additional.site.1=-Daw.site.identifier=${AW_SITE_IDENTIFIER}

1
edexOsgi/build.edex/esb/etc/dataprovideragent.sh
View file

@ -27,5 +27,4 @@ export EDEX_DEBUG_PORT=5010
export EDEX_JMX_PORT=1621
export LOG4J_CONF=log4j-dataprovideragent.xml
export MGMT_PORT=9606
export DB_DIALECT=org.hibernatespatial.postgis.PostgisDialect

9
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseSessionFactoryBean.java
View file

@ -49,6 +49,7 @@ import com.raytheon.uf.common.serialization.SerializableManager;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 10/8/2008 1532 bphillip Initial checkin
* Jun 18, 2013 2117 djohnson Remove use of config.buildSettings().
*
* </pre>
*
@ -80,7 +81,8 @@ public class DatabaseSessionFactoryBean extends AnnotationSessionFactoryBean {
throws org.hibernate.AnnotationException {
Configuration config = getConfiguration();
AnnotationConfiguration tmp = loadNewConfigForClasses(classes);
return tmp.generateSchemaCreationScript(config.buildSettings().getDialect());
return tmp.generateSchemaCreationScript(Dialect.getDialect(config
.getProperties()));
}
/**
@ -98,7 +100,8 @@ public class DatabaseSessionFactoryBean extends AnnotationSessionFactoryBean {
throws org.hibernate.AnnotationException {
Configuration config = getConfiguration();
AnnotationConfiguration tmp = loadNewConfigForClasses(classes);
return tmp.generateDropSchemaScript(config.buildSettings().getDialect());
return tmp.generateDropSchemaScript(Dialect.getDialect(config
.getProperties()));
}
private AnnotationConfiguration loadNewConfigForClasses(
@ -144,4 +147,4 @@ public class DatabaseSessionFactoryBean extends AnnotationSessionFactoryBean {
this.setAnnotatedClasses(annotatedClasses.toArray(new Class[] {}));
}
}
}
}

19
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
View file

@ -1,16 +1,17 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<camelContext id="server-camel"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
<endpoint id="ebxmlThriftService" uri="jetty:http://0.0.0.0:${EBXML_THRIFT_SERVICE_PORT}/services/thrift?disableStreamCache=true&amp;chunked=false&amp;httpBindingRef=#binaryHttpBinding" />
<endpoint id="ebxmlThriftService_from"
uri="jetty:http://0.0.0.0:${EBXML_THRIFT_SERVICE_PORT}/services/thrift?disableStreamCache=true&amp;chunked=false&amp;httpBindingRef=#binaryHttpBinding" />
<route id="thriftService">
<from ref="ebxmlThriftService" />
<bean ref="routeWrapper" method="executeThrift"/>
<route id="ebxmlThriftService">
<from uri="ref:ebxmlThriftService_from" />
<bean ref="routeWrapper" method="executeThrift" />
</route>
</camelContext>