Permalink
Browse files

added intellij iml files and fixed webi-php

  • Loading branch information...
1 parent 1e511c7 commit 147c9739e56004ea7139e4c068a136f8b186a1d7 @hofmeister committed Feb 5, 2013
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: vonhof:babelshark:1.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+ <orderEntry type="module" module-name="babelshark" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.5" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.5" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.4.1" level="project" />
+ </component>
+</module>
+
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: vonhof:babelshark:1.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+ <orderEntry type="module" module-name="webi" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.2.v20120308" level="project" />
+ <orderEntry type="module" module-name="babelshark" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.5" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.5" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:8.1.4.v20120524" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:8.1.4.v20120524" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+ <orderEntry type="library" name="Maven: com.google.javascript:closure-compiler:r2388" level="project" />
+ <orderEntry type="library" name="Maven: args4j:args4j:2.0.16" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.jarjar:jarjar:1.1" level="project" />
+ <orderEntry type="library" name="Maven: com.asual.lesscss:lesscss-engine:1.3.0" level="project" />
+ <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7R3" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ </component>
+</module>
+
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: vonhof:babelshark:1.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+ <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.8.0" level="project" />
+ <orderEntry type="module" module-name="webi-db" />
+ <orderEntry type="module" module-name="webi" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.2.v20120308" level="project" />
+ <orderEntry type="module" module-name="babelshark" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.5" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.5" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:8.1.4.v20120524" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:8.1.4.v20120524" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+ <orderEntry type="library" name="Maven: com.google.javascript:closure-compiler:r2388" level="project" />
+ <orderEntry type="library" name="Maven: args4j:args4j:2.0.16" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.jarjar:jarjar:1.1" level="project" />
+ <orderEntry type="library" name="Maven: com.asual.lesscss:lesscss-engine:1.3.0" level="project" />
+ <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7R3" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ </component>
+</module>
+
View
@@ -36,5 +36,10 @@
<artifactId>javaee-web-api</artifactId>
<version>6.0</version>
</dependency>
+ <dependency>
+ <groupId>com.vonhof</groupId>
+ <artifactId>webi</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</project>
@@ -23,9 +23,9 @@
import com.caucho.vfs.Path;
import com.caucho.vfs.Vfs;
import com.caucho.vfs.WriteStream;
-import com.vonhof.webi.FileRequestHandler;
+import com.vonhof.webi.file.FileRequestHandler;
import com.vonhof.webi.WebiContext;
-import com.vonhof.webi.mvc.MVCRequestHandler;
+import com.vonhof.webi.rest.RESTServiceHandler;
import com.vonhof.webi.php.module.WebiModule;
import java.io.File;
import java.io.FileNotFoundException;
@@ -38,15 +38,15 @@
*/
public class PHPRequestHandler extends FileRequestHandler {
- private final MVCRequestHandler service;
+ private final RESTServiceHandler service;
private static final L10N L = new L10N(QuercusServletImpl.class);
private static final Logger LOG = Logger.getLogger(PHPRequestHandler.class.getName());
private final QuercusContext quercus = new QuercusContext();
private final Path basePath;
- public PHPRequestHandler(MVCRequestHandler service,String docRoot) {
+ public PHPRequestHandler(RESTServiceHandler service,String docRoot) {
super();
this.service = service;
@@ -16,9 +16,9 @@
import com.vonhof.webi.WebiContext;
import com.vonhof.webi.annotation.Body;
import com.vonhof.webi.annotation.Parm;
-import com.vonhof.webi.mvc.MVCRequestHandler;
-import com.vonhof.webi.mvc.TextFile;
-import com.vonhof.webi.mvc.UrlMapper;
+import com.vonhof.webi.rest.RESTServiceHandler;
+import com.vonhof.webi.rest.TextFile;
+import com.vonhof.webi.rest.UrlMapper;
import com.vonhof.webi.session.WebiSession;
import java.io.InputStream;
import java.io.OutputStream;
@@ -34,10 +34,10 @@
*/
public class WebiModule extends AbstractQuercusModule {
- private final MVCRequestHandler service;
+ private final RESTServiceHandler service;
private final Webi webi;
- public WebiModule(Webi webi,MVCRequestHandler service) {
+ public WebiModule(Webi webi,RESTServiceHandler service) {
this.webi = webi;
this.service = service;
}
@@ -48,11 +48,11 @@ public WebiWrapper webi(Env env) {
public class WebiWrapper {
- private final MVCRequestHandler service;
+ private final RESTServiceHandler service;
private final Env env;
private final Map<String, ControllerWrapper> controllers = new HashMap<String, ControllerWrapper>();
- public WebiWrapper(MVCRequestHandler webi, Env env) {
+ public WebiWrapper(RESTServiceHandler webi, Env env) {
this.service = webi;
this.env = env;
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: vonhof:babelshark:1.0-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+ <orderEntry type="module" module-name="webi" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.2.v20120308" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.2.v20120308" level="project" />
+ <orderEntry type="module" module-name="babelshark" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.5" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.5" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:8.1.4.v20120524" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:8.1.4.v20120524" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+ <orderEntry type="library" name="Maven: com.google.javascript:closure-compiler:r2388" level="project" />
+ <orderEntry type="library" name="Maven: args4j:args4j:2.0.16" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.jarjar:jarjar:1.1" level="project" />
+ <orderEntry type="library" name="Maven: com.asual.lesscss:lesscss-engine:1.3.0" level="project" />
+ <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7R3" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.cache:cache-api:0.5" level="project" />
+ <orderEntry type="library" name="Maven: javax:javaee-web-api:6.0" level="project" />
+ </component>
+</module>
+
Oops, something went wrong.

0 comments on commit 147c973

Please sign in to comment.