You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/07/26 12:22:18 UTC
[31/32] git commit: [OLINGO-377] Code clean up
[OLINGO-377] Code clean up
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/49a38afc
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/49a38afc
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/49a38afc
Branch: refs/heads/OLINGO-377-FIT
Commit: 49a38afc4e7cdf55ba260ed36b51264285d73b56
Parents: d343506
Author: mibo <mi...@mirb.de>
Authored: Sat Jul 26 11:41:54 2014 +0200
Committer: mibo <mi...@mirb.de>
Committed: Sat Jul 26 11:41:54 2014 +0200
----------------------------------------------------------------------
fit/pom.xml | 55 ++++++----
.../olingo/fit/server/TomcatTestServer.java | 108 +++++++++++++++++--
2 files changed, 130 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/49a38afc/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index d42cdb6..5f8edef 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
@@ -137,7 +137,6 @@
</dependencies>
<build>
-
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -161,8 +160,6 @@
</configuration>
</plugin>
- <!--
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -200,8 +197,7 @@
</instrumentation>
</configuration>
</plugin>
- <!--
- -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
@@ -220,10 +216,11 @@
</configuration>
<executions>
<execution>
- <id>integration-test</id>
+ <id>pojogen-integration-test</id>
+ <phase>integration-test</phase>
<goals>
- <!--<goal>integration-test</goal>-->
- <!--<goal>verify</goal>-->
+ <goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
@@ -231,6 +228,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*ITCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.apache.olingo.fit.server.TomcatTestServer</mainClass>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<inherited>true</inherited>
<executions>
@@ -256,19 +280,6 @@
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <systemPropertyVariables>
- <propertyName>org.slf4j.simpleLogger.defaultLogLevel</propertyName>
- <org.slf4j.simpleLogger.defaultLogLevel>DEBUG</org.slf4j.simpleLogger.defaultLogLevel>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- -->
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/49a38afc/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java b/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
index 8bd8e23..16ac7f7 100644
--- a/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
+++ b/fit/src/main/java/org/apache/olingo/fit/server/TomcatTestServer.java
@@ -26,10 +26,17 @@ import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.naming.directory.DirContext;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
import java.util.jar.JarFile;
/**
@@ -48,6 +55,52 @@ public class TomcatTestServer {
this.tomcat = tomcat;
}
+ public static void main(String[] params) {
+ try {
+ LOG.trace("Start tomcat embedded server from main()");
+ TomcatTestServer server = TomcatTestServer.init(9080)
+ .addStaticContent("/stub/StaticService/V30/Static.svc/$metadata", "V30/metadata.xml")
+ .addStaticContent("/stub/StaticService/V30/ActionOverloading.svc/$metadata",
+ "V30/actionOverloadingMetadata.xml")
+ .addStaticContent("/stub/StaticService/V30/OpenType.svc/$metadata", "V30/openTypeMetadata.xml")
+ .addStaticContent("/stub/StaticService/V30/PrimitiveKeys.svc/$metadata", "V30/primitiveKeysMetadata.xml")
+ .addStaticContent("/stub/StaticService/V40/OpenType.svc/$metadata", "V40/openTypeMetadata.xml")
+ .addStaticContent("/stub/StaticService/V40/Demo.svc/$metadata", "V40/demoMetadata.xml")
+ .addStaticContent("/stub/StaticService/V40/Static.svc/$metadata", "V40/metadata.xml")
+ .start();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to start Tomcat server from main method.", e);
+ }
+ }
+
+ public static class StaticContent extends HttpServlet {
+ private final String uri;
+ private final String resource;
+
+ public StaticContent(String uri, String resource) {
+ this.uri = uri;
+ this.resource = resource;
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+
+ StringHelper.Stream st;
+ File resourcePath = new File(resource);
+ if(resourcePath.exists() && resourcePath.isFile()) {
+ FileInputStream fin = new FileInputStream(resourcePath);
+ st = StringHelper.toStream(fin);
+ LOG.info("Mapped uri '{}' to resource '{}'.", uri, resource);
+ LOG.trace("Resource content {\n\n{}\n\n}", st.asString());
+ } else {
+ LOG.debug("Unable to load resource for path {} as stream.", uri);
+ st = StringHelper.toStream("<html><head/><body>No resource for path found</body>");
+ }
+ resp.getOutputStream().write(st.asString().getBytes());
+ }
+ }
+
private static TestServerBuilder builder;
public static TestServerBuilder init(int port) {
if(builder == null) {
@@ -59,13 +112,14 @@ public class TomcatTestServer {
public static class TestServerBuilder {
private final Tomcat tomcat;
private final File baseDir;
+ private final File projectTarget;
private TomcatTestServer server;
private TestServerBuilder(int fixedPort) {
tomcat = new Tomcat();
tomcat.setPort(fixedPort);
//baseDir = new File(System.getProperty("java.io.tmpdir"), "tomcat-test");
- File projectTarget = new File(Thread.currentThread().getContextClassLoader().getResource(".").getFile());
+ projectTarget = new File(Thread.currentThread().getContextClassLoader().getResource(".").getFile());
// projectTarget == ...fit/target/test-classes
baseDir = new File(projectTarget, "../emb-tom-fit");
if(!baseDir.exists() && !baseDir.mkdirs()) {
@@ -95,15 +149,28 @@ public class TomcatTestServer {
FileUtils.copyDirectory(webAppProjectDir, webAppDir);
File libDir = new File(webAppDir, "WEB-INF/lib");
File classesDir = new File(webAppDir, "WEB-INF/classes");
- String[] libs = new String[]{"olingo-client-proxy-0.1.0-SNAPSHOT.jar",
+ String[] libsToExtract = new String[]{
+ "olingo-client-proxy-0.1.0-SNAPSHOT.jar",
"olingo-commons-api-0.1.0-SNAPSHOT.jar",
- "olingo-commons-core-0.1.0-SNAPSHOT.jar"};
- for (String lib : libs) {
+ "olingo-commons-core-0.1.0-SNAPSHOT.jar"
+ };
+ for (String lib : libsToExtract) {
File libFile = new File(libDir, lib);
extract(libFile, classesDir);
FileUtils.forceDelete(libFile);
}
+ String[] libsToRemove = new String[]{
+ "javax.ws.rs-api-2.0.jar",
+ "maven-scm-api-1.4.jar",
+ "maven-scm-provider-svn-commons-1.4.jar",
+ "maven-scm-provider-svnexe-1.4.jar",
+ "tomcat-embed-logging-juli-7.0.54.jar",
+ "tomcat-embed-core-7.0.54.jar"};
+ for (String lib : libsToRemove) {
+ FileUtils.forceDelete(new File(libDir, lib));
+ }
+
String contextPath = "/stub"; // contextFile.getName()
tomcat.addWebapp(tomcat.getHost(), contextPath, webAppDir.getAbsolutePath());
LOG.info("Webapp {} at context {}.", webAppDir.getName(), contextPath);
@@ -125,6 +192,25 @@ public class TomcatTestServer {
return this;
}
+ public TestServerBuilder addStaticContent(String uri, String resourceName) throws Exception {
+ String resource = new File(projectTarget, resourceName).getAbsolutePath();
+ LOG.info("Added static content from '{}' at uri '{}'.", resource, uri);
+ StaticContent staticContent = new StaticContent(uri, resource);
+ return addServlet(staticContent, String.valueOf(uri.hashCode()), uri);
+ }
+
+ public TestServerBuilder addServlet(HttpServlet httpServlet, String name, String path) throws Exception {
+ if(server != null) {
+ return this;
+ }
+ Context cxt = getContext();
+ Tomcat.addServlet(cxt, name, httpServlet);
+ cxt.addServletMapping(path, name);
+ //
+ LOG.info("Added servlet {} at context {}.", name, path);
+ return this;
+ }
+
private Context baseContext = null;
private Context getContext() {
@@ -191,17 +277,17 @@ public class TomcatTestServer {
}
private static void extract(File jarFile, File destDir) throws IOException {
- JarFile jar = new java.util.jar.JarFile(jarFile);
- java.util.Enumeration enumEntries = jar.entries();
+ JarFile jar = new JarFile(jarFile);
+ Enumeration<JarEntry> enumEntries = jar.entries();
while (enumEntries.hasMoreElements()) {
- java.util.jar.JarEntry file = (java.util.jar.JarEntry) enumEntries.nextElement();
- java.io.File f = new java.io.File(destDir + java.io.File.separator + file.getName());
+ JarEntry file = enumEntries.nextElement();
+ File f = new File(destDir + File.separator + file.getName());
if (file.isDirectory()) { // if its a directory, create it
f.mkdir();
continue;
}
- java.io.InputStream is = jar.getInputStream(file); // get the input stream
- java.io.FileOutputStream fos = new java.io.FileOutputStream(f);
+ InputStream is = jar.getInputStream(file); // get the input stream
+ FileOutputStream fos = new FileOutputStream(f);
while (is.available() > 0) { // write contents of 'is' to 'fos'
fos.write(is.read());
}