You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/01/20 12:16:21 UTC
svn commit: r1233868 - in /openejb/trunk/openejb/osgi:
apache-karafee/src/main/filtered-resources/etc/ openejb-karaf-rebranding/
openejb-osgi-tests/
openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/
Author: rmannibucau
Date: Fri Jan 20 11:16:20 2012
New Revision: 1233868
URL: http://svn.apache.org/viewvc?rev=1233868&view=rev
Log:
managing karaf upgrade to 2.2.5 and trying to avoid usage of already listening ports
Modified:
openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties
openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
openejb/trunk/openejb/osgi/openejb-karaf-rebranding/pom.xml
openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml
openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
Modified: openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties?rev=1233868&r1=1233867&r2=1233868&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties (original)
+++ openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties Fri Jan 20 11:16:20 2012
@@ -53,8 +53,8 @@ org.osgi.framework.system.packages=org.o
org.osgi.service.startlevel; version=1.1.0, \
org.osgi.service.url; version=1.0.0, \
org.osgi.util.tracker; version=1.4.0, \
- org.apache.karaf.jaas.boot; version=2.2.4, \
- org.apache.karaf.version; version=2.2.4, \
+ org.apache.karaf.jaas.boot; version=${karaf.version}, \
+ org.apache.karaf.version; version=${karaf.version}, \
${jre-${java.specification.version}}
org.osgi.framework.system.packages.extra=
Modified: openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1233868&r1=1233867&r2=1233868&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Fri Jan 20 11:16:20 2012
@@ -19,7 +19,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/2.2.4/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/2.2.4/xml/features,mvn:org.apache.openejb/openejb-feature/${project.parent.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.openejb/openejb-feature/${project.parent.version}/xml/features
#
# Comma separated list of features to install at startup
Modified: openejb/trunk/openejb/osgi/openejb-karaf-rebranding/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-karaf-rebranding/pom.xml?rev=1233868&r1=1233867&r2=1233868&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-karaf-rebranding/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-karaf-rebranding/pom.xml Fri Jan 20 11:16:20 2012
@@ -38,7 +38,7 @@
<build>
<resources>
<resource>
- <directory>${pom.basedir}/src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
Modified: openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml?rev=1233868&r1=1233867&r2=1233868&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml Fri Jan 20 11:16:20 2012
@@ -50,6 +50,13 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r09</version>
+ <scope>test</scope> <!-- to avoid conflicts -->
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
@@ -91,6 +98,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <karaf.version>${karaf.version}</karaf.version>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java?rev=1233868&r1=1233867&r2=1233868&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java (original)
+++ openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java Fri Jan 20 11:16:20 2012
@@ -19,9 +19,11 @@ package org.apache.openejb.osgi.test;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
+import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFilePutOption;
import org.apache.openejb.OpenEJB;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -32,9 +34,7 @@ import org.ops4j.pax.exam.junit.ProbeBui
import javax.inject.Inject;
import java.io.ByteArrayOutputStream;
-import java.io.FileReader;
import java.io.PrintStream;
-import java.util.Properties;
import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
import static org.junit.Assert.assertNotNull;
@@ -42,7 +42,6 @@ import static org.junit.Assert.assertTru
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.vmOption;
import static org.osgi.framework.Constants.DYNAMICIMPORT_PACKAGE;
@RunWith(JUnit4TestRunner.class)
@@ -52,16 +51,14 @@ public class OSGiKarafStartupTest {
@Configuration
public Option[] configure() throws Exception {
- final Properties jreProperties = new Properties();
- jreProperties.load(new FileReader("../apache-karafee/src/main/filtered-resources/etc/jre.properties"));
- final String[] packages = trim(jreProperties.getProperty("jre-1.6").split(","));
-
return options(
karafDistributionConfiguration()
.frameworkUrl(
maven().groupId("org.apache.openejb").artifactId("apache-karafee").versionAsInProject().type("tar.gz"))
.name("Apache Karafee")
- .karafVersion("2.2.4"),
+ .karafVersion(System.getProperty("karaf.version")),
+ new KarafDistributionConfigurationFilePutOption("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", Integer.toString(NetworkUtil.getNextAvailablePort())),
+ new KarafDistributionConfigurationFilePutOption("etc/org.apache.karaf.management.cfg", "rmiServerPort", Integer.toString(NetworkUtil.getNextAvailablePort())),
felix()
// to debug activate next line and create a remote debug configuration in your IDE
@@ -74,14 +71,6 @@ public class OSGiKarafStartupTest {
return probe.setHeader(DYNAMICIMPORT_PACKAGE, " *,org.apache.felix.service.*;status=provisional");
}
- private static String[] trim(String[] split) {
- final String[] trimmed = new String[split.length];
- for (int i = 0; i < split.length; i++) {
- trimmed[i] = split[i].trim();
- }
- return trimmed;
- }
-
@Test
public void openejbIsStarted() {
assertTrue(OpenEJB.isInitialized());
Re: svn commit: r1233868 - in /openejb/trunk/openejb/osgi: apache-karafee/src/main/filtered-resources/etc/ openejb-karaf-rebranding/ openejb-osgi-tests/ openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/
Posted by David Blevins <da...@gmail.com>.
On Jan 20, 2012, at 3:16 AM, rmannibucau@apache.org wrote:
> Author: rmannibucau
> Date: Fri Jan 20 11:16:20 2012
> New Revision: 1233868
>
> URL: http://svn.apache.org/viewvc?rev=1233868&view=rev
> Log:
> managing karaf upgrade to 2.2.5 and trying to avoid usage of already listening ports
>
> Modified:
> openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties
> openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
> openejb/trunk/openejb/osgi/openejb-karaf-rebranding/pom.xml
> openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml
> openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
There should be an high level OSGi themed JIRA for the overall work, and this commit would be a great place to use it.
-David