ff-attic/imxmi
2
0
Fork 0
Code Activity

Refactored demo section to single app layout.

Browse source
This commit is contained in:
Willem Cazander 2013-09-20 19:18:39 +02:00
parent b3635cf64d
commit 4bd244f4e5
337 changed files with 1630 additions and 1883 deletions
Download patch file Download diff file Expand all files Collapse all files

8
vasc-core-ejb3-server/pom.xml
View file

@ -3,7 +3,7 @@
<parent>
<groupId>net.forwardfire.vasc</groupId>
<artifactId>vasc</artifactId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
</parent>
<artifactId>vasc-core-ejb3-server</artifactId>
<name>vasc-core-ejb3-server</name>
@ -31,11 +31,5 @@
<version>${persistence-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.forwardfire.vasc</groupId>
<artifactId>vasc-xpql-ejb3-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

16
vasc-core-ejb3-server/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java
View file

@ -43,6 +43,8 @@ import javax.ejb.Stateless;
import javax.naming.InitialContext;
import javax.persistence.EntityManager;
import org.x4o.xml.io.X4OReader;
import net.forwardfire.vasc.backend.VascBackend;
import net.forwardfire.vasc.backends.jpa.EntityManagerProvider;
import net.forwardfire.vasc.core.VascController;
@ -50,8 +52,8 @@ import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryControllerLocal;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.impl.DefaultVascFactory;
import net.forwardfire.vasc.impl.x4o.VascParser;
import net.forwardfire.vasc.xpql.ejb3.XpqlQueryManager;
import net.forwardfire.vasc.impl.x4o.VascDriver;
import net.forwardfire.vasc.xpql.execute.jpa.XpqlQueryManager;
import net.forwardfire.vasc.xpql.query.Query;
@ -108,14 +110,16 @@ public class VascServiceManagerImpl implements VascServiceManagerRemote,VascServ
String value = keys.get(key);
if (key.startsWith("load")) {
// TODO made reuse working.
VascParser vp = new VascParser(vascController);
VascDriver driver = VascDriver.getInstance();
X4OReader<VascController> reader = driver.createReader();
driver.addVascController(reader, vascController);
if (xpqlController!=null) {
vp.addELBean("xpqlController", new XpqlController());
reader.addELBeanInstance("xpqlController", new XpqlController());
}
if (entityManager!=null) {
vp.addELBean("entityManagerProvider", new LocalEntityManagerProvider());
reader.addELBeanInstance("entityManagerProvider", new LocalEntityManagerProvider());
}
vp.parseResource(value);
reader.readResource(value);
}
}
DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) vascController.getVascEntryController(), vascController);