Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Renamed namespace "org.eclipse.smarthome" to "org.openhab.core" #1294

Merged
merged 3 commits into from
Dec 28, 2019
Merged

Renamed namespace "org.eclipse.smarthome" to "org.openhab.core" #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a32c974
Moved files to new location
cweitkamp Dec 27, 2019
1966a72
Renamed packages
cweitkamp Dec 27, 2019
6e5fe9b
Changes in ScriptImportSectionNamespaceScopeProvider
cweitkamp Dec 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .../smarthome/core/audio/AudioException.java → ...rg/openhab/core/audio/AudioException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...pse/smarthome/core/audio/AudioFormat.java → ...a/org/openhab/core/audio/AudioFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import java.util.Set;

Expand Down
4 changes: 2 additions & 2 deletions ...smarthome/core/audio/AudioHTTPServer.java → ...g/openhab/core/audio/AudioHTTPServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.smarthome.core.audio.internal.AudioServlet;
import org.openhab.core.audio.internal.AudioServlet;

/**
* This is an interface that is implemented by {@link AudioServlet} and which allows exposing audio streams through
Expand Down
4 changes: 2 additions & 2 deletions ...se/smarthome/core/audio/AudioManager.java → .../org/openhab/core/audio/AudioManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import java.io.IOException;
import java.util.Set;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.core.library.types.PercentType;
import org.openhab.core.library.types.PercentType;

/**
* This service provides functionality around audio services and is the central service to be used directly by others.
Expand Down
4 changes: 2 additions & 2 deletions ...lipse/smarthome/core/audio/AudioSink.java → ...ava/org/openhab/core/audio/AudioSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import java.io.IOException;
import java.util.Locale;
import java.util.Set;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.core.library.types.PercentType;
import org.openhab.core.library.types.PercentType;

/**
* Definition of an audio output like headphones, a speaker or for writing to
Expand Down
2 changes: 1 addition & 1 deletion ...pse/smarthome/core/audio/AudioSource.java → ...a/org/openhab/core/audio/AudioSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import java.util.Locale;
import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion ...pse/smarthome/core/audio/AudioStream.java → ...a/org/openhab/core/audio/AudioStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import java.io.InputStream;

Expand Down
2 changes: 1 addition & 1 deletion ...home/core/audio/ByteArrayAudioStream.java → ...nhab/core/audio/ByteArrayAudioStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions ...smarthome/core/audio/FileAudioStream.java → ...g/openhab/core/audio/FileAudioStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import java.io.File;
import java.io.FileInputStream;
Expand All @@ -20,7 +20,7 @@

import org.apache.commons.io.IOUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.smarthome.core.audio.utils.AudioStreamUtils;
import org.openhab.core.audio.utils.AudioStreamUtils;

/**
* This is an AudioStream from an audio file
Expand Down
2 changes: 1 addition & 1 deletion ...me/core/audio/FixedLengthAudioStream.java → ...ab/core/audio/FixedLengthAudioStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import java.io.InputStream;

Expand Down
4 changes: 2 additions & 2 deletions .../smarthome/core/audio/URLAudioStream.java → ...rg/openhab/core/audio/URLAudioStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -25,7 +25,7 @@
import org.apache.commons.io.IOUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.core.audio.utils.AudioStreamUtils;
import org.openhab.core.audio.utils.AudioStreamUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...udio/UnsupportedAudioFormatException.java → ...udio/UnsupportedAudioFormatException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...udio/UnsupportedAudioStreamException.java → ...udio/UnsupportedAudioStreamException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio;
package org.openhab.core.audio;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
Expand Down
20 changes: 10 additions & 10 deletions ...nternal/AudioConsoleCommandExtension.java → ...nternal/AudioConsoleCommandExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio.internal;
package org.openhab.core.audio.internal;

import static java.util.Comparator.comparing;

Expand All @@ -22,15 +22,15 @@
import org.apache.commons.lang.ArrayUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.core.audio.AudioException;
import org.eclipse.smarthome.core.audio.AudioManager;
import org.eclipse.smarthome.core.audio.AudioSink;
import org.eclipse.smarthome.core.audio.AudioSource;
import org.eclipse.smarthome.core.i18n.LocaleProvider;
import org.eclipse.smarthome.core.library.types.PercentType;
import org.eclipse.smarthome.io.console.Console;
import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
import org.openhab.core.audio.AudioException;
import org.openhab.core.audio.AudioManager;
import org.openhab.core.audio.AudioSink;
import org.openhab.core.audio.AudioSource;
import org.openhab.core.i18n.LocaleProvider;
import org.openhab.core.library.types.PercentType;
import org.openhab.core.io.console.Console;
import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down
34 changes: 17 additions & 17 deletions ...core/audio/internal/AudioManagerImpl.java → ...core/audio/internal/AudioManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio.internal;
package org.openhab.core.audio.internal;

import static java.util.Comparator.comparing;
import static java.util.stream.Collectors.toList;
Expand All @@ -28,20 +28,20 @@

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.config.core.ConfigConstants;
import org.eclipse.smarthome.config.core.ConfigOptionProvider;
import org.eclipse.smarthome.config.core.ConfigurableService;
import org.eclipse.smarthome.config.core.ParameterOption;
import org.eclipse.smarthome.core.audio.AudioException;
import org.eclipse.smarthome.core.audio.AudioManager;
import org.eclipse.smarthome.core.audio.AudioSink;
import org.eclipse.smarthome.core.audio.AudioSource;
import org.eclipse.smarthome.core.audio.AudioStream;
import org.eclipse.smarthome.core.audio.FileAudioStream;
import org.eclipse.smarthome.core.audio.URLAudioStream;
import org.eclipse.smarthome.core.audio.UnsupportedAudioFormatException;
import org.eclipse.smarthome.core.audio.UnsupportedAudioStreamException;
import org.eclipse.smarthome.core.library.types.PercentType;
import org.openhab.core.config.core.ConfigConstants;
import org.openhab.core.config.core.ConfigOptionProvider;
import org.openhab.core.config.core.ConfigurableService;
import org.openhab.core.config.core.ParameterOption;
import org.openhab.core.audio.AudioException;
import org.openhab.core.audio.AudioManager;
import org.openhab.core.audio.AudioSink;
import org.openhab.core.audio.AudioSource;
import org.openhab.core.audio.AudioStream;
import org.openhab.core.audio.FileAudioStream;
import org.openhab.core.audio.URLAudioStream;
import org.openhab.core.audio.UnsupportedAudioFormatException;
import org.openhab.core.audio.UnsupportedAudioStreamException;
import org.openhab.core.library.types.PercentType;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
Expand All @@ -63,8 +63,8 @@
* @author Wouter Born - Sort audio sink and source options
*/
@NonNullByDefault
@Component(immediate = true, configurationPid = "org.eclipse.smarthome.audio", property = { //
Constants.SERVICE_PID + "=org.eclipse.smarthome.audio", //
@Component(immediate = true, configurationPid = "org.openhab.core.audio", property = { //
Constants.SERVICE_PID + "=org.openhab.core.audio", //
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", //
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + AudioManagerImpl.CONFIG_URI, //
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Audio" //
Expand Down
14 changes: 7 additions & 7 deletions ...ome/core/audio/internal/AudioServlet.java → ...hab/core/audio/internal/AudioServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio.internal;
package org.openhab.core.audio.internal;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -31,12 +31,12 @@
import org.apache.commons.lang.StringUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.smarthome.core.audio.AudioException;
import org.eclipse.smarthome.core.audio.AudioFormat;
import org.eclipse.smarthome.core.audio.AudioHTTPServer;
import org.eclipse.smarthome.core.audio.AudioStream;
import org.eclipse.smarthome.core.audio.FixedLengthAudioStream;
import org.eclipse.smarthome.io.http.servlet.SmartHomeServlet;
import org.openhab.core.audio.AudioException;
import org.openhab.core.audio.AudioFormat;
import org.openhab.core.audio.AudioHTTPServer;
import org.openhab.core.audio.AudioStream;
import org.openhab.core.audio.FixedLengthAudioStream;
import org.openhab.core.io.http.servlet.SmartHomeServlet;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
Expand Down
2 changes: 1 addition & 1 deletion ...me/core/audio/utils/AudioStreamUtils.java → ...ab/core/audio/utils/AudioStreamUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio.utils;
package org.openhab.core.audio.utils;

import org.eclipse.jdt.annotation.NonNullByDefault;

Expand Down
16 changes: 8 additions & 8 deletions ...io/internal/AbstractAudioServletTest.java → ...io/internal/AbstractAudioServletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio.internal;
package org.openhab.core.audio.internal;

import static org.junit.Assert.fail;

Expand All @@ -21,13 +21,13 @@
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.smarthome.core.audio.AudioFormat;
import org.eclipse.smarthome.core.audio.AudioStream;
import org.eclipse.smarthome.core.audio.ByteArrayAudioStream;
import org.eclipse.smarthome.core.audio.FixedLengthAudioStream;
import org.eclipse.smarthome.test.TestPortUtil;
import org.eclipse.smarthome.test.TestServer;
import org.eclipse.smarthome.test.java.JavaTest;
import org.openhab.core.audio.AudioFormat;
import org.openhab.core.audio.AudioStream;
import org.openhab.core.audio.ByteArrayAudioStream;
import org.openhab.core.audio.FixedLengthAudioStream;
import org.openhab.core.test.TestPortUtil;
import org.openhab.core.test.TestServer;
import org.openhab.core.test.java.JavaTest;
import org.junit.After;
import org.junit.Before;

Expand Down
22 changes: 11 additions & 11 deletions ...core/audio/internal/AudioConsoleTest.java → ...core/audio/internal/AudioConsoleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio.internal;
package org.openhab.core.audio.internal;

import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
Expand All @@ -20,16 +20,16 @@
import java.io.IOException;
import java.util.Locale;

import org.eclipse.smarthome.core.audio.AudioException;
import org.eclipse.smarthome.core.audio.AudioFormat;
import org.eclipse.smarthome.core.audio.AudioSource;
import org.eclipse.smarthome.core.audio.AudioStream;
import org.eclipse.smarthome.core.audio.FileAudioStream;
import org.eclipse.smarthome.core.audio.URLAudioStream;
import org.eclipse.smarthome.core.audio.internal.fake.AudioSinkFake;
import org.eclipse.smarthome.core.audio.internal.utils.BundledSoundFileHandler;
import org.eclipse.smarthome.core.i18n.LocaleProvider;
import org.eclipse.smarthome.io.console.Console;
import org.openhab.core.audio.AudioException;
import org.openhab.core.audio.AudioFormat;
import org.openhab.core.audio.AudioSource;
import org.openhab.core.audio.AudioStream;
import org.openhab.core.audio.FileAudioStream;
import org.openhab.core.audio.URLAudioStream;
import org.openhab.core.audio.internal.fake.AudioSinkFake;
import org.openhab.core.audio.internal.utils.BundledSoundFileHandler;
import org.openhab.core.i18n.LocaleProvider;
import org.openhab.core.io.console.Console;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand Down
4 changes: 2 additions & 2 deletions .../core/audio/internal/AudioFormatTest.java → .../core/audio/internal/AudioFormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio.internal;
package org.openhab.core.audio.internal;

import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;

import java.util.HashSet;
import java.util.Set;

import org.eclipse.smarthome.core.audio.AudioFormat;
import org.openhab.core.audio.AudioFormat;
import org.junit.Test;

/**
Expand Down
12 changes: 6 additions & 6 deletions ...dio/internal/AudioManagerServletTest.java → ...dio/internal/AudioManagerServletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.smarthome.core.audio.internal;
package org.openhab.core.audio.internal;

import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;

import org.eclipse.smarthome.core.audio.AudioFormat;
import org.eclipse.smarthome.core.audio.AudioStream;
import org.eclipse.smarthome.core.audio.ByteArrayAudioStream;
import org.eclipse.smarthome.core.audio.URLAudioStream;
import org.eclipse.smarthome.core.audio.internal.fake.AudioSinkFake;
import org.openhab.core.audio.AudioFormat;
import org.openhab.core.audio.AudioStream;
import org.openhab.core.audio.ByteArrayAudioStream;
import org.openhab.core.audio.URLAudioStream;
import org.openhab.core.audio.internal.fake.AudioSinkFake;
import org.junit.Before;
import org.junit.Test;

Expand Down
Loading