svn commit: r934949 - in /sling/trunk: launchpad/testing/ maven/maven-launchpad-plugin/src/main/resources/org/apache/sling/maven/projectsupport/ maven/maven-launchpad-plugin/src/test/java/org/apache/sling/maven/projectsupport/

[justin]

Author: justin
Date: Fri Apr 16 14:53:27 2010
New Revision: 934949

URL: http://svn.apache.org/viewvc?rev=934949&view=rev
Log:
SLING-1491 - switching from pax web to felix httpservice

Modified:
    sling/trunk/launchpad/testing/pom.xml
    
sling/trunk/maven/maven-launchpad-plugin/src/main/resources/org/apache/sling/maven/projectsupport/dependencies.properties
    
sling/trunk/maven/maven-launchpad-plugin/src/test/java/org/apache/sling/maven/projectsupport/PreparePackageMojoTest.java

Modified: sling/trunk/launchpad/testing/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=934949&r1=934948&r2=934949&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Fri Apr 16 14:53:27 2010
@@ -305,11 +305,6 @@
                         <configuration>
                             <httpPort>${http.port}</httpPort>
                             <controlHost>${test.host}</controlHost>
-                            <jarWebSupport>
-                                <groupId>org.apache.felix</groupId>
-                                
<artifactId>org.apache.felix.http.jetty</artifactId>
-                                <version>2.0.4</version>
-                            </jarWebSupport>
                         </configuration>
                     </plugin>
                 </plugins>

Modified: 
sling/trunk/maven/maven-launchpad-plugin/src/main/resources/org/apache/sling/maven/projectsupport/dependencies.properties
URL: 
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/resources/org/apache/sling/maven/projectsupport/dependencies.properties?rev=934949&r1=934948&r2=934949&view=diff
==============================================================================
--- 
sling/trunk/maven/maven-launchpad-plugin/src/main/resources/org/apache/sling/maven/projectsupport/dependencies.properties
 (original)
+++ 
sling/trunk/maven/maven-launchpad-plugin/src/main/resources/org/apache/sling/maven/projectsupport/dependencies.properties
 Fri Apr 16 14:53:27 2010
@@ -17,4 +17,4 @@
 base=org.apache.sling,org.apache.sling.launchpad.base,,jar,,0
 
defaultBundles=org.apache.sling,org.apache.sling.launchpad,RELEASE,jar,bundles,0
 
defaultBundleList=org.apache.sling,org.apache.sling.launchpad,RELEASE,xml,bundlelist,0
-jarWebSupport=org.ops4j.pax.web,pax-web-service,RELEASE,jar,,5
+jarWebSupport=org.apache.felix,org.apache.felix.http.jetty,RELEASE,jar,,5

Modified: 
sling/trunk/maven/maven-launchpad-plugin/src/test/java/org/apache/sling/maven/projectsupport/PreparePackageMojoTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/test/java/org/apache/sling/maven/projectsupport/PreparePackageMojoTest.java?rev=934949&r1=934948&r2=934949&view=diff
==============================================================================
--- 
sling/trunk/maven/maven-launchpad-plugin/src/test/java/org/apache/sling/maven/projectsupport/PreparePackageMojoTest.java
 (original)
+++ 
sling/trunk/maven/maven-launchpad-plugin/src/test/java/org/apache/sling/maven/projectsupport/PreparePackageMojoTest.java
 Fri Apr 16 14:53:27 2010
@@ -38,11 +38,11 @@ public class PreparePackageMojoTest {
                //makeArtifactAssertions(mojo, "defaultBundles", 
"org.apache.sling",
                //              "org.apache.sling.launchpad", "RELEASE", "jar", 
"bundles", 0);
 
-        makeArtifactAssertions(mojo, "defaultBundleList", "org.apache.sling",
-                "org.apache.sling.launchpad", "RELEASE", "xml", "bundlelist", 
0);
+               makeArtifactAssertions(mojo, "defaultBundleList", 
"org.apache.sling",
+                       "org.apache.sling.launchpad", "RELEASE", "xml", 
"bundlelist", 0);
 
-               makeArtifactAssertions(mojo, "jarWebSupport", 
"org.ops4j.pax.web",
-                               "pax-web-service", "RELEASE", "jar", null, 5);
+               makeArtifactAssertions(mojo, "jarWebSupport", 
"org.apache.felix",
+                               "org.apache.felix.http.jetty", "RELEASE", 
"jar", null, 5);
 
        }