jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1431306 - in /jackrabbit/oak/trunk/oak-it/osgi: pom.xml src/test/config/org.apache.jackrabbit.mk.osgi.MicroKernelService.cfg src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Date Thu, 10 Jan 2013 12:02:55 GMT
Author: jukka
Date: Thu Jan 10 12:02:54 2013
New Revision: 1431306

URL: http://svn.apache.org/viewvc?rev=1431306&view=rev
Log:
OAK-454: Make In Memory/H2 MicroKernal depend explicit configuration to activate

No need to copy the config file around, just use it from source location.
Also added the missing license header.

Modified:
    jackrabbit/oak/trunk/oak-it/osgi/pom.xml
    jackrabbit/oak/trunk/oak-it/osgi/src/test/config/org.apache.jackrabbit.mk.osgi.MicroKernelService.cfg
    jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java

Modified: jackrabbit/oak/trunk/oak-it/osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/pom.xml?rev=1431306&r1=1431305&r2=1431306&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/pom.xml Thu Jan 10 12:02:54 2013
@@ -36,15 +36,6 @@
   </properties>
 
   <build>
-      <resources>
-          <resource>
-              <directory>src/test/config</directory>
-              <includes>
-                  <include>*.cfg</include>
-              </includes>
-              <targetPath>${project.build.directory}/test-config</targetPath>
-          </resource>
-      </resources>
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>

Modified: jackrabbit/oak/trunk/oak-it/osgi/src/test/config/org.apache.jackrabbit.mk.osgi.MicroKernelService.cfg
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/src/test/config/org.apache.jackrabbit.mk.osgi.MicroKernelService.cfg?rev=1431306&r1=1431305&r2=1431306&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/src/test/config/org.apache.jackrabbit.mk.osgi.MicroKernelService.cfg
(original)
+++ jackrabbit/oak/trunk/oak-it/osgi/src/test/config/org.apache.jackrabbit.mk.osgi.MicroKernelService.cfg
Thu Jan 10 12:02:54 2013
@@ -1 +1,15 @@
+# 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
+#
+#     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.
 name="Oak"

Modified: jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1431306&r1=1431305&r2=1431306&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
(original)
+++ jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Thu Jan 10 12:02:54 2013
@@ -70,9 +70,7 @@ public class OSGiIT {
     }
 
     private String getConfigDir(){
-        File target = new File("target");
-        File configDir = new File(target,"test-config");
-        return configDir.getAbsolutePath();
+        return new File(new File("src", "test"), "config").getAbsolutePath();
     }
 
     private UrlProvisionOption jarBundle(String jar)



Mime
View raw message