forked from wildfly/wildfly
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request wildfly#17910 from pferraro/WFLY-18857
WFLY-18857 Replace wildfly clustering modules with versions from wildfly-clustering
- Loading branch information
Showing
2,143 changed files
with
21,601 additions
and
75,982 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 0 additions & 40 deletions
40
clustering/common/src/main/java/org/jboss/as/clustering/controller/CapabilityRegistrar.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
...ring/common/src/main/java/org/jboss/as/clustering/controller/CommonServiceDescriptor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/* | ||
* Copyright The WildFly Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package org.jboss.as.clustering.controller; | ||
|
||
import java.security.KeyStore; | ||
|
||
import javax.management.MBeanServer; | ||
import javax.net.ssl.SSLContext; | ||
import javax.sql.DataSource; | ||
|
||
import org.wildfly.security.credential.store.CredentialStore; | ||
import org.wildfly.service.descriptor.NullaryServiceDescriptor; | ||
import org.wildfly.service.descriptor.UnaryServiceDescriptor; | ||
|
||
/** | ||
* Service descriptors for clustering dependencies whose providing modules do not yet expose their provided capabilities via descriptor. | ||
* @author Paul Ferraro | ||
*/ | ||
public interface CommonServiceDescriptor { | ||
NullaryServiceDescriptor<MBeanServer> MBEAN_SERVER = NullaryServiceDescriptor.of("org.wildfly.management.jmx", MBeanServer.class); | ||
|
||
UnaryServiceDescriptor<DataSource> DATA_SOURCE = UnaryServiceDescriptor.of("org.wildfly.data-source", DataSource.class); | ||
|
||
UnaryServiceDescriptor<CredentialStore> CREDENTIAL_STORE = UnaryServiceDescriptor.of("org.wildfly.security.credential-store", CredentialStore.class); | ||
UnaryServiceDescriptor<KeyStore> KEY_STORE = UnaryServiceDescriptor.of("org.wildfly.security.key-store", KeyStore.class); | ||
UnaryServiceDescriptor<SSLContext> SSL_CONTEXT = UnaryServiceDescriptor.of("org.wildfly.security.ssl-context", SSLContext.class); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,7 @@ | |
import org.jboss.as.controller.ObjectTypeAttributeDefinition; | ||
import org.jboss.as.controller.OperationContext; | ||
import org.jboss.as.controller.OperationFailedException; | ||
import org.jboss.as.controller.RequirementServiceBuilder; | ||
import org.jboss.as.controller.security.CredentialReference; | ||
import org.jboss.dmr.ModelNode; | ||
import org.jboss.msc.service.DelegatingServiceBuilder; | ||
|
@@ -23,12 +24,15 @@ | |
import org.wildfly.clustering.service.SupplierDependency; | ||
import org.wildfly.common.function.ExceptionSupplier; | ||
import org.wildfly.security.credential.source.CredentialSource; | ||
import org.wildfly.subsystem.service.ServiceDependency; | ||
|
||
/** | ||
* @author Paul Ferraro | ||
* @author <a href="mailto:[email protected]">Richard Opalka</a> | ||
* @deprecated Replaced by {@link CredentialReference#getCredentialSourceDependency(OperationContext, AttributeDefinition, ModelNode)}. | ||
*/ | ||
public class CredentialSourceDependency implements SupplierDependency<CredentialSource> { | ||
@Deprecated | ||
public class CredentialSourceDependency implements SupplierDependency<CredentialSource>, ServiceDependency<CredentialSource> { | ||
|
||
private final ExceptionSupplier<CredentialSource, Exception> supplier; | ||
private final Iterable<Dependency> dependencies; | ||
|
@@ -47,6 +51,11 @@ public <T> ServiceBuilder<T> register(ServiceBuilder<T> builder) { | |
return builder; | ||
} | ||
|
||
@Override | ||
public void accept(RequirementServiceBuilder<?> builder) { | ||
this.register(builder); | ||
} | ||
|
||
@Override | ||
public CredentialSource get() { | ||
try { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.