Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'origin/master'
Conflicts:
	nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonLookupWithSubscriptionIntegrationTest.java
  • Loading branch information
jrftrifork committed Oct 6, 2011
2 parents 6a2eea6 + c7298bd commit 608158f
Show file tree
Hide file tree
Showing 26 changed files with 133 additions and 307 deletions.
1 change: 1 addition & 0 deletions common/common/pom.xml
Expand Up @@ -17,6 +17,7 @@
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
<version>1.0.0.Final</version>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Expand Up @@ -24,6 +24,10 @@
*/
package dk.nsi.dgws;

import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import dk.sosi.seal.SOSIFactory;
import dk.sosi.seal.model.IDCard;
import dk.sosi.seal.model.Reply;
Expand All @@ -49,6 +53,7 @@
import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.Properties;


Expand Down Expand Up @@ -198,6 +203,7 @@ public void destroy() { }
* This annotation allows dependency injectors know
* that the annotated element can be null.
*/
@Retention(RetentionPolicy.RUNTIME)
@Retention(RUNTIME)
@Target({ FIELD, PARAMETER, METHOD })
public @interface Nullable { }
}
5 changes: 5 additions & 0 deletions nsp/cpr-ws/pom.xml
Expand Up @@ -76,6 +76,7 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -138,7 +139,11 @@
<groupId>dk.nsi.stamdata</groupId>
<artifactId>stamdata-testing</artifactId>
<version>${project.version}</version>
<!--
HACK: Chronos does not include test deps and this is needed
for the performance tests.
<scope>test</scope>
-->
</dependency>

<dependency>
Expand Down
Expand Up @@ -40,10 +40,11 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
import org.hibernate.metadata.ClassMetadata;

import com.trifork.stamdata.models.cpr.Person;
import com.trifork.stamdata.models.sikrede.SikredeYderRelation;
import com.trifork.stamdata.models.sikrede.Yderregister;
import dk.nsi.stamdata.cpr.models.Person;
import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
import dk.nsi.stamdata.cpr.models.Yderregister;

@Singleton
public class HibernatePersistenceFilter implements Provider<Session>, Filter
Expand All @@ -66,6 +67,7 @@ public class HibernatePersistenceFilter implements Provider<Session>, Filter
config.setProperty("hibernate.connection.url", jdbcURL);
config.setProperty("hibernate.connection.username", username);
config.setProperty("hibernate.connection.password", password);
config.setProperty("hibernate.archive.autodetection", "class, hbm");

config.setProperty("hibernate.connection.driver_class", "com.mysql.jdbc.Driver");
config.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQLInnoDBDialect");
Expand All @@ -90,7 +92,14 @@ public class HibernatePersistenceFilter implements Provider<Session>, Filter
config.addAnnotatedClass(SikredeYderRelation.class);

sessionFactory = config.buildSessionFactory();
sessionFactory.openSession().isConnected();
Session session = sessionFactory.openSession();

System.out.println("Listing mapped classes:");

for (ClassMetadata meta : sessionFactory.getAllClassMetadata().values())
{
System.out.println("MAPPED CLASS: " + meta.getEntityName());
}
}


Expand Down
Expand Up @@ -28,11 +28,11 @@
import com.google.inject.servlet.RequestScoped;
import com.trifork.stamdata.Nullable;
import com.trifork.stamdata.Preconditions;
import com.trifork.stamdata.models.cpr.Person;
import com.trifork.stamdata.models.sikrede.SikredeYderRelation;
import com.trifork.stamdata.models.sikrede.Yderregister;
import dk.nsi.stamdata.cpr.mapping.CivilRegistrationStatusCodes;
import dk.nsi.stamdata.cpr.mapping.MunicipalityMapper;
import dk.nsi.stamdata.cpr.models.Person;
import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
import dk.nsi.stamdata.cpr.models.Yderregister;
import dk.nsi.stamdata.cpr.pvit.WhitelistProvider.Whitelist;
import dk.nsi.stamdata.cpr.ws.*;
import dk.sosi.seal.model.SystemIDCard;
Expand Down

0 comments on commit 608158f

Please sign in to comment.