ff-attic/imxmi
2
0
Fork 0
Code Activity

Removed eclipse settings.

Browse source
This commit is contained in:
Willem Cazander 2012-05-07 16:28:50 +02:00
parent c23d14522f
commit 2872143028
130 changed files with 175 additions and 982 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.classpath
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

6
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.core.resources.prefs
View file

@ -1,6 +0,0 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8

5
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,5 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5

4
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/.settings/org.eclipse.m2e.core.prefs
View file

@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

71
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/pom.xml
View file

@ -10,6 +10,17 @@
<name>vasc-demo-tech-ui</name>
<description>vasc-demo-tech-ui</description>
<dependencies>
<dependency>
<groupId>org.x4o</groupId>
<artifactId>x4o-core</artifactId>
<version>${x4o-core.version}</version>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.forwardfire.vasc.demo</groupId>
<artifactId>vasc-demo-tech-editor</artifactId>
@ -19,6 +30,7 @@
<groupId>net.forwardfire.vasc.demo</groupId>
<artifactId>vasc-demo-tech-web</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>net.forwardfire.vasc</groupId>
@ -30,6 +42,11 @@
<artifactId>vasc-frontend-swing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.forwardfire.vasc</groupId>
<artifactId>vasc-frontend-web-jsf</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.forwardfire.vasc</groupId>
<artifactId>vasc-backend-ldap</artifactId>
@ -75,6 +92,60 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.6.4</version>
</dependency>
<!-- Tomcat deps -->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>7.0.22</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>7.0.22</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
<version>7.0.22</version>
</dependency>
<!-- Web tech deps -->
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.15.B1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2_12</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>1.2_12</version>
</dependency>
<!-- RichFaces libraries -->
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
<version>3.3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
<version>3.3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
<version>3.3.3-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

38
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/TechUI.java
View file

@ -35,16 +35,15 @@ import java.util.logging.LogManager;
import java.util.logging.Logger;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import org.apache.juli.logging.LogFactory;
import org.jdesktop.application.Application;
import org.jdesktop.application.FrameView;
import org.jdesktop.application.SingleFrameApplication;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.demo.tech.ui.components.JMainPanel;
import net.forwardfire.vasc.demo.tech.ui.components.JMainPanelMenuBar;
import net.forwardfire.vasc.demo.tech.web.core.TomcatManager;
public class TechUI extends SingleFrameApplication {
@ -105,6 +104,7 @@ public class TechUI extends SingleFrameApplication {
} catch (Exception e) {
e.printStackTrace();
}
vascManager.stop();
long stopTime = System.currentTimeMillis();
logger.info("TechUI stopped in "+(stopTime-startTime)+" ms.");
}
@ -134,6 +134,21 @@ public class TechUI extends SingleFrameApplication {
vascManager.start();
autoLoadVasc();
tomcatManager = new TomcatManager();
tomcatManager.setVascController(vascManager.getVascController());
Thread t = new Thread(new Runnable() {
public void run() {
try {
Thread.sleep(2000); // let gui come up.
tomcatManager.start();
} catch (Exception e) {
e.printStackTrace();
}
}
});
t.start();
long stopTime = System.currentTimeMillis();
logger.info("TechUI initialized in "+(stopTime-startTime)+" ms.");
}
@ -149,21 +164,6 @@ public class TechUI extends SingleFrameApplication {
mainView.getFrame().setMinimumSize(new Dimension(1024-64,768-128));
show(mainView);
tomcatManager = new TomcatManager();
tomcatManager.setVascController(vascManager.getVascController());
SwingUtilities.invokeLater(new Runnable() {
public void run() {
try {
tomcatManager.start();
} catch (Exception e) {
e.printStackTrace();
}
}
});
long stopTime = System.currentTimeMillis();
logger.info("TechUI startup in "+(stopTime-startTime)+" ms total startup in "+(stopTime-startTime)+" ms.");
} catch (Exception e) {
@ -184,4 +184,8 @@ public class TechUI extends SingleFrameApplication {
public VascManager getVascManager() {
return vascManager;
}
public VascController getVascController() {
return vascManager.getVascController();
}
}

4
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/VascManager.java
View file

@ -38,6 +38,7 @@ public class VascManager {
}
public void start() {
logger.finer("Starting vascmanager");
try {
vascController = DefaultVascFactory.getDefaultVascController(2288L,"forwardfire.net","user","admin");
initEditor();
@ -65,11 +66,12 @@ public class VascManager {
public void openFile(File file) {
logger.info("Vasc open file: "+file.getAbsoluteFile());
try {
VascParser parser = new VascParser(vascController);
File f = File.createTempFile("test-vasc", ".xml");
parser.setDebugOutputStream(new FileOutputStream(f));
parser.parseFile(file.getAbsolutePath());
parser.parseFile(file);
DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) vascController.getVascEntryController(), vascController);
} catch (Exception e) {

2
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/components/JMainPanel.java
View file

@ -193,7 +193,7 @@ public class JMainPanel extends JPanel {
DefaultMutableTreeNode root = (DefaultMutableTreeNode)vascTree.getModel().getRoot();
root.removeAllChildren();
DefaultMutableTreeNode fieldTypes = new DefaultMutableTreeNode("FieldTypes");
DefaultMutableTreeNode fieldTypes = new DefaultMutableTreeNode("VascFieldTypes");
for (String id:vascManager.getVascController().getVascEntryFieldTypeController().getVascEntryFieldTypeIds()) {
DefaultMutableTreeNode typeNode = new DefaultMutableTreeNode(new VascTreeNode(VascTreeNodeType.FIELD_TYPE,id));
fieldTypes.add(typeNode);