Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/carbon/build.sh7
-rw-r--r--bundles/org.eclipse.equinox.executable/library/carbon/build.xml1
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/build.sh21
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/build.xml2
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/build.sh19
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/build.xml1
-rw-r--r--bundles/org.eclipse.equinox.executable/library/photon/build.sh3
-rw-r--r--bundles/org.eclipse.equinox.executable/library/photon/build.xml1
-rw-r--r--bundles/org.eclipse.equinox.executable/library/win32/build.bat3
-rw-r--r--bundles/org.eclipse.equinox.executable/library/win32/build.sh3
-rw-r--r--bundles/org.eclipse.equinox.executable/library/win32/build.xml1
-rw-r--r--bundles/org.eclipse.equinox.executable/library/wpf/build.bat3
-rw-r--r--bundles/org.eclipse.equinox.executable/pom.xml361
-rw-r--r--bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml6
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml3
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java42
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java79
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java41
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java145
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java23
-rw-r--r--bundles/org.eclipse.osgi.util/pom.xml2
-rw-r--r--bundles/org.eclipse.osgi/pom.xml19
-rw-r--r--bundles/org.eclipse.osgi/supplement/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF5
-rw-r--r--bundles/org.eclipse.osgi/supplement/build.properties5
43 files changed, 650 insertions, 206 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/build.sh b/bundles/org.eclipse.equinox.executable/library/carbon/build.sh
index dfd0cde8d..ac923d2ff 100644
--- a/bundles/org.eclipse.equinox.executable/library/carbon/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/carbon/build.sh
@@ -60,9 +60,10 @@ PROGRAM_OUTPUT="$programOutput"
DEFAULT_OS="$defaultOS"
DEFAULT_OS_ARCH="$defaultOSArch"
DEFAULT_WS="$defaultWS"
-PPC_OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/ppc/Eclipse.app/Contents/MacOS"
-X86_OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/x86/Eclipse.app/Contents/MacOS"
-X86_64_OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/x86_64/Eclipse.app/Contents/MacOS"
+EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable
+PPC_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/ppc/Eclipse.app/Contents/MacOS"
+X86_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/x86/Eclipse.app/Contents/MacOS"
+X86_64_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/x86_64/Eclipse.app/Contents/MacOS"
if [ "$DEFAULT_WS" == "cocoa" ]; then
makefile="make_cocoa.mak"
diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/build.xml b/bundles/org.eclipse.equinox.executable/library/carbon/build.xml
index b4308a9a2..990298e64 100644
--- a/bundles/org.eclipse.equinox.executable/library/carbon/build.xml
+++ b/bundles/org.eclipse.equinox.executable/library/carbon/build.xml
@@ -7,7 +7,6 @@
<arg line="${basedir}/build.sh"/>
<arg line="install"/>
</exec>
- <eclipse.refreshLocal resource="platform-launcher" depth="infinite" />
</target>
<target name="clean">
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
index 894ce4a1f..cc4c49a79 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
@@ -35,6 +35,7 @@ programOutput="eclipse"
defaultOS=""
defaultOSArch=""
defaultWS="gtk"
+EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable
defaultJava=DEFAULT_JAVA_JNI
defaultJavaHome=""
javaHome=""
@@ -59,39 +60,39 @@ case $OS in
defaultOSArch="x86_64"
defaultJava=DEFAULT_JAVA_EXEC
[ -d /bluebird/teamswt/swt-builddir/build/JRE/x64/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/x64/jdk1.6.0_14"
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
i?86)
defaultOSArch="x86"
[ -d /bluebird/teamswt/swt-builddir/build/JRE/x32/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/x32/jdk1.6.0_14"
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"ppc")
defaultOSArch="ppc"
defaultJava=DEFAULT_JAVA_EXEC
[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50"
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"ppc64")
defaultOSArch="ppc64"
defaultJava=DEFAULT_JAVA_EXEC
[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"s390")
defaultOSArch="s390"
defaultJava=DEFAULT_JAVA_EXEC
- OUTPUT_DIR="../../contributed/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
;;
"s390x")
defaultOSArch="s390x"
defaultJava=DEFAULT_JAVA_EXEC
- OUTPUT_DIR="../../contributed/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
;;
"ia64")
defaultOSArch="ia64"
defaultJava=DEFAULT_JAVA_EXEC
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
*)
echo "*** Unknown MODEL <${MODEL}>"
@@ -115,7 +116,7 @@ case $OS in
"SunOS")
makefile="make_solaris.mak"
defaultOS="solaris"
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
#PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH
export PATH
@@ -195,8 +196,8 @@ elif [ "$defaultOSArch" = "s390" ]; then
export M_ARCH
fi
-LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
-OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
+OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS DEFAULT_JAVA LIBRARY_DIR
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.xml b/bundles/org.eclipse.equinox.executable/library/gtk/build.xml
index 65a05c0ee..f485479d3 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/build.xml
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.xml
@@ -7,7 +7,6 @@
<arg line="${basedir}/build.sh"/>
<arg line="install"/>
</exec>
- <eclipse.refreshLocal resource="platform-launcher" depth="infinite" />
</target>
<target name="build_eclipse_ppc">
@@ -16,7 +15,6 @@
<arg line="${basedir}/build.sh"/>
<arg line="install"/>
</exec>
- <eclipse.refreshLocal resource="platform-launcher" depth="infinite" />
</target>
<target name="clean">
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/build.sh b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
index 0aa148406..7bc48e7d6 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
@@ -37,9 +37,10 @@ defaultOS=""
defaultOSArch=""
defaultWS="motif"
defaultJava=DEFAULT_JAVA_JNI
+EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable
makefile=""
javaHome=""
-outputRoot="../../bin"
+outputRoot="bin"
if [ "$OS" = "" ]; then
OS=`uname -s`
fi
@@ -54,7 +55,7 @@ case $OS in
defaultOSArch="ppc"
defaultWS="motif"
MOTIF_HOME=/usr
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"Linux")
makefile="make_linux.mak"
@@ -63,13 +64,13 @@ case $OS in
defaultWS="motif"
X11_HOME=/usr/X11R6
MOTIF_HOME=~/motif21
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"SunOS")
# PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH
[ -d /bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14 ] && javaHome="/bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14"
- outputRoot="../../contributed"
+ outputRoot="contributed"
export PATH
makefile="make_solaris.mak"
defaultOS="solaris"
@@ -78,7 +79,7 @@ case $OS in
OS="Solaris"
X11_HOME=/usr/openwin
MOTIF_HOME=/usr/dt
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"HP-UX")
X11_HOME=/usr
@@ -89,7 +90,7 @@ case $OS in
defaultOS="hpux"
defaultOSArch="ia64_32"
defaultWS="motif"
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
javaHome="/opt/java1.5"
defaultJava=DEFAULT_JAVA_EXEC
PATH=/opt/hp-gcc/bin:$PATH
@@ -100,7 +101,7 @@ case $OS in
defaultOS="hpux"
defaultOSArch="PA_RISC"
defaultWS="motif"
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
esac
;;
@@ -141,8 +142,8 @@ DEFAULT_WS="$defaultWS"
JAVA_HOME=$javaHome
DEFAULT_JAVA=$defaultJava
-LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
-OUTPUT_DIR="$outputRoot/$defaultWS/$defaultOS/$defaultOSArch"
+LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
+OUTPUT_DIR="$EXEC_DIR/$outputRoot/$defaultWS/$defaultOS/$defaultOSArch"
export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME JAVA_HOME DEFAULT_JAVA LIBRARY_DIR
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/build.xml b/bundles/org.eclipse.equinox.executable/library/motif/build.xml
index b4308a9a2..990298e64 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/build.xml
+++ b/bundles/org.eclipse.equinox.executable/library/motif/build.xml
@@ -7,7 +7,6 @@
<arg line="${basedir}/build.sh"/>
<arg line="install"/>
</exec>
- <eclipse.refreshLocal resource="platform-launcher" depth="infinite" />
</target>
<target name="clean">
diff --git a/bundles/org.eclipse.equinox.executable/library/photon/build.sh b/bundles/org.eclipse.equinox.executable/library/photon/build.sh
index ea8405923..43ef9b167 100644
--- a/bundles/org.eclipse.equinox.executable/library/photon/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/photon/build.sh
@@ -60,7 +60,8 @@ PROGRAM_OUTPUT="$programOutput"
DEFAULT_OS="$defaultOS"
DEFAULT_OS_ARCH="$defaultOSArch"
DEFAULT_WS="$defaultWS"
-OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable
+OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS
diff --git a/bundles/org.eclipse.equinox.executable/library/photon/build.xml b/bundles/org.eclipse.equinox.executable/library/photon/build.xml
index b4308a9a2..990298e64 100644
--- a/bundles/org.eclipse.equinox.executable/library/photon/build.xml
+++ b/bundles/org.eclipse.equinox.executable/library/photon/build.xml
@@ -7,7 +7,6 @@
<arg line="${basedir}/build.sh"/>
<arg line="install"/>
</exec>
- <eclipse.refreshLocal resource="platform-launcher" depth="infinite" />
</target>
<target name="clean">
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.bat b/bundles/org.eclipse.equinox.executable/library/win32/build.bat
index f64ce1d09..81f5afcd1 100644
--- a/bundles/org.eclipse.equinox.executable/library/win32/build.bat
+++ b/bundles/org.eclipse.equinox.executable/library/win32/build.bat
@@ -134,7 +134,8 @@ set PROGRAM_LIBRARY=%programLibrary%
set DEFAULT_OS=%defaultOS%
set DEFAULT_OS_ARCH=%defaultOSArch%
set DEFAULT_WS=%defaultWS%
-set OUTPUT_DIR=..\..\bin\%defaultWS%\%defaultOS%\%defaultOSArch%
+set EXEC_DIR=..\..\.\..\..\rt.equinox.binaries\org.eclipse.equinox.executable
+set OUTPUT_DIR=%EXEC_DIR%\bin\%defaultWS%\%defaultOS%\%defaultOSArch%
set JAVA_HOME=%javaHome%
rem --------------------------
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.sh b/bundles/org.eclipse.equinox.executable/library/win32/build.sh
index f81f52b00..853eaf4cf 100644
--- a/bundles/org.eclipse.equinox.executable/library/win32/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/win32/build.sh
@@ -58,7 +58,8 @@ PROGRAM_OUTPUT="$programOutput"
DEFAULT_OS="$defaultOS"
DEFAULT_OS_ARCH="$defaultOSArch"
DEFAULT_WS="$defaultWS"
-OUTPUT_DIR=../../bin/$defaultWS/$defaultOS/$defaultOSArch
+EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable
+OUTPUT_DIR=$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch
export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/build.xml b/bundles/org.eclipse.equinox.executable/library/win32/build.xml
index a5a99abbd..056b85926 100644
--- a/bundles/org.eclipse.equinox.executable/library/win32/build.xml
+++ b/bundles/org.eclipse.equinox.executable/library/win32/build.xml
@@ -6,7 +6,6 @@
<exec dir="." executable="${basedir}\build.bat">
<arg line="install"/>
</exec>
- <eclipse.refreshLocal resource="platform-launcher" depth="infinite" />
</target>
<target name="clean">
diff --git a/bundles/org.eclipse.equinox.executable/library/wpf/build.bat b/bundles/org.eclipse.equinox.executable/library/wpf/build.bat
index 5a2611d14..57e1d7525 100644
--- a/bundles/org.eclipse.equinox.executable/library/wpf/build.bat
+++ b/bundles/org.eclipse.equinox.executable/library/wpf/build.bat
@@ -105,7 +105,8 @@ set PROGRAM_LIBRARY=%programLibrary%
set DEFAULT_OS=%defaultOS%
set DEFAULT_OS_ARCH=%defaultOSArch%
set DEFAULT_WS=%defaultWS%
-set OUTPUT_DIR=..\..\bin\%defaultWS%\%defaultOS%\%defaultOSArch%
+set EXEC_DIR=..\..\.\..\..\rt.equinox.binaries\org.eclipse.equinox.executable
+set OUTPUT_DIR=%EXEC_DIR%\bin\%defaultWS%\%defaultOS%\%defaultOSArch%
set JAVA_HOME=%javaHome%
rem --------------------------
diff --git a/bundles/org.eclipse.equinox.executable/pom.xml b/bundles/org.eclipse.equinox.executable/pom.xml
index 5ac0e1824..c30a13647 100644
--- a/bundles/org.eclipse.equinox.executable/pom.xml
+++ b/bundles/org.eclipse.equinox.executable/pom.xml
@@ -25,16 +25,355 @@
<version>3.6.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <allowConflictingDependencies>true</allowConflictingDependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>build-native-launchers-gtk.linux.x86_64</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>gtk.linux.x86_64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.x86</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>gtk.linux.x86</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-win32.win32.x86_64</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>win32.win32.x86_64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/win32/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-win32.win32.x86</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>win32.win32.x86</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/win32/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-cocoa.macosx.x86_64</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>cocoa.macosx.x86_64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/carbon/" target="build_eclipse_cbi" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>assemble-launchers</id>
+ <activation>
+ <property>
+ <!-- workaround. activeByDefault is disabled when another profile is
+ selected. -->
+ <name>!longnotexistingproperty</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <executions>
+ <execution>
+ <id>copy-executable-natives</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <!-- We need to get binary bits from binary repo -->
+ <!-- If local binaries had been built, copy will not overwrite
+ them -->
+ <copy todir="bin">
+ <fileset
+ dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ <!-- Things below were copied from custombuildCallbacks.xml, as
+ Tycho does not support that -->
+ <copy includeEmptyDirs="false" todir="tempBin">
+ <fileset dir="bin" />
+ </copy>
+ <delete dir="bin" />
+ <move todir="bin">
+ <fileset dir="tempBin" />
+ </move>
+
+ <!-- rename eclipse launchers to "launcher" -->
+ <move todir="bin" verbose="true">
+ <fileset dir="bin" />
+ <regexpmapper from="^(.*[/\\])eclipse(.exe)?$"
+ to="\1launcher\2" />
+ </move>
+ <move todir="contributed" verbose="true">
+ <fileset dir="contributed" />
+ <regexpmapper from="^(.*[/\\])eclipse(.exe)?$"
+ to="\1launcher\2" />
+ </move>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
index d90abfb25..06dc606d6 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
@@ -26,6 +26,9 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
index 0e0ee1421..bfe4eb2bb 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>aix</os>
+ <ws>gtk</ws>
+ <arch>ppc</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
index aa5dfaadf..92e1d9d2f 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>aix</os>
+ <ws>gtk</ws>
+ <arch>ppc64</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
index fe0eddd4c..f2fd40d10 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
@@ -27,6 +27,9 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>hpux</os>
+ <ws>gtk</ws>
+ <arch>ia64_32</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
index 22d93d526..facdf70fa 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
@@ -26,5 +26,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>ppc</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
index 137ff6a0a..8e606f993 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>ppc64</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
index 894b04c21..8e70c9ff3 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
@@ -23,4 +23,10 @@
<artifactId>org.eclipse.equinox.launcher.gtk.linux.s390</artifactId>
<version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <properties>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>s390</arch>
+ </properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
index e7fa090cb..e88b5e80b 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
@@ -23,4 +23,10 @@
<artifactId>org.eclipse.equinox.launcher.gtk.linux.s390x</artifactId>
<version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <properties>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>s390x</arch>
+ </properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
index fdd83c008..65d08f35c 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
index b16654b08..020a15682 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
index dbde21248..9de9fe4a0 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>solaris</os>
+ <ws>gtk</ws>
+ <arch>sparc</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
index e8c92e711..c8e546e5b 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>solaris</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
index 19d1a72fa..19b7fab31 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
@@ -26,6 +26,9 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>aix</os>
+ <ws>motif</ws>
+ <arch>ppc</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
index 0c8bdb17d..dadb632b9 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
@@ -27,6 +27,9 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>hpux</os>
+ <ws>motif</ws>
+ <arch>ia64_32</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
index 92d46b6cc..c81f4eb0e 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>linux</os>
+ <ws>motif</ws>
+ <arch>x86</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
index df3022715..91fa28f2b 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
+ <os>solaris</os>
+ <ws>motif</ws>
+ <arch>sparc</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
index 8dca23728..1f6fea1e1 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
@@ -27,5 +27,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
<launcher-binary.ext>dll</launcher-binary.ext>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>ia64</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
index 94d5e4fe9..2e92534b6 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
@@ -28,5 +28,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
<launcher-binary.ext>dll</launcher-binary.ext>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
index 3666980cd..e0fdfbb31 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
@@ -28,5 +28,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
<launcher-binary.ext>dll</launcher-binary.ext>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
index 8bf65d1a6..d3cd8055a 100644
--- a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
@@ -28,5 +28,8 @@
<properties>
<launcher-binary.version>1500</launcher-binary.version>
<launcher-binary.ext>dll</launcher-binary.ext>
+ <os>win32</os>
+ <ws>wpf</ws>
+ <arch>x86</arch>
</properties>
</project>
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
index 8d22ab768..cf12bdd80 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Cognos Incorporated, IBM Corporation and others
+ * Copyright (c) 2012 Cognos Incorporated, IBM Corporation and others
* All rights reserved. This program and the accompanying materials are made
* available under the terms of the Eclipse Public License v1.0 which
* accompanies this distribution, and is available at
@@ -49,9 +49,9 @@ public class ExtendedLogReaderServiceTest extends TestCase {
});
synchronized (listener) {
log.log(LogService.LOG_INFO, "info");
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
public void testaddNullFilterr() throws Exception {
@@ -83,9 +83,9 @@ public class ExtendedLogReaderServiceTest extends TestCase {
});
synchronized (listener) {
log.log(LogService.LOG_INFO, "info");
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
public void testaddNullListener() throws Exception {
@@ -131,27 +131,29 @@ public class ExtendedLogReaderServiceTest extends TestCase {
long threadId = getCurrentThreadId();
synchronized (listener) {
log.getLogger("test").log(logReference, LogService.LOG_INFO, "info", new Throwable("test"));
- listener.wait();
+ listener.waitForLogEntry();
}
- long sequenceNumberBefore = listener.getEntryX().getSequenceNumber();
+ ExtendedLogEntry entry = listener.getEntryX();
+ long sequenceNumberBefore = entry.getSequenceNumber();
synchronized (listener) {
log.getLogger("test").log(logReference, LogService.LOG_INFO, "info", new Throwable("test"));
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntryX().getBundle() == OSGiTestsActivator.getContext().getBundle());
- assertTrue(listener.getEntryX().getMessage().equals("info"));
- assertTrue(listener.getEntryX().getException().getMessage().equals("test"));
- assertTrue(listener.getEntryX().getServiceReference() == logReference);
- assertTrue(listener.getEntryX().getTime() >= timeBeforeLog);
- assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
-
- assertTrue(listener.getEntryX().getLoggerName().equals("test"));
- assertTrue(listener.getEntryX().getThreadName().equals(threadName));
+ entry = listener.getEntryX();
+ assertTrue(entry.getBundle() == OSGiTestsActivator.getContext().getBundle());
+ assertTrue(entry.getMessage().equals("info"));
+ assertTrue(entry.getException().getMessage().equals("test"));
+ assertTrue(entry.getServiceReference() == logReference);
+ assertTrue(entry.getTime() >= timeBeforeLog);
+ assertTrue(entry.getLevel() == LogService.LOG_INFO);
+
+ assertTrue(entry.getLoggerName().equals("test"));
+ assertTrue(entry.getThreadName().equals(threadName));
if (threadId >= 0)
- assertTrue(listener.getEntryX().getThreadId() == threadId);
- assertTrue(listener.getEntryX().getContext() == logReference);
- assertTrue(listener.getEntryX().getSequenceNumber() > sequenceNumberBefore);
+ assertTrue(entry.getThreadId() == threadId);
+ assertTrue(entry.getContext() == logReference);
+ assertTrue(entry.getSequenceNumber() > sequenceNumberBefore);
}
private long getCurrentThreadId() {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
index 6683e53af..1eb988ce5 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation and others All rights reserved. This
+ * Copyright (c) 2007, 2012 IBM Corporation and others All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -49,7 +49,7 @@ public class ExtendedLogServiceTest extends TestCase {
public void testLogContext() throws Exception {
synchronized (listener) {
log.log(this, LogService.LOG_INFO, null);
- listener.wait();
+ listener.waitForLogEntry();
}
assertTrue(listener.getEntryX().getContext() == this);
}
@@ -57,7 +57,7 @@ public class ExtendedLogServiceTest extends TestCase {
public void testNullLogContext() throws Exception {
synchronized (listener) {
log.log(null, LogService.LOG_INFO, null);
- listener.wait();
+ listener.waitForLogEntry();
}
assertTrue(listener.getEntryX().getContext() == null);
}
@@ -65,7 +65,7 @@ public class ExtendedLogServiceTest extends TestCase {
public void testLogContextWithNullThrowable() throws Exception {
synchronized (listener) {
log.log(this, LogService.LOG_INFO, null, null);
- listener.wait();
+ listener.waitForLogEntry();
}
assertTrue(listener.getEntryX().getContext() == this);
}
@@ -95,25 +95,27 @@ public class ExtendedLogServiceTest extends TestCase {
public void testNamedLoggerLogNull() throws Exception {
synchronized (listener) {
log.getLogger("test").log(null, 0, null, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntryX().getLoggerName() == "test");
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
+ ExtendedLogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLoggerName() == "test");
+ assertTrue(entry.getLevel() == 0);
+ assertTrue(entry.getMessage() == null);
+ assertTrue(entry.getException() == null);
+ assertTrue(entry.getServiceReference() == null);
}
public void testNullLoggerLogNull() throws Exception {
synchronized (listener) {
log.getLogger(null).log(null, 0, null, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntryX().getLoggerName() == null);
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
+ ExtendedLogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLoggerName() == null);
+ assertTrue(entry.getLevel() == 0);
+ assertTrue(entry.getMessage() == null);
+ assertTrue(entry.getException() == null);
+ assertTrue(entry.getServiceReference() == null);
}
public void testNamedLoggerLogFull() throws Exception {
@@ -121,14 +123,15 @@ public class ExtendedLogServiceTest extends TestCase {
Throwable t = new Throwable("test");
synchronized (listener) {
log.getLogger("test").log(logReference, LogService.LOG_INFO, message, t);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntryX().getLoggerName() == "test");
- assertTrue(listener.getEntry().getBundle() == bundle);
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == logReference);
+ ExtendedLogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLoggerName() == "test");
+ assertTrue(entry.getBundle() == bundle);
+ assertTrue(entry.getLevel() == LogService.LOG_INFO);
+ assertTrue(entry.getMessage().equals(message));
+ assertTrue(entry.getException().getMessage().equals(t.getMessage()));
+ assertTrue(entry.getServiceReference() == logReference);
}
public void testNamedLoggerLogFullWithNullBundle() throws Exception {
@@ -136,14 +139,15 @@ public class ExtendedLogServiceTest extends TestCase {
Throwable t = new Throwable("test");
synchronized (listener) {
log.getLogger(null, "test").log(logReference, LogService.LOG_INFO, message, t);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntryX().getLoggerName() == "test");
- assertTrue(listener.getEntry().getBundle() == bundle);
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == logReference);
+ ExtendedLogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLoggerName() == "test");
+ assertTrue(entry.getBundle() == bundle);
+ assertTrue(entry.getLevel() == LogService.LOG_INFO);
+ assertTrue(entry.getMessage().equals(message));
+ assertTrue(entry.getException().getMessage().equals(t.getMessage()));
+ assertTrue(entry.getServiceReference() == logReference);
}
public void testNamedLoggerLogFullWithBundle() throws Exception {
@@ -151,14 +155,15 @@ public class ExtendedLogServiceTest extends TestCase {
Throwable t = new Throwable("test");
synchronized (listener) {
log.getLogger(bundle, "test").log(logReference, LogService.LOG_INFO, message, t);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntryX().getLoggerName() == "test");
- assertTrue(listener.getEntry().getBundle() == bundle);
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == logReference);
+ ExtendedLogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLoggerName() == "test");
+ assertTrue(entry.getBundle() == bundle);
+ assertTrue(entry.getLevel() == LogService.LOG_INFO);
+ assertTrue(entry.getMessage().equals(message));
+ assertTrue(entry.getException().getMessage().equals(t.getMessage()));
+ assertTrue(entry.getServiceReference() == logReference);
}
public void testLoggerIsLoggableTrue() throws Exception {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
index a7c2e6a9e..563a8b859 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others All rights reserved. This
+ * Copyright (c) 2007, 2012 IBM Corporation and others All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -45,9 +45,9 @@ public class LogReaderServiceTest extends AbstractBundleTests {
reader.addLogListener(listener);
synchronized (listener) {
log.log(LogService.LOG_INFO, "info"); //$NON-NLS-1$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
public void testaddListenerTwice() throws Exception {
@@ -56,9 +56,9 @@ public class LogReaderServiceTest extends AbstractBundleTests {
reader.addLogListener(listener);
synchronized (listener) {
log.log(LogService.LOG_INFO, "info"); //$NON-NLS-1$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
public void testaddNullListener() throws Exception {
@@ -91,14 +91,15 @@ public class LogReaderServiceTest extends AbstractBundleTests {
long timeBeforeLog = System.currentTimeMillis();
synchronized (listener) {
log.log(logReference, LogService.LOG_INFO, "info", new Throwable("test")); //$NON-NLS-1$ //$NON-NLS-2$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getBundle() == OSGiTestsActivator.getContext().getBundle());
- assertTrue(listener.getEntry().getMessage().equals("info")); //$NON-NLS-1$
- assertTrue(listener.getEntry().getException().getMessage().equals("test")); //$NON-NLS-1$
- assertTrue(listener.getEntry().getServiceReference() == logReference);
- assertTrue(listener.getEntry().getTime() >= timeBeforeLog);
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
+ LogEntry entry = listener.getEntryX();
+ assertTrue(entry.getBundle() == OSGiTestsActivator.getContext().getBundle());
+ assertTrue(entry.getMessage().equals("info")); //$NON-NLS-1$
+ assertTrue(entry.getException().getMessage().equals("test")); //$NON-NLS-1$
+ assertTrue(entry.getServiceReference() == logReference);
+ assertTrue(entry.getTime() >= timeBeforeLog);
+ assertTrue(entry.getLevel() == LogService.LOG_INFO);
}
public void testLogBundleEventInfo() throws Exception {
@@ -109,9 +110,9 @@ public class LogReaderServiceTest extends AbstractBundleTests {
reader.addLogListener(listener);
synchronized (listener) {
testBundle.start();
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
public void testLogServiceEventInfo() throws Exception {
@@ -119,9 +120,9 @@ public class LogReaderServiceTest extends AbstractBundleTests {
reader.addLogListener(listener);
synchronized (listener) {
OSGiTestsActivator.getContext().registerService(Object.class.getName(), new Object(), null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
public void testLogServiceEventDebug() throws Exception {
@@ -131,9 +132,9 @@ public class LogReaderServiceTest extends AbstractBundleTests {
reader.addLogListener(listener);
synchronized (listener) {
registration.setProperties(new Hashtable());
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_DEBUG);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_DEBUG);
}
public void testLogFrameworkEvent() throws Exception {
@@ -142,8 +143,8 @@ public class LogReaderServiceTest extends AbstractBundleTests {
reader.addLogListener(listener);
synchronized (listener) {
installer.refreshPackages(new Bundle[] {testBundle});
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java
index 2d774fbb3..12bb09608 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation and others All rights reserved. This
+ * Copyright (c) 2007, 2012 IBM Corporation and others All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,8 +11,7 @@ package org.eclipse.equinox.log.test;
import junit.framework.TestCase;
import org.eclipse.osgi.tests.OSGiTestsActivator;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogReaderService;
-import org.osgi.service.log.LogService;
+import org.osgi.service.log.*;
public class LogServiceTest extends TestCase {
@@ -46,162 +45,167 @@ public class LogServiceTest extends TestCase {
public void testLogDebug() throws Exception {
synchronized (listener) {
log.log(LogService.LOG_DEBUG, "debug"); //$NON-NLS-1$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_DEBUG);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_DEBUG);
}
public void testLogError() throws Exception {
synchronized (listener) {
log.log(LogService.LOG_ERROR, "error"); //$NON-NLS-1$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_ERROR);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_ERROR);
}
public void testLogInfo() throws Exception {
synchronized (listener) {
log.log(LogService.LOG_INFO, "info"); //$NON-NLS-1$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
public void testLogWarning() throws Exception {
synchronized (listener) {
log.log(LogService.LOG_WARNING, "warning"); //$NON-NLS-1$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_WARNING);
+ assertTrue(listener.getEntryX().getLevel() == LogService.LOG_WARNING);
}
public void testLogZeroLevel() throws Exception {
synchronized (listener) {
log.log(0, "zero"); //$NON-NLS-1$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == 0);
+ assertTrue(listener.getEntryX().getLevel() == 0);
}
public void testLogNegativeLevel() throws Exception {
synchronized (listener) {
log.log(-1, "negative"); //$NON-NLS-1$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == -1);
+ assertTrue(listener.getEntryX().getLevel() == -1);
}
public void testLogMessage() throws Exception {
synchronized (listener) {
log.log(LogService.LOG_INFO, "message"); //$NON-NLS-1$
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getMessage().equals("message")); //$NON-NLS-1$
+ assertTrue(listener.getEntryX().getMessage().equals("message")); //$NON-NLS-1$
}
public void testLogNullMessage() throws Exception {
synchronized (listener) {
log.log(LogService.LOG_INFO, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getMessage() == null);
+ assertTrue(listener.getEntryX().getMessage() == null);
}
public void testLogThrowable() throws Exception {
Throwable t = new Throwable("throwable"); //$NON-NLS-1$
synchronized (listener) {
log.log(LogService.LOG_INFO, null, t);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
+ assertTrue(listener.getEntryX().getException().getMessage().equals(t.getMessage()));
}
public void testLogNullThrowable() throws Exception {
synchronized (listener) {
log.log(LogService.LOG_INFO, null, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getException() == null);
+ assertTrue(listener.getEntryX().getException() == null);
}
public void testLogServiceReference() throws Exception {
synchronized (listener) {
log.log(logReference, LogService.LOG_INFO, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getServiceReference().equals(logReference));
+ assertTrue(listener.getEntryX().getServiceReference().equals(logReference));
}
public void testNullLogServiceReference() throws Exception {
synchronized (listener) {
log.log(null, LogService.LOG_INFO, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getServiceReference() == null);
+ assertTrue(listener.getEntryX().getServiceReference() == null);
}
public void testLogServiceReferenceWithNullThrowable() throws Exception {
synchronized (listener) {
log.log(logReference, LogService.LOG_INFO, null, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getServiceReference().equals(logReference));
+ assertTrue(listener.getEntryX().getServiceReference().equals(logReference));
}
public void testLogNull1() throws Exception {
synchronized (listener) {
log.log(0, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
+ LogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLevel() == 0);
+ assertTrue(entry.getMessage() == null);
+ assertTrue(entry.getException() == null);
+ assertTrue(entry.getServiceReference() == null);
}
public void testLogNull2() throws Exception {
synchronized (listener) {
log.log(0, null, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
+ LogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLevel() == 0);
+ assertTrue(entry.getMessage() == null);
+ assertTrue(entry.getException() == null);
+ assertTrue(entry.getServiceReference() == null);
}
public void testLogNull3() throws Exception {
synchronized (listener) {
log.log(null, 0, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
+ LogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLevel() == 0);
+ assertTrue(entry.getMessage() == null);
+ assertTrue(entry.getException() == null);
+ assertTrue(entry.getServiceReference() == null);
}
public void testLogNull4() throws Exception {
synchronized (listener) {
log.log(null, 0, null, null);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
+ LogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLevel() == 0);
+ assertTrue(entry.getMessage() == null);
+ assertTrue(entry.getException() == null);
+ assertTrue(entry.getServiceReference() == null);
}
public void testLogFull1() throws Exception {
String message = "test"; //$NON-NLS-1$
synchronized (listener) {
log.log(LogService.LOG_INFO, message);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
+ LogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLevel() == LogService.LOG_INFO);
+ assertTrue(entry.getMessage().equals(message));
+ assertTrue(entry.getException() == null);
+ assertTrue(entry.getServiceReference() == null);
}
public void testLogFull2() throws Exception {
@@ -209,24 +213,26 @@ public class LogServiceTest extends TestCase {
Throwable t = new Throwable("test"); //$NON-NLS-1$
synchronized (listener) {
log.log(LogService.LOG_INFO, message, t);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == null);
+ LogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLevel() == LogService.LOG_INFO);
+ assertTrue(entry.getMessage().equals(message));
+ assertTrue(entry.getException().getMessage().equals(t.getMessage()));
+ assertTrue(entry.getServiceReference() == null);
}
public void testLogFull3() throws Exception {
String message = "test"; //$NON-NLS-1$
synchronized (listener) {
log.log(logReference, LogService.LOG_INFO, message);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == logReference);
+ LogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLevel() == LogService.LOG_INFO);
+ assertTrue(entry.getMessage().equals(message));
+ assertTrue(entry.getException() == null);
+ assertTrue(entry.getServiceReference() == logReference);
}
public void testLogFull4() throws Exception {
@@ -234,11 +240,12 @@ public class LogServiceTest extends TestCase {
Throwable t = new Throwable("test"); //$NON-NLS-1$
synchronized (listener) {
log.log(logReference, LogService.LOG_INFO, message, t);
- listener.wait();
+ listener.waitForLogEntry();
}
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == logReference);
+ LogEntry entry = listener.getEntryX();
+ assertTrue(entry.getLevel() == LogService.LOG_INFO);
+ assertTrue(entry.getMessage().equals(message));
+ assertTrue(entry.getException().getMessage().equals(t.getMessage()));
+ assertTrue(entry.getServiceReference() == logReference);
}
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java
index e54a9db53..e176c7c3b 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener.java
@@ -1,11 +1,12 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation All rights reserved. This program
+ * Copyright (c) 2007, 2012 IBM Corporation All rights reserved. This program
* and the accompanying materials are made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.eclipse.equinox.log.test;
+import junit.framework.Assert;
import org.eclipse.equinox.log.ExtendedLogEntry;
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogListener;
@@ -20,11 +21,23 @@ class TestListener implements LogListener {
notifyAll();
}
- public synchronized LogEntry getEntry() {
- return entry;
+ public synchronized ExtendedLogEntry getEntryX() {
+ ExtendedLogEntry current = (ExtendedLogEntry) entry;
+ entry = null;
+ return current;
}
- public synchronized ExtendedLogEntry getEntryX() {
- return (ExtendedLogEntry) entry;
+ public void waitForLogEntry() throws InterruptedException {
+ synchronized (this) {
+ long timeToWait = 20000;
+ long startTime = System.currentTimeMillis();
+ while (this.entry == null && timeToWait > 0) {
+ this.wait(timeToWait);
+ timeToWait = timeToWait - (System.currentTimeMillis() - startTime);
+ }
+ if (this.entry == null) {
+ Assert.fail("No log entry logged.");
+ }
+ }
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.util/pom.xml b/bundles/org.eclipse.osgi.util/pom.xml
index 4a15a4b71..4d46d53eb 100644
--- a/bundles/org.eclipse.osgi.util/pom.xml
+++ b/bundles/org.eclipse.osgi.util/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>org.eclipse.equinox.framework</groupId>
<artifactId>org.eclipse.osgi.util</artifactId>
- <version>3.2.33300-SNAPSHOT</version>
+ <version>3.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index c46d8fa9d..6312f97c9 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -22,6 +22,23 @@
</parent>
<groupId>org.eclipse.equinox.framework</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>3.8.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>jsr14</target>
+ <compilerArguments>
+ <inlineJSR/>
+ <enableJavadoc/>
+ <encoding>ISO-8859-1</encoding>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.osgi/supplement/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.osgi/supplement/.settings/org.eclipse.jdt.core.prefs
index 96f55a769..449cf187f 100644
--- a/bundles/org.eclipse.osgi/supplement/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.osgi/supplement/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Thu Sep 02 15:43:37 CDT 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -8,7 +7,7 @@ org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
diff --git a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
index 30133207b..6ae846519 100644
--- a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.supplement
-Bundle-Version: 1.4.100.qualifier
+Bundle-Version: 1.5.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.equinox.log;version="1.0",
@@ -21,8 +21,7 @@ Export-Package: org.eclipse.equinox.log;version="1.0",
org.eclipse.osgi.framework.internal.core;x-internal:=true,
org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true,
org.eclipse.core.runtime.internal.adaptor;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,
- OSGi/Minimum-1.2
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.osgi.framework,
org.osgi.service.log,
org.osgi.util.tracker,
diff --git a/bundles/org.eclipse.osgi/supplement/build.properties b/bundles/org.eclipse.osgi/supplement/build.properties
index 1f31e3624..86dd55177 100644
--- a/bundles/org.eclipse.osgi/supplement/build.properties
+++ b/bundles/org.eclipse.osgi/supplement/build.properties
@@ -17,9 +17,4 @@ bin.includes = META-INF/,\
about.html
src.includes = about.html
-jre.compilation.profile = J2SE-1.5
-
-javacSource=1.5
-javacTarget=jsr14
-
javacWarnings..=-deadCode,-raw,-unchecked

Back to the top