Skip to content

Minor adjustments #1523

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

Merged
merged 2 commits into from
Mar 16, 2019
Merged

Minor adjustments #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f93520
Camel - Use a constant for Camel root package directory
gsmet Mar 15, 2019
8f5d7e8
Hibernate ORM - Fix config property name in error message
gsmet Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...el-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelInitProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ AdditionalBeanBuildItem camelRuntimeProducer(BuildProducer<BeanContainerListener
}

@Record(ExecutionTime.STATIC_INIT)
@BuildStep(applicationArchiveMarkers = { CamelSupport.CAMEL_SERVICE_BASE_PATH, "org/apache/camel" })
@BuildStep(applicationArchiveMarkers = { CamelSupport.CAMEL_SERVICE_BASE_PATH, CamelSupport.CAMEL_ROOT_PACKAGE_DIRECTORY })
CamelRuntimeBuildItem createInitTask(RecorderContext recorderContext, CamelTemplate template) {
Properties properties = new Properties();
Config configProvider = ConfigProvider.getConfig();
Expand All @@ -94,7 +94,7 @@ CamelRuntimeBuildItem createInitTask(RecorderContext recorderContext, CamelTempl
}

@Record(ExecutionTime.RUNTIME_INIT)
@BuildStep(applicationArchiveMarkers = { CamelSupport.CAMEL_SERVICE_BASE_PATH, "org/apache/camel" })
@BuildStep(applicationArchiveMarkers = { CamelSupport.CAMEL_SERVICE_BASE_PATH, CamelSupport.CAMEL_ROOT_PACKAGE_DIRECTORY })
void createRuntimeInitTask(CamelTemplate template, CamelRuntimeBuildItem runtime, ShutdownContextBuildItem shutdown)
throws Exception {
template.start(shutdown, runtime.getRuntime());
Expand Down
3 changes: 3 additions & 0 deletions ...el/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@
import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;

public final class CamelSupport {

public static final String CAMEL_SERVICE_BASE_PATH = "META-INF/services/org/apache/camel";

public static final String CAMEL_ROOT_PACKAGE_DIRECTORY = "org/apache/camel";

private CamelSupport() {
}

Expand Down
2 changes: 1 addition & 1 deletion ...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ private void handleHibernateORMWithNoPersistenceXml(
c -> {
throw new ConfigurationError(
"Unable to find file referenced in '" + HIBERNATE_ORM_CONFIG_PREFIX
+ "sql-load-script-source="
+ "sql-load-script="
+ c + "'. Remove property or add file to your path.");
});

Expand Down