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

2
vasc-frontend/vasc-frontend-web-jsf/pom.xml
View file

@ -3,7 +3,7 @@
<parent>
<artifactId>vasc-frontend</artifactId>
<groupId>net.forwardfire.vasc</groupId>
<version>0.4.1-SNAPSHOT</version>
<version>0.4.2-SNAPSHOT</version>
</parent>
<artifactId>vasc-frontend-web-jsf</artifactId>
<name>vasc-frontend-web-jsf</name>

16
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java
View file

@ -33,6 +33,8 @@ import java.util.ResourceBundle;
import javax.xml.parsers.ParserConfigurationException;
import org.x4o.xml.io.X4OConnectionException;
import org.x4o.xml.io.X4OReader;
import org.xml.sax.SAXException;
import net.forwardfire.vasc.core.VascController;
@ -40,7 +42,7 @@ import net.forwardfire.vasc.core.VascEntryControllerLocal;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.frontend.VascFrontendException;
import net.forwardfire.vasc.impl.DefaultVascFactory;
import net.forwardfire.vasc.impl.x4o.VascParser;
import net.forwardfire.vasc.impl.x4o.VascDriver;
@ -140,12 +142,14 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas
// Load vasc resources
for (String res:getVascParseResources()) {
VascParser vp = new VascParser(c);
VascDriver driver = VascDriver.getInstance();
X4OReader<VascController> reader = driver.createReader();
driver.addVascController(reader, c);
for (String name:vascGlobalELBeans.keySet()) {
Object value = vascGlobalELBeans.get(name);
vp.addELBean(name, value);
reader.addELBeanInstance(name, value);
}
vp.parseResource(res);
reader.readResource(res);
}
DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) c.getVascEntryController(), c);
@ -159,12 +163,12 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas
throw new VascFrontendException(e);
} catch (NullPointerException e) {
throw new VascFrontendException(e);
} catch (ParserConfigurationException e) {
throw new VascFrontendException(e);
} catch (SAXException e) {
throw new VascFrontendException(e);
} catch (IOException e) {
throw new VascFrontendException(e);
} catch (X4OConnectionException e) {
throw new VascFrontendException(e);
}
}