Skip to content

Commit

Permalink
rename to osgi-technology
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Bischof <stbischof@bipolis.org>
  • Loading branch information
stbischof committed Jan 14, 2025
1 parent 966f315 commit 46bef94
Show file tree
Hide file tree
Showing 148 changed files with 11,126 additions and 377 deletions.
2 changes: 1 addition & 1 deletion common.osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.kentyou.prototype.featurelauncher</groupId>
<groupId>org.eclipse.osgi-technology.featurelauncher</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.featurelauncher.common.util.impl;
package org.eclipse.osgi.technology.featurelauncher.common.osgi.util.impl;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.featurelauncher.common.util.impl;
package org.eclipse.osgi.technology.featurelauncher.common.osgi.util.impl;

import org.osgi.framework.Bundle;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.featurelauncher.common.util.impl;
package org.eclipse.osgi.technology.featurelauncher.common.osgi.util.impl;

/**
* Util for {@link org.osgi.service.cm.ConfigurationAdmin}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.featurelauncher.common.util.impl;
package org.eclipse.osgi.technology.featurelauncher.common.osgi.util.impl;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.featurelauncher.common.util.impl;
package org.eclipse.osgi.technology.featurelauncher.common.osgi.util.impl;

import java.util.Optional;
import java.util.ServiceLoader;
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.kentyou.prototype.featurelauncher</groupId>
<groupId>org.eclipse.osgi-technology.featurelauncher</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.decorator.impl;
package org.eclipse.osgi.technology.featurelauncher.common.decorator.impl;

import static com.kentyou.prototype.featurelauncher.common.decorator.impl.FeatureDecorationConstants.DEFAULT_DECORATED_TYPE;
import static org.eclipse.osgi.technology.featurelauncher.common.decorator.impl.FeatureDecorationConstants.DEFAULT_DECORATED_TYPE;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.decorator.impl;
package org.eclipse.osgi.technology.featurelauncher.common.decorator.impl;

import static com.kentyou.prototype.featurelauncher.common.decorator.impl.FeatureDecorationConstants.BUNDLE_START_LEVELS_DEFAULT;
import static com.kentyou.prototype.featurelauncher.common.decorator.impl.FeatureDecorationConstants.BUNDLE_START_LEVELS_MINIMUM;
import static org.eclipse.osgi.technology.featurelauncher.common.decorator.impl.FeatureDecorationConstants.BUNDLE_START_LEVELS_DEFAULT;
import static org.eclipse.osgi.technology.featurelauncher.common.decorator.impl.FeatureDecorationConstants.BUNDLE_START_LEVELS_MINIMUM;

import java.util.Map;
import java.util.OptionalInt;
Expand All @@ -27,7 +27,7 @@

/**
* Implementation of
* {@link com.kentyou.featurelauncher.impl.decorator.BundleStartLevelsFeatureExtensionHandler}
* {@link org.eclipse.osgi.technology.featurelauncher.impl.decorator.BundleStartLevelsFeatureExtensionHandler}
*
* @author Michael H. Siemaszko (mhs@into.software)
* @since Oct 19, 2024
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.decorator.impl;
package org.eclipse.osgi.technology.featurelauncher.common.decorator.impl;

import static org.osgi.service.featurelauncher.FeatureLauncherConstants.BUNDLE_START_LEVELS;
import static org.osgi.service.featurelauncher.FeatureLauncherConstants.FRAMEWORK_LAUNCHING_PROPERTIES;
Expand All @@ -31,7 +31,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.kentyou.featurelauncher.repository.spi.Repository;
import org.eclipse.osgi.technology.featurelauncher.repository.spi.Repository;

import jakarta.json.Json;
import jakarta.json.JsonNumber;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.decorator.impl;
package org.eclipse.osgi.technology.featurelauncher.common.decorator.impl;

import org.osgi.service.feature.FeatureArtifactBuilder;
import org.osgi.service.feature.FeatureBundleBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.decorator.impl;
package org.eclipse.osgi.technology.featurelauncher.common.decorator.impl;

/**
* Defines additional constants for feature decoration.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.decorator.impl;
package org.eclipse.osgi.technology.featurelauncher.common.decorator.impl;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.decorator.impl;
package org.eclipse.osgi.technology.featurelauncher.common.decorator.impl;

import org.osgi.service.feature.Feature;
import org.osgi.service.feature.FeatureService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,22 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.decorator.impl;
package org.eclipse.osgi.technology.featurelauncher.common.decorator.impl;

import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;

import org.eclipse.osgi.technology.featurelauncher.common.util.impl.VariablesUtil;
import org.osgi.service.feature.Feature;
import org.osgi.service.feature.FeatureExtension;
import org.osgi.service.featurelauncher.decorator.AbandonOperationException;
import org.osgi.service.featurelauncher.decorator.DecoratorBuilderFactory;
import org.osgi.service.featurelauncher.decorator.FeatureExtensionHandler;

import com.kentyou.prototype.featurelauncher.common.util.impl.VariablesUtil;


/**
* Implementation of {@link com.kentyou.featurelauncher.impl.decorator.FrameworkLaunchingPropertiesFeatureExtensionHandler}
* Implementation of {@link org.eclipse.osgi.technology.featurelauncher.impl.decorator.FrameworkLaunchingPropertiesFeatureExtensionHandler}
*
* @author Michael H. Siemaszko (mhs@into.software)
* @since Oct 19, 2024
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.decorator.impl;
package org.eclipse.osgi.technology.featurelauncher.common.decorator.impl;

import java.io.BufferedReader;
import java.io.InputStreamReader;
Expand All @@ -36,11 +36,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.kentyou.featurelauncher.repository.spi.FileSystemRepository;
import com.kentyou.featurelauncher.repository.spi.Repository;
import org.eclipse.osgi.technology.featurelauncher.repository.spi.FileSystemRepository;
import org.eclipse.osgi.technology.featurelauncher.repository.spi.Repository;

/**
* Implementation of {@link com.kentyou.prototype.featurelauncher.common.decorator.impl.common.decorator.impl.LaunchFrameworkFeatureExtensionHandler}
* Implementation of {@link org.eclipse.osgi.technology.featurelauncher.common.decorator.impl.common.decorator.impl.LaunchFrameworkFeatureExtensionHandler}
*
* @author Michael H. Siemaszko (mhs@into.software)
* @since Sep 15, 2024
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kentyou.prototype.featurelauncher.common.repository.impl;
package org.eclipse.osgi.technology.featurelauncher.common.repository.impl;

import static java.nio.file.StandardOpenOption.CREATE_NEW;
import static java.nio.file.StandardOpenOption.READ;
Expand All @@ -10,13 +10,13 @@
import java.nio.file.Path;
import java.util.Objects;

import org.eclipse.osgi.technology.featurelauncher.common.util.impl.FileSystemUtil;
import org.osgi.service.feature.ID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.kentyou.featurelauncher.repository.spi.FileSystemRepository;
import com.kentyou.featurelauncher.repository.spi.Repository;
import com.kentyou.prototype.featurelauncher.common.util.impl.FileSystemUtil;
import org.eclipse.osgi.technology.featurelauncher.repository.spi.FileSystemRepository;
import org.eclipse.osgi.technology.featurelauncher.repository.spi.Repository;

/**
* Converts a {@link Repository} with no File backing into a file-backed {@link Repository}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.util.impl;
package org.eclipse.osgi.technology.featurelauncher.common.util.impl;

import java.io.IOException;
import java.nio.file.FileVisitResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.prototype.featurelauncher.common.util.impl;
package org.eclipse.osgi.technology.featurelauncher.common.util.impl;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.featurelauncher.impl.decorator;
package org.eclipse.osgi.technology.featurelauncher.impl.decorator;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand All @@ -28,6 +28,7 @@
import java.util.Map;
import java.util.ServiceLoader;

import org.eclipse.osgi.technology.featurelauncher.common.decorator.impl.DecorationContext;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.osgi.service.feature.Feature;
Expand All @@ -41,11 +42,9 @@
import org.osgi.service.featurelauncher.decorator.FeatureDecorator;
import org.osgi.service.featurelauncher.decorator.FeatureExtensionHandler;

import com.kentyou.prototype.featurelauncher.common.decorator.impl.DecorationContext;

/**
* Tests
* {@link com.kentyou.featurelauncher.impl.util.FeatureDecorationUtil.executeFeatureDecorators(Feature,
* {@link org.eclipse.osgi.technology.impl.util.FeatureDecorationUtil.executeFeatureDecorators(Feature,
* List<FeatureDecorator>)}
*
* @author Michael H. Siemaszko (mhs@into.software)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Kentyou - initial implementation
*/
package com.kentyou.featurelauncher.impl.decorator;
package org.eclipse.osgi.technology.featurelauncher.impl.decorator;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand All @@ -29,6 +29,7 @@
import java.util.Map;
import java.util.ServiceLoader;

import org.eclipse.osgi.technology.featurelauncher.common.decorator.impl.DecorationContext;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.osgi.service.feature.Feature;
Expand All @@ -41,11 +42,9 @@
import org.osgi.service.featurelauncher.decorator.DecoratorBuilderFactory;
import org.osgi.service.featurelauncher.decorator.FeatureExtensionHandler;

import com.kentyou.prototype.featurelauncher.common.decorator.impl.DecorationContext;

/**
* Tests
* {@link com.kentyou.featurelauncher.impl.util.FeatureDecorationUtil.executeFeatureExtensionHandlers(Feature,
* {@link org.eclipse.osgi.technology.impl.util.FeatureDecorationUtil.executeFeatureExtensionHandlers(Feature,
* Map<String, FeatureExtensionHandler>)}
*
* @author Michael H. Siemaszko (mhs@into.software)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"feature-resource-version": "1.0",
"id": "com.kentyou.featurelauncher:gogo-console-feature:1.0",
"id": "org.eclipse.osgi.technology.featurelauncher:gogo-console-feature:1.0",
"name": "Gogo console feature",
"description": "Gogo console feature",
"complete": true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "com.kentyou.featurelauncher:gogo-console-feature:1.0",
"id": "org.eclipse.osgi.technology.featurelauncher:gogo-console-feature:1.0",
"name": "Gogo console feature",
"description": "Gogo console feature",
"complete": true,
Expand Down
4 changes: 2 additions & 2 deletions integration-test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

-runbundles: \
com.fasterxml.woodstox.woodstox-core;version='[7.0.0,7.0.1)',\
com.kentyou.featurelauncher;version='[1.0.0,1.0.1)',\
com.kentyou.featurelauncher-tests;version='[1.0.0,1.0.1)',\
org.eclipse.osgi-technology.featurelauncher;version='[1.0.0,1.0.1)',\
org.eclipse.osgi-technology.featurelauncher-tests;version='[1.0.0,1.0.1)',\
junit-jupiter-api;version='[5.11.1,5.11.2)',\
junit-jupiter-engine;version='[5.11.1,5.11.2)',\
junit-jupiter-params;version='[5.11.1,5.11.2)',\
Expand Down
12 changes: 6 additions & 6 deletions launch/all.lite/bin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.kentyou.prototype.featurelauncher.launch</groupId>
<groupId>org.eclipse.osgi-technology.featurelauncher.launch</groupId>
<artifactId>launch</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -108,10 +108,10 @@

<artifactSet>
<includes>
<include>com.kentyou.prototype.featurelauncher:artifact.lite</include>
<include>com.kentyou.prototype.featurelauncher:artifact.spi</include>
<include>com.kentyou.prototype.featurelauncher:common</include>
<include>com.kentyou.prototype.featurelauncher:launcher</include>
<include>org.eclipse.osgi-technology.featurelauncher:artifact.lite</include>
<include>org.eclipse.osgi-technology.featurelauncher:artifact.spi</include>
<include>org.eclipse.osgi-technology.featurelauncher:common</include>
<include>org.eclipse.osgi-technology.featurelauncher:launcher</include>
<include>info.picocli:picocli</include>
<include>org.apache.felix:org.apache.felix.cm.json</include>
<include>org.apache.felix:org.apache.felix.feature</include>
Expand All @@ -127,7 +127,7 @@
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>
com.kentyou.featurelauncher.cli.FeatureLauncherCli</mainClass>
org.eclipse.osgi.technology.featurelauncher.cli.FeatureLauncherCli</mainClass>
</transformer>
</transformers>
</configuration>
Expand Down
Loading

0 comments on commit 46bef94

Please sign in to comment.