| commit | cf74b81bc0990b5a754554706ca7a9ccabf425ac | [log] [tgz] |
|---|---|---|
| author | Ken Gilmer <kgilmer@apache.org> | Fri Jan 20 01:50:28 2012 +0000 |
| committer | Ken Gilmer <kgilmer@apache.org> | Fri Jan 20 01:50:28 2012 +0000 |
| tree | 6fa966589766a54dec4190f1610f3584cc87a0c9 | |
| parent | 5419b97ee01ec8270dd9655e4f1b448685eb559e [diff] |
httplite: reorg modules to core and complete. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1233710 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/httplite/complete/pom.xml b/httplite/complete/pom.xml index 3a1c5fa..fc94e59 100644 --- a/httplite/complete/pom.xml +++ b/httplite/complete/pom.xml
@@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.httplite</artifactId> + <artifactId>org.apache.felix.httplite.core</artifactId> <version>${project.version}</version> </dependency> <dependency>
diff --git a/httplite/minimum/DEPENDENCIES b/httplite/core/DEPENDENCIES similarity index 100% rename from httplite/minimum/DEPENDENCIES rename to httplite/core/DEPENDENCIES
diff --git a/httplite/minimum/LICENSE b/httplite/core/LICENSE similarity index 100% rename from httplite/minimum/LICENSE rename to httplite/core/LICENSE
diff --git a/httplite/minimum/NOTICE b/httplite/core/NOTICE similarity index 100% rename from httplite/minimum/NOTICE rename to httplite/core/NOTICE
diff --git a/httplite/minimum/README b/httplite/core/README similarity index 100% rename from httplite/minimum/README rename to httplite/core/README
diff --git a/httplite/minimum/doc/changelog.txt b/httplite/core/doc/changelog.txt similarity index 100% rename from httplite/minimum/doc/changelog.txt rename to httplite/core/doc/changelog.txt
diff --git a/httplite/minimum/pom.xml b/httplite/core/pom.xml similarity index 97% rename from httplite/minimum/pom.xml rename to httplite/core/pom.xml index f585bf1..d852426 100644 --- a/httplite/minimum/pom.xml +++ b/httplite/core/pom.xml
@@ -27,8 +27,8 @@ <packaging>bundle</packaging> <name>Apache Felix Lightweight HTTP Service</name> <description>A minimal HTTP Service implementation.</description> - <version>0.1.5-SNAPSHOT</version> - <artifactId>org.apache.felix.httplite</artifactId> + <version>0.1.3-SNAPSHOT</version> + <artifactId>org.apache.felix.httplite.core</artifactId> <dependencies> <dependency> <groupId>org.osgi</groupId>
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/Activator.java b/httplite/core/src/main/java/org/apache/felix/httplite/osgi/Activator.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/Activator.java rename to httplite/core/src/main/java/org/apache/felix/httplite/osgi/Activator.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/DefaultContextImpl.java b/httplite/core/src/main/java/org/apache/felix/httplite/osgi/DefaultContextImpl.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/DefaultContextImpl.java rename to httplite/core/src/main/java/org/apache/felix/httplite/osgi/DefaultContextImpl.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/HttpServiceFactoryImpl.java b/httplite/core/src/main/java/org/apache/felix/httplite/osgi/HttpServiceFactoryImpl.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/HttpServiceFactoryImpl.java rename to httplite/core/src/main/java/org/apache/felix/httplite/osgi/HttpServiceFactoryImpl.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java b/httplite/core/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java rename to httplite/core/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/Logger.java b/httplite/core/src/main/java/org/apache/felix/httplite/osgi/Logger.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/Logger.java rename to httplite/core/src/main/java/org/apache/felix/httplite/osgi/Logger.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistration.java b/httplite/core/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistration.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistration.java rename to httplite/core/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistration.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationHandler.java b/httplite/core/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationHandler.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationHandler.java rename to httplite/core/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationHandler.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationResolver.java b/httplite/core/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationResolver.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationResolver.java rename to httplite/core/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationResolver.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/server/Connection.java b/httplite/core/src/main/java/org/apache/felix/httplite/server/Connection.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/server/Connection.java rename to httplite/core/src/main/java/org/apache/felix/httplite/server/Connection.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java b/httplite/core/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java rename to httplite/core/src/main/java/org/apache/felix/httplite/server/ResourceHandler.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/server/Server.java b/httplite/core/src/main/java/org/apache/felix/httplite/server/Server.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/server/Server.java rename to httplite/core/src/main/java/org/apache/felix/httplite/server/Server.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/server/ServletHandler.java b/httplite/core/src/main/java/org/apache/felix/httplite/server/ServletHandler.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/server/ServletHandler.java rename to httplite/core/src/main/java/org/apache/felix/httplite/server/ServletHandler.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/server/ThreadGate.java b/httplite/core/src/main/java/org/apache/felix/httplite/server/ThreadGate.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/server/ThreadGate.java rename to httplite/core/src/main/java/org/apache/felix/httplite/server/ThreadGate.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/server/ThreadPool.java b/httplite/core/src/main/java/org/apache/felix/httplite/server/ThreadPool.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/server/ThreadPool.java rename to httplite/core/src/main/java/org/apache/felix/httplite/server/ThreadPool.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/ConcreteServletInputStream.java b/httplite/core/src/main/java/org/apache/felix/httplite/servlet/ConcreteServletInputStream.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/ConcreteServletInputStream.java rename to httplite/core/src/main/java/org/apache/felix/httplite/servlet/ConcreteServletInputStream.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/HttpConstants.java b/httplite/core/src/main/java/org/apache/felix/httplite/servlet/HttpConstants.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/HttpConstants.java rename to httplite/core/src/main/java/org/apache/felix/httplite/servlet/HttpConstants.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/HttpServletRequestImpl.java b/httplite/core/src/main/java/org/apache/felix/httplite/servlet/HttpServletRequestImpl.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/HttpServletRequestImpl.java rename to httplite/core/src/main/java/org/apache/felix/httplite/servlet/HttpServletRequestImpl.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/HttpServletResponseImpl.java b/httplite/core/src/main/java/org/apache/felix/httplite/servlet/HttpServletResponseImpl.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/HttpServletResponseImpl.java rename to httplite/core/src/main/java/org/apache/felix/httplite/servlet/HttpServletResponseImpl.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/ServletConfigImpl.java b/httplite/core/src/main/java/org/apache/felix/httplite/servlet/ServletConfigImpl.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/ServletConfigImpl.java rename to httplite/core/src/main/java/org/apache/felix/httplite/servlet/ServletConfigImpl.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/ServletContextImpl.java b/httplite/core/src/main/java/org/apache/felix/httplite/servlet/ServletContextImpl.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/ServletContextImpl.java rename to httplite/core/src/main/java/org/apache/felix/httplite/servlet/ServletContextImpl.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/ServletOutputStreamImpl.java b/httplite/core/src/main/java/org/apache/felix/httplite/servlet/ServletOutputStreamImpl.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/ServletOutputStreamImpl.java rename to httplite/core/src/main/java/org/apache/felix/httplite/servlet/ServletOutputStreamImpl.java
diff --git a/httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/UnimplementedAPIException.java b/httplite/core/src/main/java/org/apache/felix/httplite/servlet/UnimplementedAPIException.java similarity index 100% rename from httplite/minimum/src/main/java/org/apache/felix/httplite/servlet/UnimplementedAPIException.java rename to httplite/core/src/main/java/org/apache/felix/httplite/servlet/UnimplementedAPIException.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/AbstractHttpliteTestCase.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/AbstractHttpliteTestCase.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/AbstractHttpliteTestCase.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/AbstractHttpliteTestCase.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/AbstractPojoSRTestCase.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/AbstractPojoSRTestCase.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/AbstractPojoSRTestCase.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/AbstractPojoSRTestCase.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/BasicTestingServlet.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/BasicTestingServlet.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/BasicTestingServlet.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/BasicTestingServlet.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestCookies.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestCookies.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestCookies.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestCookies.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestOSGiService.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestOSGiService.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestOSGiService.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestOSGiService.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestParameters.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestParameters.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestParameters.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestParameters.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestQueryString.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestQueryString.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestQueryString.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestQueryString.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestRequestPath.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestRequestPath.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestRequestPath.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestRequestPath.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestResources.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestResources.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestResources.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestResources.java
diff --git a/httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestServletContainer.java b/httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestServletContainer.java similarity index 100% rename from httplite/minimum/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestServletContainer.java rename to httplite/core/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestServletContainer.java
diff --git a/httplite/minimum/src/test/resources/webroot/index.html b/httplite/core/src/test/resources/webroot/index.html similarity index 100% rename from httplite/minimum/src/test/resources/webroot/index.html rename to httplite/core/src/test/resources/webroot/index.html
diff --git a/httplite/pom.xml b/httplite/pom.xml index fec0b4e..de835a4 100644 --- a/httplite/pom.xml +++ b/httplite/pom.xml
@@ -58,7 +58,7 @@ </build> <modules> - <module>minimum</module> + <module>core</module> <module>complete</module> </modules> </project>