You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/07/15 22:58:21 UTC

svn commit: r964586 - in /karaf/trunk: assembly/src/main/filtered-resources/features.xml itests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java

Author: gnodet
Date: Thu Jul 15 20:58:21 2010
New Revision: 964586

URL: http://svn.apache.org/viewvc?rev=964586&view=rev
Log:
Fix small formatting issues

Modified:
    karaf/trunk/assembly/src/main/filtered-resources/features.xml
    karaf/trunk/itests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java

Modified: karaf/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/features.xml?rev=964586&r1=964585&r2=964586&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/features.xml Thu Jul 15 20:58:21 2010
@@ -46,7 +46,7 @@
     </feature>
     <feature name="http" version="${project.version}">
         <config name="org.ops4j.pax.web">
-          org.osgi.service.http.port=8181
+            org.osgi.service.http.port=8181
         </config>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
@@ -66,7 +66,7 @@
     <feature name="webconsole" version="${project.version}">
         <feature version="${project.version}">http</feature>
         <config name="org.apache.karaf.webconsole">
-          realm=karaf
+            realm=karaf
         </config>
         <bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
         <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>

Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java?rev=964586&r1=964585&r2=964586&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java Thu Jul 15 20:58:21 2010
@@ -124,7 +124,7 @@ public class CoreTest extends AbstractIn
             equinox(), felix()
         );
         // Stop the shell log bundle 
-        Helper.findMaven(options, "org.apache.karaf.shell", "org.apache.karaf.shell.log").noStart();
+            Helper.findMaven(options, "org.apache.karaf.shell", "org.apache.karaf.shell.log").noStart();
         return options;
     }