You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/09/20 15:34:07 UTC
[45/59] [abbrv] cleanup of odata testutil
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
index 4243551..d7008be 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.testutil.server;
@@ -24,13 +24,12 @@ import java.net.URI;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
import org.apache.log4j.Logger;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.testutil.fit.FitStaticServiceFactory;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
/**
*
@@ -46,7 +45,7 @@ public class TestServer {
private static final String DEFAULT_HOST = "localhost";
private static final String DEFAULT_PATH = "/test";
- private URI endpoint; //= URI.create("http://localhost:19080/test"); // no slash at the end !!!
+ private URI endpoint; // = URI.create("http://localhost:19080/test"); // no slash at the end !!!
private final String path;
private int pathSplit = 0;
@@ -82,7 +81,8 @@ public class TestServer {
for (int port = PORT_MIN; port <= PORT_MAX; port += PORT_INC) {
final CXFNonSpringJaxrsServlet odataServlet = new CXFNonSpringJaxrsServlet();
final ServletHolder odataServletHolder = new ServletHolder(odataServlet);
- odataServletHolder.setInitParameter("javax.ws.rs.Application", "org.apache.olingo.odata2.core.rest.app.ODataApplication");
+ odataServletHolder.setInitParameter("javax.ws.rs.Application",
+ "org.apache.olingo.odata2.core.rest.app.ODataApplication");
odataServletHolder.setInitParameter(ODataServiceFactory.FACTORY_LABEL, factoryClass.getCanonicalName());
if (pathSplit > 0) {